diff --git a/Gemfile.lock b/Gemfile.lock
index 7ad7fbb7d..cbf714ee3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -83,7 +83,7 @@ GEM
       xcpretty-travis-formatter (>= 0.0.3)
     fastlane-plugin-properties (1.1.2)
       java-properties
-    fastlane-plugin-semantic_release (1.14.1)
+    fastlane-plugin-semantic_release (1.18.0)
     fastlane-plugin-versioning_android (0.1.0)
     gh_inspector (1.1.3)
     google-api-client (0.38.0)
diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index 2ca257b22..39e9edf19 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -10,6 +10,7 @@
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
     <uses-permission android:name="com.android.vending.BILLING" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
 
     <application
         android:name=".HabiticaApplication"
@@ -29,7 +30,6 @@
             android:value="@string/application_ad_id"/>
         <activity
             android:name=".ui.activities.MainActivity"
-            android:label="@string/app_name"
             android:theme="@style/LaunchAppTheme"
             android:windowSoftInputMode="stateHidden|adjustResize"
             android:configChanges="screenSize | smallestScreenSize | screenLayout | orientation"
@@ -256,6 +256,12 @@
                 <action android:name="com.google.firebase.MESSAGING_EVENT"/>
             </intent-filter>
         </service>
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_icon"
+            android:resource="@drawable/ic_gryphon_white" />
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_color"
+            android:resource="@color/brand_300" />
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="@string/content_provider"
diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 356787ad7..34fa27a2b 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -43,7 +43,7 @@ dependencies {
     compileOnly 'javax.annotation:javax.annotation-api:1.3.2'
     //App Compatibility and Material Design
     implementation "androidx.appcompat:appcompat:$appcompat_version"
-    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'com.google.android.material:material:1.7.0'
     implementation "androidx.recyclerview:recyclerview:$recyclerview_version"
     implementation "androidx.preference:preference-ktx:$preferences_version"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
@@ -79,7 +79,7 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     androidTestImplementation 'androidx.test:runner:1.4.0'
     androidTestImplementation 'androidx.test:rules:1.4.0'
-    debugImplementation 'androidx.fragment:fragment-testing:1.5.2'
+    debugImplementation 'androidx.fragment:fragment-testing:1.5.4'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test:core-ktx:1.4.0'
     androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.3'
@@ -98,7 +98,7 @@ dependencies {
     implementation 'com.google.firebase:firebase-messaging-ktx'
     implementation 'com.google.firebase:firebase-config-ktx'
     implementation 'com.google.firebase:firebase-perf-ktx'
-    implementation 'com.google.android.gms:play-services-ads:21.1.0'
+    implementation 'com.google.android.gms:play-services-ads:21.3.0'
     implementation "com.google.android.gms:play-services-auth:$play_auth_version"
     implementation 'com.google.android.flexbox:flexbox:3.0.0'
     implementation "com.google.android.gms:play-services-wearable:$play_wearables_version"
@@ -107,12 +107,20 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.5.1'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.5.1'
-    implementation "androidx.fragment:fragment-ktx:1.5.2"
+    implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version"
+    implementation "androidx.navigation:navigation-ui-ktx:$navigation_version"
+    implementation "androidx.fragment:fragment-ktx:1.5.4"
     implementation "androidx.paging:paging-runtime-ktx:3.1.1"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
+    implementation "com.google.android.material:compose-theme-adapter:1.1.21"
+
+    implementation 'androidx.activity:activity-compose:1.6.1'
+    implementation "androidx.compose.runtime:runtime-livedata:$compose_version"
+    implementation "androidx.compose.material:material:$compose_version"
+    implementation "androidx.compose.animation:animation:$compose_version"
+    implementation "androidx.compose.ui:ui-tooling:$compose_version"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
 
     implementation 'com.willowtreeapps:signinwithapplebutton:0.3'
 
@@ -139,7 +147,7 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion min_sdk
         applicationId "com.habitrpg.android.habitica"
         vectorDrawables.useSupportLibrary = true
         buildConfigField "String", "STORE", "\"google\""
@@ -160,6 +168,11 @@ android {
 
     buildFeatures {
         viewBinding true
+        compose true
+    }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.3.2"
     }
 
     signingConfigs {
diff --git a/Habitica/res/drawable-hdpi/assign.png b/Habitica/res/drawable-hdpi/assign.png
new file mode 100644
index 000000000..7350842d7
Binary files /dev/null and b/Habitica/res/drawable-hdpi/assign.png differ
diff --git a/Habitica/res/drawable-hdpi/fall_gems_21.png b/Habitica/res/drawable-hdpi/fall_gems_21.png
new file mode 100644
index 000000000..f766d9486
Binary files /dev/null and b/Habitica/res/drawable-hdpi/fall_gems_21.png differ
diff --git a/Habitica/res/drawable-hdpi/fall_gems_4.png b/Habitica/res/drawable-hdpi/fall_gems_4.png
new file mode 100644
index 000000000..8c09f0cd5
Binary files /dev/null and b/Habitica/res/drawable-hdpi/fall_gems_4.png differ
diff --git a/Habitica/res/drawable-hdpi/fall_gems_42.png b/Habitica/res/drawable-hdpi/fall_gems_42.png
new file mode 100644
index 000000000..7025fcba3
Binary files /dev/null and b/Habitica/res/drawable-hdpi/fall_gems_42.png differ
diff --git a/Habitica/res/drawable-hdpi/fall_gems_84.png b/Habitica/res/drawable-hdpi/fall_gems_84.png
new file mode 100644
index 000000000..e5409b7fc
Binary files /dev/null and b/Habitica/res/drawable-hdpi/fall_gems_84.png differ
diff --git a/Habitica/res/drawable-hdpi/spooky_gems_21.png b/Habitica/res/drawable-hdpi/spooky_gems_21.png
new file mode 100644
index 000000000..3a17e23c9
Binary files /dev/null and b/Habitica/res/drawable-hdpi/spooky_gems_21.png differ
diff --git a/Habitica/res/drawable-hdpi/spooky_gems_4.png b/Habitica/res/drawable-hdpi/spooky_gems_4.png
new file mode 100644
index 000000000..479663474
Binary files /dev/null and b/Habitica/res/drawable-hdpi/spooky_gems_4.png differ
diff --git a/Habitica/res/drawable-hdpi/spooky_gems_42.png b/Habitica/res/drawable-hdpi/spooky_gems_42.png
new file mode 100644
index 000000000..8434f2cc5
Binary files /dev/null and b/Habitica/res/drawable-hdpi/spooky_gems_42.png differ
diff --git a/Habitica/res/drawable-hdpi/spooky_gems_84.png b/Habitica/res/drawable-hdpi/spooky_gems_84.png
new file mode 100644
index 000000000..fc52ff518
Binary files /dev/null and b/Habitica/res/drawable-hdpi/spooky_gems_84.png differ
diff --git a/Habitica/res/drawable-mdpi/assign.png b/Habitica/res/drawable-mdpi/assign.png
new file mode 100644
index 000000000..20b6a498e
Binary files /dev/null and b/Habitica/res/drawable-mdpi/assign.png differ
diff --git a/Habitica/res/drawable-mdpi/baseline_keyboard_arrow_right_black_18dp.png b/Habitica/res/drawable-mdpi/baseline_keyboard_arrow_right_black_18dp.png
deleted file mode 100644
index 6ab2cf339..000000000
Binary files a/Habitica/res/drawable-mdpi/baseline_keyboard_arrow_right_black_18dp.png and /dev/null differ
diff --git a/Habitica/res/drawable-night-hdpi/assign.png b/Habitica/res/drawable-night-hdpi/assign.png
new file mode 100644
index 000000000..df03c6189
Binary files /dev/null and b/Habitica/res/drawable-night-hdpi/assign.png differ
diff --git a/Habitica/res/drawable-night-mdpi/assign.png b/Habitica/res/drawable-night-mdpi/assign.png
new file mode 100644
index 000000000..dd618cb06
Binary files /dev/null and b/Habitica/res/drawable-night-mdpi/assign.png differ
diff --git a/Habitica/res/drawable-night-xhdpi/assign.png b/Habitica/res/drawable-night-xhdpi/assign.png
new file mode 100644
index 000000000..521040778
Binary files /dev/null and b/Habitica/res/drawable-night-xhdpi/assign.png differ
diff --git a/Habitica/res/drawable-night-xxhdpi/assign.png b/Habitica/res/drawable-night-xxhdpi/assign.png
new file mode 100644
index 000000000..b336e5fbe
Binary files /dev/null and b/Habitica/res/drawable-night-xxhdpi/assign.png differ
diff --git a/Habitica/res/drawable-xhdpi/assign.png b/Habitica/res/drawable-xhdpi/assign.png
new file mode 100644
index 000000000..bb10ca5ef
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/assign.png differ
diff --git a/Habitica/res/drawable-xhdpi/fall_gems_21.png b/Habitica/res/drawable-xhdpi/fall_gems_21.png
new file mode 100644
index 000000000..69b81a672
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/fall_gems_21.png differ
diff --git a/Habitica/res/drawable-xhdpi/fall_gems_4.png b/Habitica/res/drawable-xhdpi/fall_gems_4.png
new file mode 100644
index 000000000..cad6e540d
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/fall_gems_4.png differ
diff --git a/Habitica/res/drawable-xhdpi/fall_gems_42.png b/Habitica/res/drawable-xhdpi/fall_gems_42.png
new file mode 100644
index 000000000..02f8c8343
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/fall_gems_42.png differ
diff --git a/Habitica/res/drawable-xhdpi/fall_gems_84.png b/Habitica/res/drawable-xhdpi/fall_gems_84.png
new file mode 100644
index 000000000..97768873e
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/fall_gems_84.png differ
diff --git a/Habitica/res/drawable-xhdpi/spooky_gems_21.png b/Habitica/res/drawable-xhdpi/spooky_gems_21.png
new file mode 100644
index 000000000..c9ff5ba6b
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/spooky_gems_21.png differ
diff --git a/Habitica/res/drawable-xhdpi/spooky_gems_4.png b/Habitica/res/drawable-xhdpi/spooky_gems_4.png
new file mode 100644
index 000000000..81241006e
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/spooky_gems_4.png differ
diff --git a/Habitica/res/drawable-xhdpi/spooky_gems_42.png b/Habitica/res/drawable-xhdpi/spooky_gems_42.png
new file mode 100644
index 000000000..3bce039f5
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/spooky_gems_42.png differ
diff --git a/Habitica/res/drawable-xhdpi/spooky_gems_84.png b/Habitica/res/drawable-xhdpi/spooky_gems_84.png
new file mode 100644
index 000000000..a8d3a378e
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/spooky_gems_84.png differ
diff --git a/Habitica/res/drawable-xxhdpi/assign.png b/Habitica/res/drawable-xxhdpi/assign.png
new file mode 100644
index 000000000..bf0578c8c
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/assign.png differ
diff --git a/Habitica/res/drawable-xxhdpi/fall_gems_21.png b/Habitica/res/drawable-xxhdpi/fall_gems_21.png
new file mode 100644
index 000000000..2e59c48c6
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/fall_gems_21.png differ
diff --git a/Habitica/res/drawable-xxhdpi/fall_gems_4.png b/Habitica/res/drawable-xxhdpi/fall_gems_4.png
new file mode 100644
index 000000000..3b54a666d
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/fall_gems_4.png differ
diff --git a/Habitica/res/drawable-xxhdpi/fall_gems_42.png b/Habitica/res/drawable-xxhdpi/fall_gems_42.png
new file mode 100644
index 000000000..8dd7c1aa8
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/fall_gems_42.png differ
diff --git a/Habitica/res/drawable-xxhdpi/fall_gems_84.png b/Habitica/res/drawable-xxhdpi/fall_gems_84.png
new file mode 100644
index 000000000..8757d1300
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/fall_gems_84.png differ
diff --git a/Habitica/res/drawable-xxhdpi/spooky_gems_21.png b/Habitica/res/drawable-xxhdpi/spooky_gems_21.png
new file mode 100644
index 000000000..701b30ff9
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/spooky_gems_21.png differ
diff --git a/Habitica/res/drawable-xxhdpi/spooky_gems_4.png b/Habitica/res/drawable-xxhdpi/spooky_gems_4.png
new file mode 100644
index 000000000..6704caf80
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/spooky_gems_4.png differ
diff --git a/Habitica/res/drawable-xxhdpi/spooky_gems_42.png b/Habitica/res/drawable-xxhdpi/spooky_gems_42.png
new file mode 100644
index 000000000..815b74f08
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/spooky_gems_42.png differ
diff --git a/Habitica/res/drawable-xxhdpi/spooky_gems_84.png b/Habitica/res/drawable-xxhdpi/spooky_gems_84.png
new file mode 100644
index 000000000..ab73f510c
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/spooky_gems_84.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/fall_gems_21.png b/Habitica/res/drawable-xxxhdpi/fall_gems_21.png
new file mode 100644
index 000000000..d086b585a
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/fall_gems_21.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/fall_gems_4.png b/Habitica/res/drawable-xxxhdpi/fall_gems_4.png
new file mode 100644
index 000000000..b7b33acd4
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/fall_gems_4.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/fall_gems_42.png b/Habitica/res/drawable-xxxhdpi/fall_gems_42.png
new file mode 100644
index 000000000..fc13cf769
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/fall_gems_42.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/fall_gems_84.png b/Habitica/res/drawable-xxxhdpi/fall_gems_84.png
new file mode 100644
index 000000000..0ec58519d
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/fall_gems_84.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/spooky_gems_21.png b/Habitica/res/drawable-xxxhdpi/spooky_gems_21.png
new file mode 100644
index 000000000..939b6149a
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/spooky_gems_21.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/spooky_gems_4.png b/Habitica/res/drawable-xxxhdpi/spooky_gems_4.png
new file mode 100644
index 000000000..428e4a0d8
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/spooky_gems_4.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/spooky_gems_42.png b/Habitica/res/drawable-xxxhdpi/spooky_gems_42.png
new file mode 100644
index 000000000..527bce18f
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/spooky_gems_42.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/spooky_gems_84.png b/Habitica/res/drawable-xxxhdpi/spooky_gems_84.png
new file mode 100644
index 000000000..e5ddaf737
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/spooky_gems_84.png differ
diff --git a/Habitica/res/drawable/icon_chat.xml b/Habitica/res/drawable/icon_chat.xml
new file mode 100644
index 000000000..42714253f
--- /dev/null
+++ b/Habitica/res/drawable/icon_chat.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="#FFFFFF" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM6,9h12v2L6,11L6,9zM14,14L6,14v-2h8v2zM18,8L6,8L6,6h12v2z"/>
+</vector>
diff --git a/Habitica/res/layout/activity_main_content.xml b/Habitica/res/layout/activity_main_content.xml
index 7553ad017..a575dd7e5 100644
--- a/Habitica/res/layout/activity_main_content.xml
+++ b/Habitica/res/layout/activity_main_content.xml
@@ -28,16 +28,15 @@
             app:expandedTitleMarginStart="0dp"
             app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
-            <include
-                android:id="@+id/avatar_with_bars"
-                layout="@layout/avatar_with_bars"
+            <androidx.compose.ui.platform.ComposeView
+                android:id="@+id/header_view"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="?attr/actionBarSize"
                 android:layout_marginEnd="@dimen/header_border_spacing"
                 android:layout_marginStart="@dimen/header_border_spacing"
                 android:layout_marginBottom="@dimen/spacing_medium"
-                app:layout_collapseMode="parallax" />
+                app:layout_collapseMode="parallax"/>
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
diff --git a/Habitica/res/layout/fragment_challenge_detail.xml b/Habitica/res/layout/fragment_challenge_detail.xml
index 378418a37..bc7dd0208 100644
--- a/Habitica/res/layout/fragment_challenge_detail.xml
+++ b/Habitica/res/layout/fragment_challenge_detail.xml
@@ -179,6 +179,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="11dp"
                 android:lineSpacingExtra="4sp"
+                android:background="@drawable/layout_rounded_bg_window"
+                android:padding="@dimen/spacing_large"
                 tools:text="There’s always more to learn! Maybe it’s a specialized topic you’re interested in, or maybe it’s the experiences of a notable contributor. Read about it and you may win 15 gems!" />
         </com.habitrpg.android.habitica.ui.views.CollapsibleSectionView>
 
diff --git a/Habitica/res/layout/fragment_compose.xml b/Habitica/res/layout/fragment_compose.xml
new file mode 100644
index 000000000..3896c2c2f
--- /dev/null
+++ b/Habitica/res/layout/fragment_compose.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.compose.ui.platform.ComposeView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_compose_scrolling.xml b/Habitica/res/layout/fragment_compose_scrolling.xml
new file mode 100644
index 000000000..2418f8be3
--- /dev/null
+++ b/Habitica/res/layout/fragment_compose_scrolling.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <androidx.compose.ui.platform.ComposeView
+        android:id="@+id/compose_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+</androidx.core.widget.NestedScrollView>
diff --git a/Habitica/res/layout/fragment_gem_purchase.xml b/Habitica/res/layout/fragment_gem_purchase.xml
index 1333f53b4..b071f1d1e 100644
--- a/Habitica/res/layout/fragment_gem_purchase.xml
+++ b/Habitica/res/layout/fragment_gem_purchase.xml
@@ -17,6 +17,7 @@
             android:background="@drawable/g1g1_box"
             android:layout_marginStart="10dp"
             android:layout_marginEnd="10dp"
+            android:layout_marginBottom="@dimen/spacing_large"
             android:clipChildren="true"
             android:clipToPadding="true"
             android:clickable="true"
@@ -29,14 +30,16 @@
                 android:scaleType="center"
                 android:layout_alignParentTop="true"
                 android:layout_alignParentStart="true"
-                android:layout_alignParentBottom="false"/>
+                android:layout_alignParentBottom="false"
+                android:importantForAccessibility="no"/>
             <ImageView
                 android:id="@+id/promo_banner_right_image"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:scaleType="center"
                 android:layout_alignParentTop="true"
-                android:layout_alignParentEnd="true"/>
+                android:layout_alignParentEnd="true"
+                android:importantForAccessibility="no"/>
             <LinearLayout
                 android:layout_centerInParent="true"
                 android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/fragment_guild_detail.xml b/Habitica/res/layout/fragment_guild_detail.xml
index b62f35db0..a9849aee2 100644
--- a/Habitica/res/layout/fragment_guild_detail.xml
+++ b/Habitica/res/layout/fragment_guild_detail.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/refreshLayout"
-    android:background="@color/window_background">
+    android:background="@color/content_background">
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -101,10 +101,6 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:background="?attr/colorContentBackground">
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="@color/content_background_offset" />
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -130,11 +126,6 @@
                         style="@style/HabiticaButton.Green"
                         android:layout_marginStart="@dimen/spacing_large"/>
                 </LinearLayout>
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="@color/content_background_offset" />
                 <LinearLayout
                     android:id="@+id/leader_wrapper"
                     android:layout_width="match_parent"
@@ -183,7 +174,9 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         tools:text="@string/inn_description"
-                        android:layout_marginTop="@dimen/spacing_large" />
+                        android:layout_marginTop="@dimen/spacing_large"
+                        android:background="@drawable/layout_rounded_bg_window"
+                        android:padding="@dimen/spacing_large"/>
                 </com.habitrpg.android.habitica.ui.views.CollapsibleSectionView>
                 <com.habitrpg.android.habitica.ui.views.CollapsibleSectionView
                     android:layout_width="match_parent"
@@ -195,14 +188,11 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         tools:text="@string/inn_description"
-                        android:layout_marginTop="@dimen/spacing_large" />
+                        android:layout_marginTop="@dimen/spacing_large"
+                        android:background="@drawable/layout_rounded_bg_window"
+                        android:padding="@dimen/spacing_large" />
                 </com.habitrpg.android.habitica.ui.views.CollapsibleSectionView>
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="@color/content_background_offset"
-                    android:layout_marginTop="@dimen/spacing_medium"/>
             </LinearLayout>
             <Button
                 android:id="@+id/leave_button"
diff --git a/Habitica/res/layout/fragment_party_detail.xml b/Habitica/res/layout/fragment_party_detail.xml
index 180b168f4..c77318dda 100644
--- a/Habitica/res/layout/fragment_party_detail.xml
+++ b/Habitica/res/layout/fragment_party_detail.xml
@@ -38,9 +38,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:background="?attr/colorContentBackground"
-                android:showDividers="beginning|end|middle"
-                android:divider="@drawable/vertical_divider">
+                android:background="?attr/colorContentBackground">
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -180,7 +178,9 @@
                         android:id="@+id/description_view"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        tools:text="This is our super awesome party!"/>
+                        tools:text="This is our super awesome party!"
+                        android:background="@drawable/layout_rounded_bg_window"
+                        android:padding="@dimen/spacing_large"/>
                 </LinearLayout>
                 <LinearLayout
                     android:layout_width="match_parent"
diff --git a/Habitica/res/layout/fragment_tavern_detail.xml b/Habitica/res/layout/fragment_tavern_detail.xml
index 444aed9f5..854066e76 100644
--- a/Habitica/res/layout/fragment_tavern_detail.xml
+++ b/Habitica/res/layout/fragment_tavern_detail.xml
@@ -43,7 +43,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/inn_description"
-            android:layout_marginTop="@dimen/spacing_large"/>
+            android:layout_marginTop="@dimen/spacing_large"
+            android:background="@drawable/layout_rounded_bg_window"
+            android:padding="@dimen/spacing_large"/>
     </com.habitrpg.android.habitica.ui.views.CollapsibleSectionView>
     <com.habitrpg.android.habitica.ui.views.CollapsibleSectionView
         android:layout_width="match_parent"
@@ -61,7 +63,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/guidelines_description"
-            android:layout_marginTop="@dimen/spacing_large"/>
+            android:layout_marginTop="@dimen/spacing_large"
+            android:background="@drawable/layout_rounded_bg_window"
+            android:padding="@dimen/spacing_large"/>
     </com.habitrpg.android.habitica.ui.views.CollapsibleSectionView>
     <com.habitrpg.android.habitica.ui.views.CollapsibleSectionView
         android:layout_width="match_parent"
@@ -100,7 +104,9 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/tiers_descriptions"/>
+            android:text="@string/tiers_descriptions"
+            android:background="@drawable/layout_rounded_bg_window"
+            android:padding="@dimen/spacing_large"/>
     </com.habitrpg.android.habitica.ui.views.CollapsibleSectionView>
 </LinearLayout>
 </androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/Habitica/res/layout/party_member.xml b/Habitica/res/layout/party_member.xml
index a208cc65f..14324c98a 100644
--- a/Habitica/res/layout/party_member.xml
+++ b/Habitica/res/layout/party_member.xml
@@ -5,9 +5,11 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:clickable="true"
+    android:background="@drawable/layout_rounded_bg_window"
     android:padding="@dimen/spacing_large"
     android:foreground="?android:attr/selectableItemBackground"
-    android:focusable="true">
+    android:focusable="true"
+    android:layout_marginBottom="@dimen/spacing_medium">
     <com.habitrpg.common.habitica.views.AvatarView
         android:id="@+id/avatarView"
         android:layout_width="97dp"
@@ -88,7 +90,7 @@
                     android:layout_height="@dimen/bar_size"
                     android:id="@+id/health_bar"
                     app:barForegroundColor="@color/hpColor"
-                    app:barBackgroundColor="@color/window_background"/>
+                    app:barBackgroundColor="@color/offset_background"/>
                 <TextView
                     android:id="@+id/health_textview"
                     android:layout_width="wrap_content"
@@ -106,7 +108,7 @@
                     android:layout_height="@dimen/bar_size"
                     android:id="@+id/experience_bar"
                     app:barForegroundColor="@color/xpColor"
-                    app:barBackgroundColor="@color/window_background"/>
+                    app:barBackgroundColor="@color/offset_background"/>
                 <TextView
                     android:id="@+id/experience_textview"
                     android:layout_width="wrap_content"
@@ -124,7 +126,7 @@
                     android:layout_height="@dimen/bar_size"
                     android:id="@+id/mana_bar"
                     app:barForegroundColor="@color/mpColor"
-                    app:barBackgroundColor="@color/window_background"/>
+                    app:barBackgroundColor="@color/offset_background"/>
                 <TextView
                     android:id="@+id/mana_textview"
                     android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/purchase_gem_view.xml b/Habitica/res/layout/purchase_gem_view.xml
index 6d64ad279..e979daf31 100644
--- a/Habitica/res/layout/purchase_gem_view.xml
+++ b/Habitica/res/layout/purchase_gem_view.xml
@@ -17,10 +17,6 @@
         android:contentDescription="@string/gems"
         android:layout_marginTop="20dp"/>
 
-    <com.habitrpg.android.habitica.ui.views.SparkView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -40,6 +36,7 @@
             android:layout_marginEnd="2dp"
             tools:text="21" />
         <com.habitrpg.android.habitica.ui.views.DayNightTextView
+            android:id="@+id/gem_label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:dayTextColor="@color/white"
diff --git a/Habitica/res/layout/reward_item_card.xml b/Habitica/res/layout/reward_item_card.xml
index af9d3a58e..ddfeb32f9 100644
--- a/Habitica/res/layout/reward_item_card.xml
+++ b/Habitica/res/layout/reward_item_card.xml
@@ -49,7 +49,7 @@
                 android:paddingBottom="2dp"/>
             <TextView
                 android:id="@+id/priceLabel"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="@color/yellow_10"
                 android:gravity="center_horizontal"
diff --git a/Habitica/res/layout/task_main_content.xml b/Habitica/res/layout/task_main_content.xml
index bf2e2f2ba..98b5befd8 100644
--- a/Habitica/res/layout/task_main_content.xml
+++ b/Habitica/res/layout/task_main_content.xml
@@ -12,6 +12,17 @@
     android:paddingBottom="@dimen/task_top_bottom_padding"
     android:layout_marginEnd="@dimen/task_text_padding"
     android:layout_marginStart="@dimen/task_text_padding">
+    <TextView
+        android:id="@+id/assigned_textview"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        style="@style/Caption4"
+        android:text="@string/pending_approval"
+        android:textColor="@color/text_ternary"
+        android:drawableStart="@drawable/assign"
+        android:drawablePadding="@dimen/spacing_small"
+        android:layout_marginBottom="2dp"
+        />
         <com.habitrpg.android.habitica.ui.views.EllipsisTextView
             android:id="@+id/checkedTextView"
             style="@style/Subheader3"
diff --git a/Habitica/res/layout/view_collapsible_section.xml b/Habitica/res/layout/view_collapsible_section.xml
index 0a62d984b..0f4553a3b 100644
--- a/Habitica/res/layout/view_collapsible_section.xml
+++ b/Habitica/res/layout/view_collapsible_section.xml
@@ -5,11 +5,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     tools:parentTag="android.widget.LinearLayout">
-    <View
-        android:id="@+id/separator"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/content_background_offset"/>
     <LinearLayout
         android:id="@+id/section_title_view"
         android:layout_width="match_parent"
diff --git a/Habitica/res/menu/menu_team_board.xml b/Habitica/res/menu/menu_team_board.xml
index 132073bf9..41752feef 100644
--- a/Habitica/res/menu/menu_team_board.xml
+++ b/Habitica/res/menu/menu_team_board.xml
@@ -2,10 +2,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:context="com.habitrpg.android.habitica.TaskActivity">
-    <item android:id="@+id/action_team_info"
-        android:title="@string/team_information"
-        android:icon="@drawable/team_info_icon"
-        app:showAsAction="collapseActionView|always" />
     <item android:id="@+id/action_search"
         android:title="@string/search"
         android:icon="@drawable/ic_search"
diff --git a/Habitica/res/navigation/navigation.xml b/Habitica/res/navigation/navigation.xml
index d192e2c80..1379c226f 100644
--- a/Habitica/res/navigation/navigation.xml
+++ b/Habitica/res/navigation/navigation.xml
@@ -4,16 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/main_nav"
     app:startDestination="@id/tasksFragment">
-
-    <fragment
-        android:id="@+id/equipmentOverviewFragment"
-        android:name="com.habitrpg.android.habitica.ui.fragments.inventory.equipment.EquipmentOverviewFragment"
-        android:label="@string/sidebar_equipment" >
-        <deepLink app:uri="habitica.com/inventory/equipment" />
-        <action
-            android:id="@+id/openEquipmentDetail"
-            app:destination="@id/equipmentDetailFragment" />
-    </fragment>
     <fragment
         android:id="@+id/equipmentDetailFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.inventory.equipment.EquipmentDetailFragment"
@@ -44,6 +34,16 @@
         <deepLink app:uri="habitica.com/tasks" />
         <deepLink app:uri="habitica.com" />
     </fragment>
+    <activity
+        android:id="@+id/taskFormActivity"
+        android:name="com.habitrpg.android.habitica.ui.activities.TaskFormActivity">
+
+    </activity>
+    <activity
+        android:id="@+id/taskSummaryActivity"
+        android:name="com.habitrpg.android.habitica.ui.activities.TaskSummaryActivity">
+
+    </activity>
     <fragment
         android:id="@+id/partyFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.social.party.PartyFragment"
@@ -121,8 +121,8 @@
             android:id="@+id/openAvatarDetail"
             app:destination="@id/avatarCustomizationFragment" />
         <action
-            android:id="@+id/openAvatarEquipment"
-            app:destination="@id/avatarEquipmentFragment" />
+            android:id="@+id/openEquipmentDetail"
+            app:destination="@id/equipmentDetailFragment" />
     </fragment>
     <fragment
         android:id="@+id/itemsFragment"
@@ -298,17 +298,6 @@
             android:name="category"
             app:argType="string" />
     </fragment>
-    <fragment
-        android:id="@+id/avatarEquipmentFragment"
-        android:name="com.habitrpg.android.habitica.ui.fragments.inventory.customization.AvatarEquipmentFragment"
-        android:label="@string/sidebar_avatar" >
-        <argument
-            android:name="type"
-            app:argType="string" />
-        <argument
-            android:name="category"
-            app:argType="string" />
-    </fragment>
     <activity
         android:id="@+id/prefsActivity"
         android:name="com.habitrpg.android.habitica.ui.activities.PrefsActivity"
diff --git a/Habitica/res/values-night/colors.xml b/Habitica/res/values-night/colors.xml
index ae964c275..c36efabc6 100644
--- a/Habitica/res/values-night/colors.xml
+++ b/Habitica/res/values-night/colors.xml
@@ -68,4 +68,5 @@
 
 
     <color name="widget_background">#2B203A</color>
+    <color name="text_gold">@color/yellow_100</color>
 </resources>
diff --git a/Habitica/res/values/colors.xml b/Habitica/res/values/colors.xml
index c6be00303..9d565e0b7 100644
--- a/Habitica/res/values/colors.xml
+++ b/Habitica/res/values/colors.xml
@@ -119,4 +119,5 @@
     <color name="lightly_tinted_background">@color/brand_700</color>
     <color name="dialog_background">@color/white</color>
     <color name="error_banner_background">@color/maroon_5</color>
+    <color name="text_gold">@color/yellow_1</color>
 </resources>
diff --git a/Habitica/res/values/dimens.xml b/Habitica/res/values/dimens.xml
index e60c9e39c..c8d580874 100644
--- a/Habitica/res/values/dimens.xml
+++ b/Habitica/res/values/dimens.xml
@@ -36,7 +36,7 @@
     <dimen name="checkbox_size">24dp</dimen>
     <dimen name="checkbox_compact_size">20dp</dimen>
 
-    <dimen name="task_top_bottom_padding">10dp</dimen>
+    <dimen name="task_top_bottom_padding">8dp</dimen>
     <dimen name="task_top_bottom_compact_padding">8dp</dimen>
     <dimen name="reward_spacing">8dp</dimen>
     <dimen name="grid_item_margin">6dp</dimen>
diff --git a/Habitica/res/values/strings.sidebar.xml b/Habitica/res/values/strings.sidebar.xml
index e6265a982..0f4224a3d 100644
--- a/Habitica/res/values/strings.sidebar.xml
+++ b/Habitica/res/values/strings.sidebar.xml
@@ -12,6 +12,7 @@
     <string name="sidebar_challenges">Challenges</string>
     <string name="sidebar_section_inventory">Inventory</string>
     <string name="sidebar_avatar">Avatar Customization</string>
+    <string name="sidebar_avatar_equipment">Avatar &amp; Equipment</string>
     <string name="sidebar_equipment">Equipment</string>
     <string name="sidebar_stable">Pets &amp; Mounts</string>
     <string name="sidebar_news">News</string>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index d1f8f5528..acd6d9e5e 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -1255,4 +1255,14 @@
     <string name="copy_tasks_description">Show assigned and open tasks on your personal task lists</string>
     <string name="copy_shared_tasks">Copy shared tasks</string>
     <string name="group_plan_settings">Group Plan Settings</string>
+    <string name="task_summary">Task Summary</string>
+    <plurals name="you_x_others">
+        <item quantity="zero">You</item>
+        <item quantity="one">You, %d other</item>
+        <item quantity="other">You, %d others</item>
+    </plurals>
+    <plurals name="people">
+        <item quantity="one">%d Person</item>
+        <item quantity="other">%d People</item>
+    </plurals>
 </resources>
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index 48e23d006..72e59c4da 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -26,6 +26,7 @@
         <item name="colorPrimaryDistinct">@color/brand_500</item>
         <item name="colorBadgeBackground">@color/brand_400</item>
         <item name="taskFormTint">@color/brand_300</item>
+        <item name="colorSecondaryVariant">@color/brand</item>
 
         <item name="textColorPrimary">@color/text_primary</item>
         <item name="textColorSecondary">@color/text_secondary</item>
diff --git a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/HabiticaTestCase.kt b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/HabiticaTestCase.kt
index 6d04fe669..5320b66d7 100644
--- a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/HabiticaTestCase.kt
+++ b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/HabiticaTestCase.kt
@@ -3,7 +3,6 @@ package com.habitrpg.android.habitica
 import android.content.SharedPreferences
 import androidx.lifecycle.MutableLiveData
 import com.habitrpg.android.habitica.api.GSonFactoryCreator
-import com.habitrpg.common.habitica.api.HostConfig
 import com.habitrpg.android.habitica.api.MaintenanceApiService
 import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.data.ContentRepository
@@ -14,9 +13,9 @@ import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.data.TutorialRepository
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.NotificationsManager
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.helpers.SoundManager
 import com.habitrpg.android.habitica.interactors.FeedPetUseCase
 import com.habitrpg.android.habitica.interactors.HatchPetUseCase
@@ -29,22 +28,23 @@ import com.habitrpg.android.habitica.models.inventory.QuestContent
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.proxy.AnalyticsManager
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
+import com.habitrpg.common.habitica.api.HostConfig
 import com.kaspersky.kaspresso.testcases.api.testcase.TestCase
 import io.mockk.clearAllMocks
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.mockkObject
 import io.mockk.slot
-import io.reactivex.rxjava3.core.BackpressureStrategy
 import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.subjects.PublishSubject
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.flowOf
+import org.junit.Before
 import java.io.InputStreamReader
 import java.lang.reflect.Type
 import kotlin.reflect.KCallable
 import kotlin.reflect.KMutableProperty1
 import kotlin.reflect.full.starProjectedType
 import kotlin.reflect.jvm.javaField
-import org.junit.Before
 
 open class HabiticaTestCase : TestCase() {
     val gson = GSonFactoryCreator.createGson()
@@ -68,8 +68,7 @@ open class HabiticaTestCase : TestCase() {
     val hatchPetUseCase: HatchPetUseCase = mockk(relaxed = true)
     val feedPetUseCase: FeedPetUseCase = mockk(relaxed = true)
 
-    val userSubject = PublishSubject.create<User>()
-    val userEvents: Flowable<User> = userSubject.toFlowable(BackpressureStrategy.DROP)
+    val userState = MutableStateFlow<User?>(null)
     var user = User()
     lateinit var content: ContentResult
 
@@ -85,27 +84,27 @@ open class HabiticaTestCase : TestCase() {
         user = loadJsonFile("user", User::class.java)
         user.stats?.lvl = 20
         user.stats?.points = 30
-        every { userRepository.getUser() } returns userEvents
+        every { userRepository.getUser() } returns userState
         every { userViewModel.user } returns MutableLiveData<User?>(user)
-        mockkObject(RxErrorHandler)
-        every { RxErrorHandler.reportError(capture(errorSlot)) } answers {
+        mockkObject(ExceptionHandler)
+        every { ExceptionHandler.reportError(capture(errorSlot)) } answers {
             throw errorSlot.captured
         }
         every { socialRepository.getUnmanagedCopy(capture(unmanagedSlot)) } answers { unmanagedSlot.captured }
         content = loadJsonFile("content", ContentResult::class.java)
-        every { inventoryRepository.getPets() } returns Flowable.just(content.pets)
-        every { inventoryRepository.getMounts() } returns Flowable.just(content.mounts)
+        every { inventoryRepository.getPets() } returns flowOf(content.pets)
+        every { inventoryRepository.getMounts() } returns flowOf(content.mounts)
         every { inventoryRepository.getItemsFlowable(Food::class.java) } returns Flowable.just(content.food)
         every { inventoryRepository.getItemsFlowable(Egg::class.java) } returns Flowable.just(content.eggs)
         every { inventoryRepository.getItemsFlowable(HatchingPotion::class.java) } returns Flowable.just(content.hatchingPotions)
         every { inventoryRepository.getItemsFlowable(QuestContent::class.java) } returns Flowable.just(content.quests)
 
-        every { inventoryRepository.getItemsFlowable(Food::class.java, any()) } returns Flowable.just(content.food)
-        every { inventoryRepository.getItemsFlowable(Egg::class.java, any()) } answers {
-            Flowable.just(content.eggs)
+        every { inventoryRepository.getItems(Food::class.java, any()) } returns flowOf(content.food)
+        every { inventoryRepository.getItems(Egg::class.java, any()) } answers {
+            flowOf(content.eggs)
         }
-        every { inventoryRepository.getItemsFlowable(HatchingPotion::class.java, any()) } returns Flowable.just(content.hatchingPotions)
-        every { inventoryRepository.getItemsFlowable(QuestContent::class.java, any()) } returns Flowable.just(content.quests)
+        every { inventoryRepository.getItems(HatchingPotion::class.java, any()) } returns flowOf(content.hatchingPotions)
+        every { inventoryRepository.getItems(QuestContent::class.java, any()) } returns flowOf(content.quests)
     }
 
     internal fun <T> loadJsonFile(s: String, type: Type): T {
diff --git a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/StatsFragmentTest.kt b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/StatsFragmentTest.kt
index 2ee2ba7cc..a69fb6889 100644
--- a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/StatsFragmentTest.kt
+++ b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/StatsFragmentTest.kt
@@ -63,7 +63,7 @@ class StatsFragmentTest : FragmentTestCase<StatsFragment, FragmentStatsBinding,
     fun setUpUser() {
         user.stats?.lvl = 20
         user.stats?.points = 30
-        userSubject.onNext(user)
+        userState.onNext(user)
 
         every { inventoryRepository.getEquipment(listOf()) } returns Flowable.just(listOf())
     }
diff --git a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragmentTest.kt b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragmentTest.kt
index f347c70da..d4806812c 100644
--- a/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragmentTest.kt
+++ b/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragmentTest.kt
@@ -115,7 +115,7 @@ internal class ItemRecyclerFragmentTest : FragmentTestCase<ItemRecyclerFragment,
             items = (items + items).sortedBy { it.key }
             Flowable.just(items)
         }
-        every { inventoryRepository.getItemsFlowable(Food::class.java, any()) } answers {
+        every { inventoryRepository.getItems(Food::class.java, any()) } answers {
             Flowable.just((content.eggs + content.eggs).sortedBy { it.key })
         }
         fragment.itemType = "food"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
index 6901fe38f..276ea59d2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
@@ -29,7 +29,7 @@ import com.habitrpg.android.habitica.components.AppComponent
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.helpers.AdHandler
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager
 import com.habitrpg.android.habitica.modules.UserModule
 import com.habitrpg.android.habitica.modules.UserRepositoryModule
@@ -86,7 +86,7 @@ abstract class HabiticaBaseApplication : Application(), Application.ActivityLife
         }
         setupCoil()
 
-        RxErrorHandler.init(analyticsManager)
+        ExceptionHandler.init(analyticsManager)
 
         FirebaseAnalytics.getInstance(this).setUserProperty("app_testing_level", BuildConfig.TESTING_LEVEL)
 
@@ -120,7 +120,6 @@ abstract class HabiticaBaseApplication : Application(), Application.ActivityLife
             .deleteRealmIfMigrationNeeded()
             .allowWritesOnUiThread(true)
             .compactOnLaunch { totalBytes, usedBytes ->
-
                 // Compact if the file is over 100MB in size and less than 50% 'used'
                 val oneHundredMB = 50 * 1024 * 1024
                 (totalBytes > oneHundredMB) && (usedBytes / totalBytes) < 0.5
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt
index b94f5b2a5..ab3fe3f3c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt
@@ -26,13 +26,13 @@ import com.habitrpg.android.habitica.models.tasks.TaskList
 import com.habitrpg.android.habitica.models.user.Items
 import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.common.habitica.models.HabitResponse
 import com.habitrpg.common.habitica.models.PurchaseValidationRequest
 import com.habitrpg.common.habitica.models.PurchaseValidationResult
 import com.habitrpg.common.habitica.models.auth.UserAuth
 import com.habitrpg.common.habitica.models.auth.UserAuthResponse
 import com.habitrpg.common.habitica.models.auth.UserAuthSocial
 import com.habitrpg.shared.habitica.models.responses.FeedResponse
-import com.habitrpg.common.habitica.models.HabitResponse
 import com.habitrpg.shared.habitica.models.responses.Status
 import com.habitrpg.shared.habitica.models.responses.TaskDirectionData
 import com.habitrpg.shared.habitica.models.responses.VerifyUsernameResponse
@@ -49,27 +49,27 @@ import retrofit2.http.Query
 
 @JvmSuppressWildcards
 interface ApiService {
-    @get:GET("status")
-    val status: Flowable<HabitResponse<Status>>
+    @GET("status")
+    suspend fun getStatus(): HabitResponse<Status>
 
     /* user API */
 
-    @get:GET("user/")
-    val user: Flowable<HabitResponse<User>>
+    @GET("user/")
+    suspend fun getUser(): HabitResponse<User>
 
     @GET("inbox/messages")
-    fun getInboxMessages(@Query("conversation") uuid: String, @Query("page") page: Int): Flowable<HabitResponse<List<ChatMessage>>>
+    suspend fun getInboxMessages(@Query("conversation") uuid: String, @Query("page") page: Int): HabitResponse<List<ChatMessage>>
     @GET("inbox/conversations")
     fun getInboxConversations(): Flowable<HabitResponse<List<InboxConversation>>>
 
-    @get:GET("tasks/user")
-    val tasks: Flowable<HabitResponse<TaskList>>
+    @GET("tasks/user")
+    suspend fun getTasks(): HabitResponse<TaskList>
 
-    @get:GET("world-state")
-    val worldState: Flowable<HabitResponse<WorldState>>
+    @GET("world-state")
+    suspend fun worldState(): HabitResponse<WorldState>
 
     @GET("content")
-    fun getContent(@Query("language") language: String?): Flowable<HabitResponse<ContentResult>>
+    suspend fun getContent(@Query("language") language: String?): HabitResponse<ContentResult>
 
     @PUT("user/")
     fun updateUser(@Body updateDictionary: Map<String, Any>): Flowable<HabitResponse<User>>
@@ -130,7 +130,7 @@ interface ApiService {
     fun getTask(@Path("id") id: String): Flowable<HabitResponse<Task>>
 
     @POST("tasks/{id}/score/{direction}")
-    fun postTaskDirection(@Path("id") id: String, @Path("direction") direction: String): Flowable<HabitResponse<TaskDirectionData>>
+    suspend fun postTaskDirection(@Path("id") id: String, @Path("direction") direction: String): HabitResponse<TaskDirectionData>
     @POST("tasks/bulk-score")
     fun bulkScoreTasks(@Body data: List<Map<String, String>>): Flowable<HabitResponse<BulkTaskScoringData>>
 
@@ -138,7 +138,7 @@ interface ApiService {
     fun postTaskNewPosition(@Path("id") id: String, @Path("position") position: Int): Flowable<HabitResponse<List<String>>>
 
     @POST("tasks/{taskId}/checklist/{itemId}/score")
-    fun scoreChecklistItem(@Path("taskId") taskId: String, @Path("itemId") itemId: String): Flowable<HabitResponse<Task>>
+    suspend fun scoreChecklistItem(@Path("taskId") taskId: String, @Path("itemId") itemId: String): HabitResponse<Task>
 
     @POST("tasks/user")
     fun createTask(@Body item: Task): Flowable<HabitResponse<Task>>
@@ -177,10 +177,10 @@ interface ApiService {
     fun loginApple(@Body auth: Map<String, Any>): Flowable<HabitResponse<UserAuthResponse>>
 
     @POST("user/sleep")
-    fun sleep(): Flowable<HabitResponse<Boolean>>
+    suspend fun sleep(): HabitResponse<Boolean>
 
     @POST("user/revive")
-    fun revive(): Flowable<HabitResponse<User>>
+    suspend fun revive(): HabitResponse<User>
 
     @POST("user/class/cast/{skill}")
     fun useSkill(
@@ -193,13 +193,13 @@ interface ApiService {
     fun useSkill(@Path("skill") skillName: String, @Query("targetType") targetType: String): Flowable<HabitResponse<SkillResponse>>
 
     @POST("user/change-class")
-    fun changeClass(): Flowable<HabitResponse<User>>
+    suspend fun changeClass(): HabitResponse<User>
 
     @POST("user/change-class")
-    fun changeClass(@Query("class") className: String): Flowable<HabitResponse<User>>
+    suspend fun changeClass(@Query("class") className: String): HabitResponse<User>
 
     @POST("user/disable-classes")
-    fun disableClasses(): Flowable<HabitResponse<User>>
+    suspend fun disableClasses(): HabitResponse<User>
 
     @POST("user/mark-pms-read")
     fun markPrivateMessagesRead(): Flowable<Void>
@@ -210,25 +210,25 @@ interface ApiService {
     fun listGroups(@Query("type") type: String): Flowable<HabitResponse<List<Group>>>
 
     @GET("groups/{gid}")
-    fun getGroup(@Path("gid") groupId: String): Flowable<HabitResponse<Group>>
+    suspend fun getGroup(@Path("gid") groupId: String): HabitResponse<Group>
 
     @POST("groups")
-    fun createGroup(@Body item: Group): Flowable<HabitResponse<Group>>
+    suspend fun createGroup(@Body item: Group): HabitResponse<Group>
 
     @PUT("groups/{id}")
-    fun updateGroup(@Path("id") id: String, @Body item: Group): Flowable<HabitResponse<Group>>
+    suspend fun updateGroup(@Path("id") id: String, @Body item: Group): HabitResponse<Group>
 
     @POST("groups/{groupID}/removeMember/{userID}")
-    fun removeMemberFromGroup(@Path("groupID") groupID: String, @Path("userID") userID: String): Flowable<HabitResponse<Void>>
+    suspend fun removeMemberFromGroup(@Path("groupID") groupID: String, @Path("userID") userID: String): HabitResponse<Void>
 
     @GET("groups/{gid}/chat")
-    fun listGroupChat(@Path("gid") groupId: String): Flowable<HabitResponse<List<ChatMessage>>>
+    suspend fun listGroupChat(@Path("gid") groupId: String): HabitResponse<List<ChatMessage>>
 
     @POST("groups/{gid}/join")
-    fun joinGroup(@Path("gid") groupId: String): Flowable<HabitResponse<Group>>
+    suspend fun joinGroup(@Path("gid") groupId: String): HabitResponse<Group>
 
     @POST("groups/{gid}/leave")
-    fun leaveGroup(@Path("gid") groupId: String, @Query("keepChallenges") keepChallenges: String): Flowable<HabitResponse<Void>>
+    suspend fun leaveGroup(@Path("gid") groupId: String, @Query("keepChallenges") keepChallenges: String): HabitResponse<Void>
 
     @POST("groups/{gid}/chat")
     fun postGroupChat(@Path("gid") groupId: String, @Body message: Map<String, String>): Flowable<HabitResponse<PostChatMessageResult>>
@@ -240,17 +240,17 @@ interface ApiService {
     fun deleteInboxMessage(@Path("messageId") messageId: String): Flowable<HabitResponse<Void>>
 
     @GET("groups/{gid}/members")
-    fun getGroupMembers(
+    suspend fun getGroupMembers(
         @Path("gid") groupId: String,
         @Query("includeAllPublicFields") includeAllPublicFields: Boolean?
-    ): Flowable<HabitResponse<List<Member>>>
+    ): HabitResponse<List<Member>>
 
     @GET("groups/{gid}/members")
-    fun getGroupMembers(
+    suspend fun getGroupMembers(
         @Path("gid") groupId: String,
         @Query("includeAllPublicFields") includeAllPublicFields: Boolean?,
         @Query("lastId") lastId: String
-    ): Flowable<HabitResponse<List<Member>>>
+    ): HabitResponse<List<Member>>
 
     // Like returns the full chat list
     @POST("groups/{gid}/chat/{mid}/like")
@@ -300,7 +300,7 @@ interface ApiService {
     fun validateSubscription(@Body request: PurchaseValidationRequest): Flowable<HabitResponse<Void>>
 
     @GET("/iap/android/subscribe/cancel")
-    fun cancelSubscription(): Flowable<HabitResponse<Void>>
+    suspend fun cancelSubscription(): HabitResponse<Void>
 
     @POST("/iap/android/norenew-subscribe")
     fun validateNoRenewSubscription(@Body request: PurchaseValidationRequest): Flowable<HabitResponse<Void>>
@@ -310,16 +310,16 @@ interface ApiService {
 
     // Members URL
     @GET("members/{mid}")
-    fun getMember(@Path("mid") memberId: String): Flowable<HabitResponse<Member>>
+    suspend fun getMember(@Path("mid") memberId: String): HabitResponse<Member>
 
     @GET("members/username/{username}")
-    fun getMemberWithUsername(@Path("username") username: String): Flowable<HabitResponse<Member>>
+    suspend fun getMemberWithUsername(@Path("username") username: String): HabitResponse<Member>
 
     @GET("members/{mid}/achievements")
     fun getMemberAchievements(@Path("mid") memberId: String, @Query("lang") language: String?): Flowable<HabitResponse<List<Achievement>>>
 
     @POST("members/send-private-message")
-    fun postPrivateMessage(@Body messageDetails: Map<String, String>): Flowable<HabitResponse<PostChatMessageResult>>
+    suspend fun postPrivateMessage(@Body messageDetails: Map<String, String>): HabitResponse<PostChatMessageResult>
 
     @GET("members/find/{username}")
     fun findUsernames(
@@ -440,7 +440,7 @@ interface ApiService {
     fun blockMember(@Path("userID") userID: String): Flowable<HabitResponse<List<String>>>
 
     @POST("user/reroll")
-    fun reroll(): Flowable<HabitResponse<User>>
+    suspend fun reroll(): HabitResponse<User>
 
     // Team Plans
 
@@ -448,5 +448,5 @@ interface ApiService {
     fun getTeamPlans(): Flowable<HabitResponse<List<TeamPlan>>>
 
     @GET("tasks/group/{groupID}")
-    fun getTeamPlanTasks(@Path("groupID") groupId: String): Flowable<HabitResponse<TaskList>>
+    suspend fun getTeamPlanTasks(@Path("groupID") groupId: String): HabitResponse<TaskList>
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/api/GSonFactoryCreator.java b/Habitica/src/main/java/com/habitrpg/android/habitica/api/GSonFactoryCreator.java
index 553d68f81..860c8de38 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/api/GSonFactoryCreator.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/api/GSonFactoryCreator.java
@@ -6,6 +6,8 @@ import com.google.gson.reflect.TypeToken;
 import com.habitrpg.android.habitica.models.Achievement;
 import com.habitrpg.android.habitica.models.ContentResult;
 import com.habitrpg.android.habitica.models.FAQArticle;
+import com.habitrpg.android.habitica.models.tasks.GroupAssignedDetails;
+import com.habitrpg.android.habitica.utils.AssignedDetailsDeserializer;
 import com.habitrpg.common.habitica.models.Notification;
 import com.habitrpg.android.habitica.models.Skill;
 import com.habitrpg.android.habitica.models.Tag;
@@ -101,6 +103,8 @@ public class GSonFactoryCreator {
         }.getType();
         Type achievementsListType = new TypeToken<List<Achievement>>() {
         }.getType();
+        Type assignedDetailsListType = new TypeToken<RealmList<GroupAssignedDetails>>() {
+        }.getType();
 
         return new GsonBuilder()
                 .registerTypeAdapter(taskTagClassListType, new TaskTagDeserializer())
@@ -129,6 +133,7 @@ public class GSonFactoryCreator {
                 .registerTypeAdapter(ownedPetListType, new OwnedPetListDeserializer())
                 .registerTypeAdapter(ownedMountListType, new OwnedMountListDeserializer())
                 .registerTypeAdapter(achievementsListType, new AchievementListDeserializer())
+                .registerTypeAdapter(assignedDetailsListType, new AssignedDetailsDeserializer())
                 .registerTypeAdapter(Quest.class, new QuestDeserializer())
                 .registerTypeAdapter(Member.class, new MemberSerialization())
                 .registerTypeAdapter(WorldState.class, new WorldStateSerialization())
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java
index 1af774a36..6cbab653f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java
@@ -38,6 +38,8 @@ import com.habitrpg.android.habitica.ui.activities.SetupActivity;
 import com.habitrpg.android.habitica.ui.activities.SkillMemberActivity;
 import com.habitrpg.android.habitica.ui.activities.SkillTasksActivity;
 import com.habitrpg.android.habitica.ui.activities.TaskFormActivity;
+import com.habitrpg.android.habitica.ui.activities.TaskSummaryActivity;
+import com.habitrpg.android.habitica.ui.activities.TaskSummaryViewModel;
 import com.habitrpg.android.habitica.ui.activities.VerifyUsernameActivity;
 import com.habitrpg.android.habitica.ui.adapter.social.challenges.ChallengeTasksRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.adapter.tasks.DailiesRecyclerViewHolder;
@@ -52,10 +54,8 @@ import com.habitrpg.android.habitica.ui.fragments.PromoInfoFragment;
 import com.habitrpg.android.habitica.ui.fragments.PromoWebFragment;
 import com.habitrpg.android.habitica.ui.fragments.StatsFragment;
 import com.habitrpg.android.habitica.ui.fragments.inventory.customization.AvatarCustomizationFragment;
-import com.habitrpg.android.habitica.ui.fragments.inventory.customization.AvatarEquipmentFragment;
 import com.habitrpg.android.habitica.ui.fragments.inventory.customization.AvatarOverviewFragment;
 import com.habitrpg.android.habitica.ui.fragments.inventory.equipment.EquipmentDetailFragment;
-import com.habitrpg.android.habitica.ui.fragments.inventory.equipment.EquipmentOverviewFragment;
 import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemDialogFragment;
 import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemRecyclerFragment;
 import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemsFragment;
@@ -165,8 +165,6 @@ public interface UserComponent {
 
     void inject(EquipmentDetailFragment equipmentDetailFragment);
 
-    void inject(EquipmentOverviewFragment equipmentOverviewFragment);
-
     void inject(ItemRecyclerFragment itemRecyclerFragment);
 
     void inject(ItemsFragment itemsFragment);
@@ -333,8 +331,6 @@ public interface UserComponent {
 
     void inject(BugFixFragment bugFixFragment);
 
-    void inject(AvatarEquipmentFragment avatarEquipmentFragment);
-
     void inject(FAQDetailFragment faqDetailFragment);
 
     void inject(AdventureGuideActivity adventureGuideFragment);
@@ -370,4 +366,8 @@ public interface UserComponent {
     void inject(@NotNull DeathActivity deathActivity);
 
     void inject(@NotNull DeviceCommunicationService deviceCommunicationService);
+
+    void inject(@NotNull TaskSummaryActivity taskSummaryActivity);
+
+    void inject(@NotNull TaskSummaryViewModel taskSummaryViewModel);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt
index e972141e9..26dbacaac 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt
@@ -27,12 +27,12 @@ import com.habitrpg.android.habitica.models.user.Items
 import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.common.habitica.api.HostConfig
+import com.habitrpg.common.habitica.models.HabitResponse
 import com.habitrpg.common.habitica.models.PurchaseValidationRequest
 import com.habitrpg.common.habitica.models.PurchaseValidationResult
 import com.habitrpg.common.habitica.models.auth.UserAuthResponse
 import com.habitrpg.shared.habitica.models.responses.ErrorResponse
 import com.habitrpg.shared.habitica.models.responses.FeedResponse
-import com.habitrpg.common.habitica.models.HabitResponse
 import com.habitrpg.shared.habitica.models.responses.Status
 import com.habitrpg.shared.habitica.models.responses.TaskDirectionData
 import com.habitrpg.shared.habitica.models.responses.VerifyUsernameResponse
@@ -44,23 +44,19 @@ interface ApiClient {
 
     val hostConfig: HostConfig
 
-    val status: Flowable<Status>
-
-    val content: Flowable<ContentResult>
+    suspend fun getStatus(): Status?
 
     /* user API */
 
-    val user: Flowable<User>
-
-    val tasks: Flowable<TaskList>
+    suspend fun getTasks(): TaskList?
 
     /* challenges api */
 
     fun getUserChallenges(page: Int, memberOnly: Boolean): Flowable<List<Challenge>>
 
-    val worldState: Flowable<WorldState>
+    suspend fun getWorldState(): WorldState?
     fun setLanguageCode(languageCode: String)
-    fun getContent(language: String): Flowable<ContentResult>
+    suspend fun getContent(language: String? = null): ContentResult?
 
     fun updateUser(updateDictionary: Map<String, Any>): Flowable<User>
 
@@ -83,7 +79,7 @@ interface ApiClient {
     fun purchaseSpecialSpell(key: String): Flowable<Void>
     fun validateSubscription(request: PurchaseValidationRequest): Flowable<Any>
     fun validateNoRenewSubscription(request: PurchaseValidationRequest): Flowable<Any>
-    fun cancelSubscription(): Flowable<Void>
+    suspend fun cancelSubscription(): Void?
 
     fun sellItem(itemType: String, itemKey: String): Flowable<User>
 
@@ -97,12 +93,12 @@ interface ApiClient {
 
     fun getTask(id: String): Flowable<Task>
 
-    fun postTaskDirection(id: String, direction: String): Flowable<TaskDirectionData>
+    suspend fun postTaskDirection(id: String, direction: String): TaskDirectionData?
     fun bulkScoreTasks(data: List<Map<String, String>>): Flowable<BulkTaskScoringData>
 
     fun postTaskNewPosition(id: String, position: Int): Flowable<List<String>>
 
-    fun scoreChecklistItem(taskId: String, itemId: String): Flowable<Task>
+    suspend fun scoreChecklistItem(taskId: String, itemId: String): Task?
 
     fun createTask(item: Task): Flowable<Task>
 
@@ -127,19 +123,16 @@ interface ApiClient {
 
     fun loginApple(authToken: String): Flowable<UserAuthResponse>
 
-    fun sleep(): Flowable<Boolean>
-
-    fun revive(): Flowable<User>
+    suspend fun sleep(): Boolean?
+    suspend fun revive(): User?
 
     fun useSkill(skillName: String, targetType: String, targetId: String): Flowable<SkillResponse>
 
     fun useSkill(skillName: String, targetType: String): Flowable<SkillResponse>
 
-    fun changeClass(): Flowable<User>
+    suspend fun changeClass(className: String?): User?
 
-    fun changeClass(className: String): Flowable<User>
-
-    fun disableClasses(): Flowable<User>
+    suspend fun disableClasses(): User?
 
     fun markPrivateMessagesRead(): Flowable<Void>
 
@@ -147,26 +140,26 @@ interface ApiClient {
 
     fun listGroups(type: String): Flowable<List<Group>>
 
-    fun getGroup(groupId: String): Flowable<Group>
+    suspend fun getGroup(groupId: String): Group?
 
-    fun createGroup(group: Group): Flowable<Group>
-    fun updateGroup(id: String, item: Group): Flowable<Group>
-    fun removeMemberFromGroup(groupID: String, userID: String): Flowable<Void>
+    suspend fun createGroup(group: Group): Group?
+    suspend fun updateGroup(id: String, item: Group): Group?
+    suspend fun removeMemberFromGroup(groupID: String, userID: String): Void?
 
-    fun listGroupChat(groupId: String): Flowable<List<ChatMessage>>
+    suspend fun listGroupChat(groupId: String): List<ChatMessage>?
 
-    fun joinGroup(groupId: String): Flowable<Group>
+    suspend fun joinGroup(groupId: String): Group?
 
-    fun leaveGroup(groupId: String, keepChallenges: String): Flowable<Void>
+    suspend fun leaveGroup(groupId: String, keepChallenges: String): Void?
 
     fun postGroupChat(groupId: String, message: Map<String, String>): Flowable<PostChatMessageResult>
 
     fun deleteMessage(groupId: String, messageId: String): Flowable<Void>
     fun deleteInboxMessage(id: String): Flowable<Void>
 
-    fun getGroupMembers(groupId: String, includeAllPublicFields: Boolean?): Flowable<List<Member>>
+    suspend fun getGroupMembers(groupId: String, includeAllPublicFields: Boolean?): List<Member>?
 
-    fun getGroupMembers(groupId: String, includeAllPublicFields: Boolean?, lastId: String): Flowable<List<Member>>
+    suspend fun getGroupMembers(groupId: String, includeAllPublicFields: Boolean?, lastId: String): List<Member>?
 
     // Like returns the full chat list
     fun likeMessage(groupId: String, mid: String): Flowable<ChatMessage>
@@ -199,12 +192,12 @@ interface ApiClient {
     fun changeCustomDayStart(updateObject: Map<String, Any>): Flowable<User>
 
     // Members URL
-    fun getMember(memberId: String): Flowable<Member>
-    fun getMemberWithUsername(username: String): Flowable<Member>
+    suspend fun getMember(memberId: String): Member?
+    suspend fun getMemberWithUsername(username: String): Member?
 
     fun getMemberAchievements(memberId: String): Flowable<List<Achievement>>
 
-    fun postPrivateMessage(messageDetails: Map<String, String>): Flowable<PostChatMessageResult>
+    suspend fun postPrivateMessage(messageDetails: Map<String, String>): PostChatMessageResult?
 
     fun retrieveShopIventory(identifier: String): Flowable<Shop>
 
@@ -243,8 +236,8 @@ interface ApiClient {
 
     fun hasAuthenticationKeys(): Boolean
 
-    fun retrieveUser(withTasks: Boolean): Flowable<User>
-    fun retrieveInboxMessages(uuid: String, page: Int): Flowable<List<ChatMessage>>
+    suspend fun retrieveUser(withTasks: Boolean = false): User?
+    suspend fun retrieveInboxMessages(uuid: String, page: Int): List<ChatMessage>?
     fun retrieveInboxConversations(): Flowable<List<InboxConversation>>
 
     fun <T : Any> configureApiCallObserver(): FlowableTransformer<HabitResponse<T>, T>
@@ -253,7 +246,7 @@ interface ApiClient {
 
     fun runCron(): Flowable<Void>
 
-    fun reroll(): Flowable<User>
+    suspend fun reroll(): User?
 
     fun resetAccount(): Flowable<Void>
     fun deleteAccount(password: String): Flowable<Void>
@@ -282,5 +275,5 @@ interface ApiClient {
     fun unlinkAllTasks(challengeID: String?, keepOption: String): Flowable<Void>
     fun blockMember(userID: String): Flowable<List<String>>
     fun getTeamPlans(): Flowable<List<TeamPlan>>
-    fun getTeamPlanTasks(teamID: String): Flowable<TaskList>
+    suspend fun getTeamPlanTasks(teamID: String): TaskList?
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ContentRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ContentRepository.kt
index ff0f53e2d..1a71ef514 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ContentRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ContentRepository.kt
@@ -4,9 +4,9 @@ import com.habitrpg.android.habitica.models.ContentResult
 import com.habitrpg.android.habitica.models.WorldState
 import io.reactivex.rxjava3.core.Flowable
 
-interface ContentRepository : BaseRepository {
-    fun retrieveContent(forced: Boolean = false): Flowable<ContentResult>
+interface ContentRepository: BaseRepository {
+    suspend fun retrieveContent(forced: Boolean = false): ContentResult?
 
-    fun retrieveWorldState(): Flowable<WorldState>
+    suspend fun retrieveWorldState(): WorldState?
     fun getWorldState(): Flowable<WorldState>
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.kt
index da3677bcd..8fa5eea2c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.kt
@@ -35,7 +35,7 @@ interface InventoryRepository : BaseRepository {
     fun getPets(): Flow<List<Pet>>
 
     fun getOwnedPets(): Flow<List<OwnedPet>>
-    fun getQuestContent(key: String): Flowable<QuestContent>
+    fun getQuestContent(key: String): Flow<QuestContent?>
     fun getQuestContent(keys: List<String>): Flow<List<QuestContent>>
 
     fun getEquipment(searchedKeys: List<String>): Flowable<out List<Equipment>>
@@ -86,7 +86,7 @@ interface InventoryRepository : BaseRepository {
     fun purchaseItem(purchaseType: String, key: String, purchaseQuantity: Int): Flowable<Void>
 
     fun togglePinnedItem(item: ShopItem): Flowable<List<ShopItem>>
-    fun getItemsFlowable(itemClass: Class<out Item>, keys: Array<String>): Flow<List<Item>>
+    fun getItems(itemClass: Class<out Item>, keys: Array<String>): Flow<List<Item>>
     fun getItemsFlowable(itemClass: Class<out Item>): Flowable<out List<Item>>
     fun getItems(itemClass: Class<out Item>): Flow<List<Item>>
     fun getLatestMysteryItem(): Flowable<Equipment>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.kt
index 4d0732594..dfb6713f7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.kt
@@ -11,14 +11,14 @@ import com.habitrpg.android.habitica.models.social.GroupMembership
 import com.habitrpg.android.habitica.models.social.InboxConversation
 import com.habitrpg.android.habitica.models.user.User
 import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.core.Single
+import io.realm.RealmResults
 import kotlinx.coroutines.flow.Flow
 
 interface SocialRepository : BaseRepository {
     fun getPublicGuilds(): Flowable<out List<Group>>
 
-    fun getUserGroups(type: String?): Flowable<out List<Group>>
-    fun retrieveGroupChat(groupId: String): Single<List<ChatMessage>>
+    fun getUserGroups(type: String?): Flow<List<Group>>
+    suspend fun retrieveGroupChat(groupId: String): List<ChatMessage>?
     fun getGroupChat(groupId: String): Flowable<out List<ChatMessage>>
 
     fun markMessagesSeen(seenGroupId: String)
@@ -40,52 +40,52 @@ interface SocialRepository : BaseRepository {
 
     fun postGroupChat(groupId: String, message: String): Flowable<PostChatMessageResult>
 
-    fun retrieveGroup(id: String): Flowable<Group>
+    suspend fun retrieveGroup(id: String): Group?
     fun getGroup(id: String?): Flow<Group?>
-    fun getGroupFlowable(id: String?): Flowable<Group>
 
-    fun leaveGroup(id: String?, keepChallenges: Boolean): Flowable<Group>
+    suspend fun leaveGroup(id: String?, keepChallenges: Boolean): Group?
 
-    fun joinGroup(id: String?): Flowable<Group>
+    suspend fun joinGroup(id: String?): Group?
 
-    fun createGroup(
+    suspend fun createGroup(
         name: String?,
         description: String?,
         leader: String?,
         type: String?,
         privacy: String?,
         leaderCreateChallenge: Boolean?
-    ): Flowable<Group>
+    ): Group?
 
-    fun updateGroup(
+    suspend fun updateGroup(
         group: Group?,
         name: String?,
         description: String?,
         leader: String?,
         leaderCreateChallenge: Boolean?
-    ): Flowable<Group>
+    ): Group?
 
     fun retrieveGroups(type: String): Flowable<List<Group>>
     fun getGroups(type: String): Flowable<out List<Group>>
 
-    fun getInboxMessages(replyToUserID: String?): Flowable<out List<ChatMessage>>
-    fun retrieveInboxMessages(uuid: String, page: Int): Flowable<List<ChatMessage>>
+    fun getInboxMessages(replyToUserID: String?): Flow<RealmResults<ChatMessage>>
+    suspend fun retrieveInboxMessages(uuid: String, page: Int): List<ChatMessage>?
     fun retrieveInboxConversations(): Flowable<List<InboxConversation>>
-    fun getInboxConversations(): Flowable<out List<InboxConversation>>
-    fun postPrivateMessage(
+    fun getInboxConversations(): Flow<RealmResults<InboxConversation>>
+    suspend fun postPrivateMessage(
         recipientId: String,
         messageObject: HashMap<String, String>
-    ): Flowable<List<ChatMessage>>
+    ): List<ChatMessage>?
 
-    fun postPrivateMessage(recipientId: String, message: String): Flowable<List<ChatMessage>>
+    suspend fun postPrivateMessage(recipientId: String, message: String): List<ChatMessage>?
 
-    fun getGroupMembers(id: String): Flow<List<Member>>
-    fun retrieveGroupMembers(id: String, includeAllPublicFields: Boolean): Flowable<List<Member>>
+    suspend fun getPartyMembers(id: String): Flow<List<Member>>
+    suspend fun getGroupMembers(id: String): Flow<List<Member>>
+    suspend fun retrievePartyMembers(id: String, includeAllPublicFields: Boolean): List<Member>?
 
     fun inviteToGroup(id: String, inviteData: Map<String, Any>): Flowable<List<Void>>
 
-    fun getMember(userId: String?): Flowable<Member>
-    fun getMemberWithUsername(username: String?): Flowable<Member>
+    suspend fun retrieveMember(userId: String?): Member?
+    suspend fun retrieveMemberWithUsername(username: String?): Member?
 
     fun findUsernames(
         username: String,
@@ -97,8 +97,8 @@ interface SocialRepository : BaseRepository {
 
     fun markSomePrivateMessagesAsRead(user: User?, messages: List<ChatMessage>)
 
-    fun transferGroupOwnership(groupID: String, userID: String): Flowable<Group>
-    fun removeMemberFromGroup(groupID: String, userID: String): Flowable<List<Member>>
+    suspend fun transferGroupOwnership(groupID: String, userID: String): Group?
+    suspend fun removeMemberFromGroup(groupID: String, userID: String): List<Member>?
 
     fun acceptQuest(user: User?, partyId: String = "party"): Flowable<Void>
     fun rejectQuest(user: User?, partyId: String = "party"): Flowable<Void>
@@ -117,7 +117,7 @@ interface SocialRepository : BaseRepository {
 
     fun transferGems(giftedID: String, amount: Int): Flowable<Void>
 
-    fun getGroupMembership(id: String): Flowable<GroupMembership>
+    fun getGroupMembership(id: String): Flow<GroupMembership?>
     fun getGroupMemberships(): Flowable<out List<GroupMembership>>
     fun blockMember(userID: String): Flowable<List<String>>
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.kt
index a6ba14b09..9548b54b3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.kt
@@ -19,27 +19,27 @@ interface TaskRepository : BaseRepository {
     fun getTasksFlowable(taskType: TaskType, userID: String? = null, includedGroupIDs: Array<String>): Flowable<out List<Task>>
     fun saveTasks(userId: String, order: TasksOrder, tasks: TaskList)
 
-    fun retrieveTasks(userId: String, tasksOrder: TasksOrder): Flowable<TaskList>
+    suspend fun retrieveTasks(userId: String, tasksOrder: TasksOrder): TaskList?
     fun retrieveTasks(userId: String, tasksOrder: TasksOrder, dueDate: Date): Flowable<TaskList>
 
-    fun taskChecked(
+    suspend fun taskChecked(
         user: User?,
         task: Task,
         up: Boolean,
         force: Boolean,
         notifyFunc: ((TaskScoringResult) -> Unit)?
-    ): Flowable<TaskScoringResult>
-    fun taskChecked(
+    ): TaskScoringResult?
+    suspend fun taskChecked(
         user: User?,
         taskId: String,
         up: Boolean,
         force: Boolean,
         notifyFunc: ((TaskScoringResult) -> Unit)?
-    ): Maybe<TaskScoringResult>
-    fun scoreChecklistItem(taskId: String, itemId: String): Flowable<Task>
+    ): TaskScoringResult?
+    suspend fun scoreChecklistItem(taskId: String, itemId: String): Task?
 
-    fun getTask(taskId: String): Flowable<Task>
-    fun getTaskCopy(taskId: String): Flowable<Task>
+    fun getTask(taskId: String): Flow<Task>
+    fun getTaskCopy(taskId: String): Flow<Task>
     fun createTask(task: Task, force: Boolean = false): Flowable<Task>
     fun updateTask(task: Task, force: Boolean = false): Maybe<Task>?
     fun deleteTask(taskId: String): Flowable<Void>
@@ -55,7 +55,7 @@ interface TaskRepository : BaseRepository {
 
     fun updateTaskPosition(taskType: TaskType, taskID: String, newPosition: Int): Maybe<List<String>>
 
-    fun getUnmanagedTask(taskid: String): Flowable<Task>
+    fun getUnmanagedTask(taskid: String): Flow<Task>
 
     fun updateTaskInBackground(task: Task)
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt
index 458f21fb0..2c957f717 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt
@@ -26,18 +26,13 @@ interface UserRepository : BaseRepository {
     fun updateUser(updateData: Map<String, Any>): Flowable<User>
     fun updateUser(key: String, value: Any): Flowable<User>
 
-    fun retrieveUser(withTasks: Boolean): Flowable<User>
-    fun retrieveUser(
-        withTasks: Boolean = false,
-        forced: Boolean = false,
-        overrideExisting: Boolean = false
-    ): Flowable<User>
+    suspend fun retrieveUser(withTasks: Boolean = false, forced: Boolean = false, overrideExisting: Boolean = false): User?
 
-    fun revive(): Flowable<User>
+    suspend fun revive(): User?
 
     fun resetTutorial(): Maybe<User>
 
-    fun sleep(user: User): Flowable<User>
+    suspend fun sleep(user: User): User?
 
     fun getSkills(user: User): Flowable<out List<Skill>>
 
@@ -46,17 +41,14 @@ interface UserRepository : BaseRepository {
     fun useSkill(key: String, target: String?, taskId: String): Flowable<SkillResponse>
     fun useSkill(key: String, target: String?): Flowable<SkillResponse>
 
-    fun changeClass(): Flowable<User>
-
-    fun disableClasses(): Flowable<User>
-
-    fun changeClass(selectedClass: String): Flowable<User>
+    suspend fun disableClasses(): User?
+    suspend fun changeClass(selectedClass: String? = null): User?
 
     fun unlockPath(path: String, price: Int): Flowable<UnlockResponse>
     fun unlockPath(customization: Customization): Flowable<UnlockResponse>
 
-    fun runCron(tasks: MutableList<Task>)
-    fun runCron()
+    suspend fun runCron(tasks: MutableList<Task>)
+    suspend fun runCron()
 
     fun readNotification(id: String): Flowable<List<Any>>
     fun readNotifications(notificationIds: Map<String, List<String>>): Flowable<List<Any>>
@@ -66,7 +58,7 @@ interface UserRepository : BaseRepository {
 
     fun updateLanguage(languageCode: String): Flowable<User>
 
-    fun resetAccount(): Flowable<User>
+    suspend fun resetAccount(): User?
     fun deleteAccount(password: String): Flowable<Void>
 
     fun sendPasswordResetEmail(email: String): Flowable<Void>
@@ -86,9 +78,9 @@ interface UserRepository : BaseRepository {
 
     fun getUserQuestStatus(): Flowable<UserQuestStatus>
 
-    fun reroll(): Flowable<User>
+    suspend fun reroll(): User?
     fun retrieveTeamPlans(): Flowable<List<TeamPlan>>
     fun getTeamPlans(): Flow<List<TeamPlan>>
-    fun retrieveTeamPlan(teamID: String): Flowable<Group>
+    suspend fun retrieveTeamPlan(teamID: String): Group?
     fun getTeamPlan(teamID: String): Flowable<Group>
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt
index 32d792593..ceecbb0c4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt
@@ -9,7 +9,6 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.api.ApiService
 import com.habitrpg.android.habitica.api.GSonFactoryCreator
 import com.habitrpg.android.habitica.data.ApiClient
-import com.habitrpg.android.habitica.extensions.filterMap
 import com.habitrpg.android.habitica.helpers.NotificationsManager
 import com.habitrpg.android.habitica.models.Achievement
 import com.habitrpg.android.habitica.models.ContentResult
@@ -40,6 +39,7 @@ import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.proxy.AnalyticsManager
 import com.habitrpg.common.habitica.api.HostConfig
 import com.habitrpg.common.habitica.api.Server
+import com.habitrpg.common.habitica.models.HabitResponse
 import com.habitrpg.common.habitica.models.PurchaseValidationRequest
 import com.habitrpg.common.habitica.models.PurchaseValidationResult
 import com.habitrpg.common.habitica.models.auth.UserAuth
@@ -48,7 +48,6 @@ import com.habitrpg.common.habitica.models.auth.UserAuthSocial
 import com.habitrpg.common.habitica.models.auth.UserAuthSocialTokens
 import com.habitrpg.shared.habitica.models.responses.ErrorResponse
 import com.habitrpg.shared.habitica.models.responses.FeedResponse
-import com.habitrpg.common.habitica.models.HabitResponse
 import com.habitrpg.shared.habitica.models.responses.Status
 import com.habitrpg.shared.habitica.models.responses.TaskDirectionData
 import com.habitrpg.shared.habitica.models.responses.VerifyUsernameResponse
@@ -90,19 +89,31 @@ class ApiClientImpl(
 
     private val apiCallTransformer = FlowableTransformer<HabitResponse<Any>, Any> { observable ->
         observable
-            .filterMap { habitResponse ->
-                habitResponse.notifications?.let {
-                    notificationsManager.setNotifications(it)
-                }
-                if (hadError) {
-                    hideConnectionProblemDialog()
-                }
-                habitResponse.data
+            .filter { it.data != null }
+            .map { habitResponse ->
+                processResponse(habitResponse)
             }
             .subscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())
             .doOnError(this)
     }
+
+    private fun <T> processResponse(habitResponse: HabitResponse<T>): T? {
+        habitResponse.notifications?.let {
+            notificationsManager.setNotifications(it)
+        }
+        return habitResponse.data
+    }
+
+    suspend fun <T> handleSuspendCall(apiCall: suspend () -> HabitResponse<T>): T? {
+        try {
+            return processResponse(apiCall())
+        } catch (throwable: Throwable) {
+            accept(throwable)
+        }
+        return null
+    }
+
     private var languageCode: String? = null
     private var lastAPICallURL: String? = null
     private var hadError = false
@@ -268,25 +279,15 @@ class ApiClientImpl(
         }
     }
 
-    override fun retrieveUser(withTasks: Boolean): Flowable<User> {
-
-        var userObservable = this.user
-
-        if (withTasks) {
-            val tasksObservable = this.tasks
-
-            userObservable = Flowable.zip(
-                userObservable, tasksObservable
-            ) { habitRPGUser, tasks ->
-                habitRPGUser.tasks = tasks
-                habitRPGUser
-            }
-        }
-        return userObservable
+    override suspend fun retrieveUser(withTasks: Boolean): User? {
+        val user = handleSuspendCall { apiService.getUser() }
+        val tasks = getTasks()
+        user?.tasks = tasks
+        return user
     }
 
-    override fun retrieveInboxMessages(uuid: String, page: Int): Flowable<List<ChatMessage>> {
-        return apiService.getInboxMessages(uuid, page).compose(configureApiCallObserver())
+    override suspend fun retrieveInboxMessages(uuid: String, page: Int): List<ChatMessage>? {
+        return handleSuspendCall { apiService.getInboxMessages(uuid, page) }
     }
 
     override fun retrieveInboxConversations(): Flowable<List<InboxConversation>> {
@@ -345,16 +346,12 @@ class ApiClientImpl(
         this.languageCode = languageCode
     }
 
-    override val status: Flowable<Status>
-        get() = apiService.status.compose(configureApiCallObserver())
+    override suspend fun getStatus(): Status? = handleSuspendCall { apiService.getStatus() }
 
-    override fun getContent(language: String): Flowable<ContentResult> {
-        return apiService.getContent(language).compose(configureApiCallObserver())
+    override suspend fun getContent(language: String?): ContentResult? {
+        return handleSuspendCall {  apiService.getContent(language) }
     }
 
-    override val user: Flowable<User>
-        get() = apiService.user.compose(configureApiCallObserver())
-
     override fun updateUser(updateDictionary: Map<String, Any>): Flowable<User> {
         return apiService.updateUser(updateDictionary).compose(configureApiCallObserver())
     }
@@ -399,8 +396,8 @@ class ApiClientImpl(
         return apiService.validateNoRenewSubscription(request).compose(configureApiCallObserver())
     }
 
-    override fun cancelSubscription(): Flowable<Void> {
-        return apiService.cancelSubscription().compose(configureApiCallObserver())
+    override suspend fun cancelSubscription(): Void? {
+        return processResponse(apiService.cancelSubscription())
     }
 
     override fun purchaseHourglassItem(type: String, itemKey: String): Flowable<Void> {
@@ -436,8 +433,7 @@ class ApiClientImpl(
         return apiService.hatchPet(eggKey, hatchingPotionKey).compose(configureApiCallObserver())
     }
 
-    override val tasks: Flowable<TaskList>
-        get() = apiService.tasks.compose(configureApiCallObserver())
+    override suspend fun getTasks(): TaskList? = handleSuspendCall { apiService.getTasks() }
 
     override fun getTasks(type: String): Flowable<TaskList> {
         return apiService.getTasks(type).compose(configureApiCallObserver())
@@ -455,8 +451,8 @@ class ApiClientImpl(
         return apiService.getTask(id).compose(configureApiCallObserver())
     }
 
-    override fun postTaskDirection(id: String, direction: String): Flowable<TaskDirectionData> {
-        return apiService.postTaskDirection(id, direction).compose(configureApiCallObserver())
+    override suspend fun postTaskDirection(id: String, direction: String): TaskDirectionData? {
+        return handleSuspendCall { apiService.postTaskDirection(id, direction) }
     }
 
     override fun bulkScoreTasks(data: List<Map<String, String>>): Flowable<BulkTaskScoringData> {
@@ -467,8 +463,8 @@ class ApiClientImpl(
         return apiService.postTaskNewPosition(id, position).compose(configureApiCallObserver())
     }
 
-    override fun scoreChecklistItem(taskId: String, itemId: String): Flowable<Task> {
-        return apiService.scoreChecklistItem(taskId, itemId).compose(configureApiCallObserver())
+    override suspend fun scoreChecklistItem(taskId: String, itemId: String): Task? {
+        return handleSuspendCall { apiService.scoreChecklistItem(taskId, itemId) }
     }
 
     override fun createTask(item: Task): Flowable<Task> {
@@ -499,13 +495,9 @@ class ApiClientImpl(
         return apiService.deleteTag(id).compose(configureApiCallObserver())
     }
 
-    override fun sleep(): Flowable<Boolean> {
-        return apiService.sleep().compose(configureApiCallObserver())
-    }
+    override suspend fun sleep(): Boolean? = handleSuspendCall { apiService.sleep() }
 
-    override fun revive(): Flowable<User> {
-        return apiService.revive().compose(configureApiCallObserver())
-    }
+    override suspend fun revive(): User? = handleSuspendCall { apiService.revive() }
 
     override fun useSkill(skillName: String, targetType: String, targetId: String): Flowable<SkillResponse> {
         return apiService.useSkill(skillName, targetType, targetId).compose(configureApiCallObserver())
@@ -515,17 +507,17 @@ class ApiClientImpl(
         return apiService.useSkill(skillName, targetType).compose(configureApiCallObserver())
     }
 
-    override fun changeClass(): Flowable<User> {
-        return apiService.changeClass().compose(configureApiCallObserver())
+    override suspend fun changeClass(className: String?): User? {
+        return handleSuspendCall {
+            if (className != null) {
+                apiService.changeClass(className)
+            } else {
+                apiService.changeClass()
+            }
+        }
     }
 
-    override fun changeClass(className: String): Flowable<User> {
-        return apiService.changeClass(className).compose(configureApiCallObserver())
-    }
-
-    override fun disableClasses(): Flowable<User> {
-        return apiService.disableClasses().compose(configureApiCallObserver())
-    }
+    override suspend fun disableClasses(): User? = handleSuspendCall { apiService.disableClasses() }
 
     override fun markPrivateMessagesRead(): Flowable<Void> {
         // This is necessary, because the API call returns weird data.
@@ -539,32 +531,32 @@ class ApiClientImpl(
         return apiService.listGroups(type).compose(configureApiCallObserver())
     }
 
-    override fun getGroup(groupId: String): Flowable<Group> {
-        return apiService.getGroup(groupId).compose(configureApiCallObserver())
+    override suspend fun getGroup(groupId: String): Group? {
+        return processResponse(apiService.getGroup(groupId))
     }
 
-    override fun createGroup(group: Group): Flowable<Group> {
-        return apiService.createGroup(group).compose(configureApiCallObserver())
+    override suspend fun createGroup(group: Group): Group? {
+        return processResponse(apiService.createGroup(group))
     }
 
-    override fun updateGroup(id: String, item: Group): Flowable<Group> {
-        return apiService.updateGroup(id, item).compose(configureApiCallObserver())
+    override suspend fun updateGroup(id: String, item: Group): Group? {
+        return processResponse(apiService.updateGroup(id, item))
     }
 
-    override fun removeMemberFromGroup(groupID: String, userID: String): Flowable<Void> {
-        return apiService.removeMemberFromGroup(groupID, userID).compose(configureApiCallObserver())
+    override suspend fun removeMemberFromGroup(groupID: String, userID: String): Void? {
+        return processResponse(apiService.removeMemberFromGroup(groupID, userID))
     }
 
-    override fun listGroupChat(groupId: String): Flowable<List<ChatMessage>> {
-        return apiService.listGroupChat(groupId).compose(configureApiCallObserver())
+    override suspend fun listGroupChat(groupId: String): List<ChatMessage>? {
+        return processResponse(apiService.listGroupChat(groupId))
     }
 
-    override fun joinGroup(groupId: String): Flowable<Group> {
-        return apiService.joinGroup(groupId).compose(configureApiCallObserver())
+    override suspend fun joinGroup(groupId: String): Group? {
+        return processResponse(apiService.joinGroup(groupId))
     }
 
-    override fun leaveGroup(groupId: String, keepChallenges: String): Flowable<Void> {
-        return apiService.leaveGroup(groupId, keepChallenges).compose(configureApiCallObserver())
+    override suspend fun leaveGroup(groupId: String, keepChallenges: String): Void? {
+        return processResponse(apiService.leaveGroup(groupId, keepChallenges))
     }
 
     override fun postGroupChat(groupId: String, message: Map<String, String>): Flowable<PostChatMessageResult> {
@@ -578,12 +570,12 @@ class ApiClientImpl(
         return apiService.deleteInboxMessage(id).compose(configureApiCallObserver())
     }
 
-    override fun getGroupMembers(groupId: String, includeAllPublicFields: Boolean?): Flowable<List<Member>> {
-        return apiService.getGroupMembers(groupId, includeAllPublicFields).compose(configureApiCallObserver())
+    override suspend fun getGroupMembers(groupId: String, includeAllPublicFields: Boolean?): List<Member>? {
+        return processResponse(apiService.getGroupMembers(groupId, includeAllPublicFields))
     }
 
-    override fun getGroupMembers(groupId: String, includeAllPublicFields: Boolean?, lastId: String): Flowable<List<Member>> {
-        return apiService.getGroupMembers(groupId, includeAllPublicFields, lastId).compose(configureApiCallObserver())
+    override suspend fun getGroupMembers(groupId: String, includeAllPublicFields: Boolean?, lastId: String): List<Member>? {
+        return processResponse(apiService.getGroupMembers(groupId, includeAllPublicFields, lastId))
     }
 
     override fun likeMessage(groupId: String, mid: String): Flowable<ChatMessage> {
@@ -646,13 +638,8 @@ class ApiClientImpl(
         return apiService.changeCustomDayStart(updateObject).compose(configureApiCallObserver())
     }
 
-    override fun getMember(memberId: String): Flowable<Member> {
-        return apiService.getMember(memberId).compose(configureApiCallObserver())
-    }
-
-    override fun getMemberWithUsername(username: String): Flowable<Member> {
-        return apiService.getMemberWithUsername(username).compose(configureApiCallObserver())
-    }
+    override suspend fun getMember(memberId: String) = processResponse(apiService.getMember(memberId))
+    override suspend fun getMemberWithUsername(username: String) = processResponse(apiService.getMemberWithUsername(username))
 
     override fun getMemberAchievements(memberId: String): Flowable<List<Achievement>> {
         return apiService.getMemberAchievements(memberId, languageCode).compose(configureApiCallObserver())
@@ -662,8 +649,8 @@ class ApiClientImpl(
         return apiService.findUsernames(username, context, id).compose(configureApiCallObserver())
     }
 
-    override fun postPrivateMessage(messageDetails: Map<String, String>): Flowable<PostChatMessageResult> {
-        return apiService.postPrivateMessage(messageDetails).compose(configureApiCallObserver())
+    override suspend fun postPrivateMessage(messageDetails: Map<String, String>): PostChatMessageResult? {
+        return handleSuspendCall { apiService.postPrivateMessage(messageDetails) }
     }
 
     override fun retrieveShopIventory(identifier: String): Flowable<Shop> {
@@ -738,9 +725,6 @@ class ApiClientImpl(
         return apiService.seeNotifications(notificationIds).compose(configureApiCallObserver())
     }
 
-    override val content: Flowable<ContentResult>
-        get() = apiService.getContent(languageCode).compose(configureApiCallObserver())
-
     override fun openMysteryItem(): Flowable<Equipment> {
         return apiService.openMysteryItem().compose(configureApiCallObserver())
     }
@@ -749,9 +733,7 @@ class ApiClientImpl(
         return apiService.runCron().compose(configureApiCallObserver())
     }
 
-    override fun reroll(): Flowable<User> {
-        return apiService.reroll().compose(configureApiCallObserver())
-    }
+    override suspend fun reroll(): User? = handleSuspendCall { apiService.reroll() }
 
     override fun resetAccount(): Flowable<Void> {
         return apiService.resetAccount().compose(configureApiCallObserver())
@@ -825,8 +807,8 @@ class ApiClientImpl(
         return apiService.getTeamPlans().compose(configureApiCallObserver())
     }
 
-    override fun getTeamPlanTasks(teamID: String): Flowable<TaskList> {
-        return apiService.getTeamPlanTasks(teamID).compose(configureApiCallObserver())
+    override suspend fun getTeamPlanTasks(teamID: String): TaskList? {
+        return processResponse(apiService.getTeamPlanTasks(teamID))
     }
 
     override fun bulkAllocatePoints(
@@ -849,8 +831,7 @@ class ApiClientImpl(
         return apiService.retrieveMarketGear(languageCode).compose(configureApiCallObserver())
     }
 
-    override val worldState: Flowable<WorldState>
-        get() = apiService.worldState.compose(configureApiCallObserver())
+    override suspend fun getWorldState(): WorldState? = handleSuspendCall { apiService.worldState() }
 
     companion object {
         fun createGsonFactory(): GsonConverterFactory {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ContentRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ContentRepositoryImpl.kt
index 0989bc814..5028049df 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ContentRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ContentRepositoryImpl.kt
@@ -9,6 +9,7 @@ import com.habitrpg.android.habitica.models.ContentResult
 import com.habitrpg.android.habitica.models.WorldState
 import com.habitrpg.android.habitica.models.inventory.SpecialItem
 import io.reactivex.rxjava3.core.Flowable
+import io.realm.RealmList
 import java.util.Date
 
 class ContentRepositoryImpl<T : ContentLocalRepository>(
@@ -22,34 +23,33 @@ class ContentRepositoryImpl<T : ContentLocalRepository>(
     private var lastContentSync = 0L
     private var lastWorldStateSync = 0L
 
-    override fun retrieveContent(forced: Boolean): Flowable<ContentResult> {
+    override suspend fun retrieveContent(forced: Boolean): ContentResult? {
         val now = Date().time
-        return if (forced || now - this.lastContentSync > 300000) {
+        if (forced || now - this.lastContentSync > 300000) {
+            val content = apiClient.getContent() ?: return null
             lastContentSync = now
-            apiClient.content.doOnNext {
-                it.special.add(mysteryItem)
-                localRepository.saveContent(it)
-            }
-        } else {
-            Flowable.just(ContentResult())
+            content.special = RealmList()
+            content.special.add(mysteryItem)
+            localRepository.saveContent(content)
+            return content
         }
+        return null
     }
 
-    override fun retrieveWorldState(): Flowable<WorldState> {
+    override suspend fun retrieveWorldState(): WorldState? {
         val now = Date().time
-        return if (now - this.lastWorldStateSync > 3600000) {
+        if (now - this.lastWorldStateSync > 3600000) {
+            val state = apiClient.getWorldState() ?: return null
             lastWorldStateSync = now
-            apiClient.worldState.doOnNext {
-                localRepository.saveWorldState(it)
-                for (event in it.events) {
-                    if (event.aprilFools != null && event.isCurrentlyActive) {
-                        AprilFoolsHandler.handle(event.aprilFools, event.end)
-                    }
+            localRepository.save(state)
+            for (event in state.events) {
+                if (event.aprilFools != null && event.isCurrentlyActive) {
+                    AprilFoolsHandler.handle(event.aprilFools, event.end)
                 }
             }
-        } else {
-            Flowable.just(WorldState())
+            return state
         }
+        return null
     }
 
     override fun getWorldState(): Flowable<WorldState> {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt
index 422e46e9c..3f11e468a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt
@@ -31,13 +31,9 @@ class InventoryRepositoryImpl(
     userID: String,
     var appConfigManager: AppConfigManager
 ) : BaseRepositoryImpl<InventoryLocalRepository>(localRepository, apiClient, userID), InventoryRepository {
-    override fun getQuestContent(keys: List<String>): Flow<List<QuestContent>> {
-        return localRepository.getQuestContent(keys)
-    }
+    override fun getQuestContent(keys: List<String>) = localRepository.getQuestContent(keys)
 
-    override fun getQuestContent(key: String): Flowable<QuestContent> {
-        return localRepository.getQuestContent(key)
-    }
+    override fun getQuestContent(key: String) = localRepository.getQuestContent(key)
 
     override fun getEquipment(searchedKeys: List<String>): Flowable<out List<Equipment>> {
         return localRepository.getEquipment(searchedKeys)
@@ -75,7 +71,7 @@ class InventoryRepositoryImpl(
         return localRepository.getOwnedItems(userID, includeZero)
     }
 
-    override fun getItemsFlowable(itemClass: Class<out Item>, keys: Array<String>): Flow<List<Item>> {
+    override fun getItems(itemClass: Class<out Item>, keys: Array<String>): Flow<List<Item>> {
         return localRepository.getItemsFlowable(itemClass, keys)
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt
index 30cbe18c0..20de3196e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt
@@ -4,7 +4,7 @@ import com.habitrpg.android.habitica.BuildConfig
 import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.data.local.SocialLocalRepository
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.Achievement
 import com.habitrpg.android.habitica.models.inventory.Quest
 import com.habitrpg.android.habitica.models.members.Member
@@ -16,12 +16,10 @@ import com.habitrpg.android.habitica.models.social.GroupMembership
 import com.habitrpg.android.habitica.models.social.InboxConversation
 import com.habitrpg.android.habitica.models.user.User
 import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.core.Single
-import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.launch
-import retrofit2.HttpException
+import kotlinx.coroutines.flow.firstOrNull
 import java.util.UUID
 
 class SocialRepositoryImpl(
@@ -29,45 +27,31 @@ class SocialRepositoryImpl(
     apiClient: ApiClient,
     userID: String
 ) : BaseRepositoryImpl<SocialLocalRepository>(localRepository, apiClient, userID), SocialRepository {
-    override fun transferGroupOwnership(groupID: String, userID: String): Flowable<Group> {
-        return localRepository.getGroupFlowable(groupID)
-            .map {
-                val group = localRepository.getUnmanagedCopy(it)
-                group.leaderID = userID
-                group
-            }
-            .flatMap {
-                apiClient.updateGroup(it.id, it)
-            }
+    override suspend fun transferGroupOwnership(groupID: String, userID: String): Group? {
+        val group = localRepository.getGroup(groupID).first()?.let { localRepository.getUnmanagedCopy(it) }
+        group?.leaderID = userID
+        return group?.let { apiClient.updateGroup(groupID, it) }
     }
 
-    override fun removeMemberFromGroup(groupID: String, userID: String): Flowable<List<Member>> {
-        return apiClient.removeMemberFromGroup(groupID, userID)
-            .flatMap {
-                retrieveGroupMembers(groupID, true)
-            }
+    override suspend fun removeMemberFromGroup(groupID: String, userID: String): List<Member>? {
+        apiClient.removeMemberFromGroup(groupID, userID)
+        return retrievePartyMembers(groupID, true)
     }
 
     override fun blockMember(userID: String): Flowable<List<String>> {
         return apiClient.blockMember(userID)
     }
 
-    override fun getGroupMembership(id: String): Flowable<GroupMembership> {
-        return localRepository.getGroupMembership(userID, id)
-    }
+    override fun getGroupMembership(id: String) = localRepository.getGroupMembership(userID, id)
 
     override fun getGroupMemberships(): Flowable<out List<GroupMembership>> {
         return localRepository.getGroupMemberships(userID)
     }
 
-    override fun retrieveGroupChat(groupId: String): Single<List<ChatMessage>> {
-        return apiClient.listGroupChat(groupId)
-            .flatMap { Flowable.fromIterable(it) }
-            .map { chatMessage ->
-                chatMessage.groupId = groupId
-                chatMessage
-            }
-            .toList()
+    override suspend fun retrieveGroupChat(groupId: String): List<ChatMessage>? {
+        val messages = apiClient.listGroupChat(groupId)
+        messages?.forEach { it.groupId = groupId }
+        return messages
     }
 
     override fun getGroupChat(groupId: String): Flowable<out List<ChatMessage>> {
@@ -75,7 +59,7 @@ class SocialRepositoryImpl(
     }
 
     override fun markMessagesSeen(seenGroupId: String) {
-        apiClient.seenMessages(seenGroupId).subscribe({ }, RxErrorHandler.handleEmptyError())
+        apiClient.seenMessages(seenGroupId).subscribe({ }, ExceptionHandler.rx())
     }
 
     override fun flagMessage(chatMessageID: String, additionalInfo: String, groupID: String?): Flowable<Void> {
@@ -131,76 +115,70 @@ class SocialRepositoryImpl(
         return postGroupChat(groupId, messageObject)
     }
 
-    override fun retrieveGroup(id: String): Flowable<Group> {
-        return Flowable.zip(
-            apiClient.getGroup(id).doOnNext { localRepository.saveGroup(it) },
-            retrieveGroupChat(id)
-                .toFlowable()
-        ) { group, _ ->
-            group
-        }.doOnError {
-            if (it is HttpException && it.code() == 404) {
-                MainScope().launch {
-                    val group = localRepository.getGroup(id).first()
-                    if (group != null) {
-                        localRepository.delete(group)
-                    }
-                }
-            }
-        }
+    override suspend fun retrieveGroup(id: String): Group? {
+        val group = apiClient.getGroup(id)
+        group?.let { localRepository.saveGroup(it) }
+        retrieveGroupChat(id)
+        return group
     }
 
-    override fun getGroup(id: String?) = id?.let { localRepository.getGroup(it) } ?: emptyFlow()
-    override fun getGroupFlowable(id: String?): Flowable<Group> = id?.let { localRepository.getGroupFlowable(it) } ?: Flowable.empty()
-
-    override fun leaveGroup(id: String?, keepChallenges: Boolean): Flowable<Group> {
+    override fun getGroup(id: String?): Flow<Group?> {
         if (id?.isNotBlank() != true) {
-            return Flowable.empty()
+            return emptyFlow()
         }
-        return apiClient.leaveGroup(id, if (keepChallenges) "remain-in-challenges" else "leave-challenges")
-            .doOnNext { localRepository.updateMembership(userID, id, false) }
-            .flatMapMaybe { localRepository.getGroupFlowable(id).firstElement() }
+        return localRepository.getGroup(id)
     }
 
-    override fun joinGroup(id: String?): Flowable<Group> {
+    override suspend fun leaveGroup(id: String?, keepChallenges: Boolean): Group? {
         if (id?.isNotBlank() != true) {
-            return Flowable.empty()
+            return null
         }
-        return apiClient.joinGroup(id)
-            .doOnNext { group ->
-                localRepository.updateMembership(userID, id, true)
-                localRepository.save(group)
-            }
+
+        apiClient.leaveGroup(id, if (keepChallenges) "remain-in-challenges" else "leave-challenges")
+        localRepository.updateMembership(userID, id, false)
+        return localRepository.getGroup(id).firstOrNull()
     }
 
-    override fun createGroup(
+    override suspend fun joinGroup(id: String?): Group? {
+        if (id?.isNotBlank() != true) {
+            return null
+        }
+        val group = apiClient.joinGroup(id)
+        group?.let {
+            localRepository.updateMembership(userID, id, true)
+            localRepository.save(group)
+        }
+        return group
+    }
+
+    override suspend fun createGroup(
         name: String?,
         description: String?,
         leader: String?,
         type: String?,
         privacy: String?,
         leaderCreateChallenge: Boolean?
-    ): Flowable<Group> {
+    ): Group? {
         val group = Group()
         group.name = name
         group.description = description
         group.type = type
         group.leaderID = leader
         group.privacy = privacy
-        return apiClient.createGroup(group).doOnNext {
-            localRepository.save(it)
-        }
+        val savedGroup = apiClient.createGroup(group)
+        savedGroup?.let { localRepository.save(it) }
+        return savedGroup
     }
 
-    override fun updateGroup(
+    override suspend fun updateGroup(
         group: Group?,
         name: String?,
         description: String?,
         leader: String?,
         leaderCreateChallenge: Boolean?
-    ): Flowable<Group> {
+    ): Group? {
         if (group == null) {
-            return Flowable.empty()
+            return null
         }
         val copiedGroup = localRepository.getUnmanagedCopy(group)
         copiedGroup.name = name
@@ -224,21 +202,21 @@ class SocialRepositoryImpl(
             }
     }
 
-    override fun getGroups(type: String): Flowable<out List<Group>> = localRepository.getGroups(type)
+    override fun getGroups(type: String) = localRepository.getGroups(type)
 
-    override fun getPublicGuilds(): Flowable<out List<Group>> = localRepository.getPublicGuilds()
+    override fun getPublicGuilds() = localRepository.getPublicGuilds()
 
-    override fun getInboxConversations(): Flowable<out List<InboxConversation>> = localRepository.getInboxConversation(userID)
+    override fun getInboxConversations() = localRepository.getInboxConversation(userID)
 
-    override fun getInboxMessages(replyToUserID: String?): Flowable<out List<ChatMessage>> = localRepository.getInboxMessages(userID, replyToUserID)
+    override fun getInboxMessages(replyToUserID: String?) = localRepository.getInboxMessages(userID, replyToUserID)
 
-    override fun retrieveInboxMessages(uuid: String, page: Int): Flowable<List<ChatMessage>> {
-        return apiClient.retrieveInboxMessages(uuid, page).doOnNext { messages ->
-            messages.forEach {
-                it.isInboxMessage = true
-            }
-            localRepository.saveInboxMessages(userID, uuid, messages, page)
+    override suspend fun retrieveInboxMessages(uuid: String, page: Int): List<ChatMessage>? {
+        val messages = apiClient.retrieveInboxMessages(uuid, page) ?: return null
+        messages.forEach {
+            it.isInboxMessage = true
         }
+        localRepository.saveInboxMessages(userID, uuid, messages, page)
+        return messages
     }
 
     override fun retrieveInboxConversations(): Flowable<List<InboxConversation>> {
@@ -247,29 +225,32 @@ class SocialRepositoryImpl(
         }
     }
 
-    override fun postPrivateMessage(recipientId: String, messageObject: HashMap<String, String>): Flowable<List<ChatMessage>> {
-        return apiClient.postPrivateMessage(messageObject).flatMap { retrieveInboxMessages(recipientId, 0) }
+    override suspend fun postPrivateMessage(recipientId: String, messageObject: HashMap<String, String>): List<ChatMessage>? {
+        val message = apiClient.postPrivateMessage(messageObject)
+        return retrieveInboxMessages(recipientId, 0)
     }
 
-    override fun postPrivateMessage(recipientId: String, message: String): Flowable<List<ChatMessage>> {
+    override suspend fun postPrivateMessage(recipientId: String, message: String): List<ChatMessage>? {
         val messageObject = HashMap<String, String>()
         messageObject["message"] = message
         messageObject["toUserId"] = recipientId
         return postPrivateMessage(recipientId, messageObject)
     }
 
-    override fun getGroupMembers(id: String) = localRepository.getGroupMembers(id)
+    override suspend fun getPartyMembers(id: String) = localRepository.getPartyMembers(id)
+    override suspend fun getGroupMembers(id: String) = localRepository.getGroupMembers(id)
 
-    override fun retrieveGroupMembers(id: String, includeAllPublicFields: Boolean): Flowable<List<Member>> {
-        return apiClient.getGroupMembers(id, includeAllPublicFields)
-            .doOnNext { members -> localRepository.saveGroupMembers(id, members) }
+    override suspend fun retrievePartyMembers(id: String, includeAllPublicFields: Boolean): List<Member>? {
+        val members = apiClient.getGroupMembers(id, includeAllPublicFields)
+        members?.let { localRepository.savePartyMembers(id, it) }
+        return members
     }
 
     override fun inviteToGroup(id: String, inviteData: Map<String, Any>): Flowable<List<Void>> = apiClient.inviteToGroup(id, inviteData)
 
-    override fun getMember(userId: String?): Flowable<Member> {
+    override suspend fun retrieveMember(userId: String?): Member? {
         return if (userId == null) {
-            Flowable.empty()
+            null
         } else {
             try {
                 apiClient.getMember(UUID.fromString(userId).toString())
@@ -279,8 +260,8 @@ class SocialRepositoryImpl(
         }
     }
 
-    override fun getMemberWithUsername(username: String?): Flowable<Member> {
-        return getMember(username)
+    override suspend fun retrieveMemberWithUsername(username: String?): Member? {
+        return retrieveMember(username)
     }
 
     override fun findUsernames(username: String, context: String?, id: String?): Flowable<List<FindUsernameResult>> {
@@ -315,7 +296,7 @@ class SocialRepositoryImpl(
         }
     }
 
-    override fun getUserGroups(type: String?): Flowable<out List<Group>> = localRepository.getUserGroups(userID, type)
+    override fun getUserGroups(type: String?) = localRepository.getUserGroups(userID, type)
 
     override fun acceptQuest(user: User?, partyId: String): Flowable<Void> {
         return apiClient.acceptQuest(partyId)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
index b01a08b23..a6e0a8196 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
@@ -5,25 +5,26 @@ import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.data.local.TaskLocalRepository
 import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.interactors.ScoreTaskLocallyInteractor
 import com.habitrpg.android.habitica.models.BaseMainObject
 import com.habitrpg.android.habitica.models.responses.BulkTaskScoringData
-import com.habitrpg.shared.habitica.models.responses.TaskDirection
-import com.habitrpg.shared.habitica.models.responses.TaskDirectionData
-import com.habitrpg.shared.habitica.models.responses.TaskScoringResult
 import com.habitrpg.android.habitica.models.tasks.ChecklistItem
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.models.tasks.TaskList
-import com.habitrpg.shared.habitica.models.tasks.TaskType
-import com.habitrpg.shared.habitica.models.tasks.TasksOrder
 import com.habitrpg.android.habitica.models.user.OwnedItem
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.proxy.AnalyticsManager
+import com.habitrpg.shared.habitica.models.responses.TaskDirection
+import com.habitrpg.shared.habitica.models.responses.TaskDirectionData
+import com.habitrpg.shared.habitica.models.responses.TaskScoringResult
+import com.habitrpg.shared.habitica.models.tasks.TaskType
+import com.habitrpg.shared.habitica.models.tasks.TasksOrder
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.core.Maybe
 import io.reactivex.rxjava3.core.Single
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.map
 import java.text.SimpleDateFormat
 import java.util.Date
@@ -49,9 +50,10 @@ class TaskRepositoryImpl(
         localRepository.saveTasks(userId, order, tasks)
     }
 
-    override fun retrieveTasks(userId: String, tasksOrder: TasksOrder): Flowable<TaskList> {
-        return this.apiClient.tasks
-            .doOnNext { res -> this.localRepository.saveTasks(userId, tasksOrder, res) }
+    override suspend fun retrieveTasks(userId: String, tasksOrder: TasksOrder): TaskList? {
+        val tasks = apiClient.getTasks() ?: return null
+        this.localRepository.saveTasks(userId, tasksOrder, tasks)
+        return tasks
     }
 
     override fun retrieveCompletedTodos(userId: String?): Flowable<TaskList> {
@@ -69,13 +71,13 @@ class TaskRepositoryImpl(
     }
 
     @Suppress("ReturnCount")
-    override fun taskChecked(
+    override suspend fun taskChecked(
         user: User?,
         task: Task,
         up: Boolean,
         force: Boolean,
         notifyFunc: ((TaskScoringResult) -> Unit)?
-    ): Flowable<TaskScoringResult> {
+    ): TaskScoringResult? {
         val localData = if (user != null && appConfigManager.enableLocalTaskScoring()) {
             ScoreTaskLocallyInteractor.score(user, task, if (up) TaskDirection.UP else TaskDirection.DOWN)
         } else null
@@ -89,41 +91,33 @@ class TaskRepositoryImpl(
         val now = Date().time
         val id = task.id
         if (lastTaskAction > now - 500 && !force || id == null) {
-            return Flowable.empty()
+            return null
         }
 
         lastTaskAction = now
-        return this.apiClient.postTaskDirection(id, (if (up) TaskDirection.UP else TaskDirection.DOWN).text)
-            .flatMapMaybe {
-                // There are cases where the user object is not set correctly. So the app refetches it as a fallback
-                if (user == null) {
-                    localRepository.getUser(userID).firstElement()
-                } else {
-                    Maybe.just(user)
-                }.map { user -> Pair(it, user) }
-            }
-            .map { (res, user): Pair<TaskDirectionData, User> ->
-                // save local task changes
+        val res = this.apiClient.postTaskDirection(id, (if (up) TaskDirection.UP else TaskDirection.DOWN).text) ?: return null
+        // There are cases where the user object is not set correctly. So the app refetches it as a fallback
+        val thisUser = user ?: localRepository.getUser(userID).firstOrNull() ?: return null
+        // save local task changes
 
-                analyticsManager.logEvent(
-                    "task_scored",
-                    bundleOf(
-                        Pair("type", task.type),
-                        Pair("scored_up", up),
-                        Pair("value", task.value)
-                    )
-                )
-                if (res.lvl == 0) {
-                    // Team tasks that require approval have weird data that we should just ignore.
-                    return@map TaskScoringResult()
-                }
-                val result = TaskScoringResult(res, user.stats)
-                if (localData == null) {
-                    notifyFunc?.invoke(result)
-                }
-                handleTaskResponse(user, res, task, up, localData?.delta ?: 0f)
-                result
-            }
+        analyticsManager.logEvent(
+            "task_scored",
+            bundleOf(
+                Pair("type", task.type),
+                Pair("scored_up", up),
+                Pair("value", task.value)
+            )
+        )
+        if (res.lvl == 0) {
+            // Team tasks that require approval have weird data that we should just ignore.
+            return TaskScoringResult()
+        }
+        val result = TaskScoringResult(res, thisUser.stats)
+        if (localData == null) {
+            notifyFunc?.invoke(result)
+        }
+        handleTaskResponse(thisUser, res, task, up, localData?.delta ?: 0f)
+        return result
     }
 
     override fun bulkScoreTasks(data: List<Map<String, String>>): Flowable<BulkTaskScoringData> {
@@ -143,9 +137,13 @@ class TaskRepositoryImpl(
             if (bgTask.type != TaskType.REWARD && (bgTask.value - localDelta) + res.delta != bgTask.value) {
                 bgTask.value = (bgTask.value - localDelta) + res.delta
                 if (TaskType.DAILY == bgTask.type || TaskType.TODO == bgTask.type) {
-                    bgTask.completed = up
-                    if (TaskType.DAILY == bgTask.type && up) {
-                        bgTask.streak = (bgTask.streak ?: 0) + 1
+                    bgTask.completeForUser(userID, up)
+                    if (TaskType.DAILY == bgTask.type) {
+                        if (up) {
+                            bgTask.streak = (bgTask.streak ?: 0) + 1
+                        } else {
+                            bgTask.streak = (bgTask.streak ?: 0) - 1
+                        }
                     }
                 } else if (TaskType.HABIT == bgTask.type) {
                     if (up) {
@@ -190,31 +188,29 @@ class TaskRepositoryImpl(
         }
     }
 
-    override fun taskChecked(
+    override suspend fun taskChecked(
         user: User?,
         taskId: String,
         up: Boolean,
         force: Boolean,
         notifyFunc: ((TaskScoringResult) -> Unit)?
-    ): Maybe<TaskScoringResult> {
-        return localRepository.getTask(taskId).firstElement()
-            .flatMap { task -> taskChecked(user, task, up, force, notifyFunc).singleElement() }
+    ): TaskScoringResult? {
+        val task = localRepository.getTask(taskId).firstOrNull() ?: return null
+        return taskChecked(user, task, up, force, notifyFunc)
     }
 
-    override fun scoreChecklistItem(taskId: String, itemId: String): Flowable<Task> {
-        return apiClient.scoreChecklistItem(taskId, itemId)
-            .flatMapMaybe { localRepository.getTask(taskId).firstElement() }
-            .doOnNext { task ->
-                val updatedItem: ChecklistItem? = task.checklist?.lastOrNull { itemId == it.id }
-                if (updatedItem != null) {
-                    localRepository.modify(updatedItem) { liveItem -> liveItem.completed = !liveItem.completed }
-                }
-            }
+    override suspend fun scoreChecklistItem(taskId: String, itemId: String): Task? {
+        val task = apiClient.scoreChecklistItem(taskId, itemId)
+        val updatedItem: ChecklistItem? = task?.checklist?.lastOrNull { itemId == it.id }
+        if (updatedItem != null) {
+            localRepository.modify(updatedItem) { liveItem -> liveItem.completed = !liveItem.completed }
+        }
+        return task
     }
 
-    override fun getTask(taskId: String): Flowable<Task> = localRepository.getTask(taskId)
+    override fun getTask(taskId: String) = localRepository.getTask(taskId)
 
-    override fun getTaskCopy(taskId: String): Flowable<Task> = localRepository.getTaskCopy(taskId)
+    override fun getTaskCopy(taskId: String) = localRepository.getTaskCopy(taskId)
 
     override fun createTask(task: Task, force: Boolean): Flowable<Task> {
         val now = Date().time
@@ -305,15 +301,14 @@ class TaskRepositoryImpl(
             .doOnSuccess { localRepository.updateTaskPositions(it) }
     }
 
-    override fun getUnmanagedTask(taskid: String): Flowable<Task> =
-        getTask(taskid).map { localRepository.getUnmanagedCopy(it) }
+    override fun getUnmanagedTask(taskid: String) = getTask(taskid).map { localRepository.getUnmanagedCopy(it) }
 
     override fun updateTaskInBackground(task: Task) {
-        updateTask(task).subscribe({ }, RxErrorHandler.handleEmptyError())
+        updateTask(task).subscribe({ }, ExceptionHandler.rx())
     }
 
     override fun createTaskInBackground(task: Task) {
-        createTask(task).subscribe({ }, RxErrorHandler.handleEmptyError())
+        createTask(task).subscribe({ }, ExceptionHandler.rx())
     }
 
     override fun getTaskCopies(userId: String): Flow<List<Task>> =
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
index 668e54b23..5dd94d2d4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
@@ -1,14 +1,12 @@
 package com.habitrpg.android.habitica.data.implementation
 
-import androidx.core.os.bundleOf
 import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.data.local.UserLocalRepository
-import com.habitrpg.android.habitica.models.user.UserQuestStatus
 import com.habitrpg.android.habitica.extensions.filterMapEmpty
 import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.Achievement
 import com.habitrpg.android.habitica.models.QuestAchievement
 import com.habitrpg.android.habitica.models.Skill
@@ -17,9 +15,11 @@ import com.habitrpg.android.habitica.models.inventory.Customization
 import com.habitrpg.android.habitica.models.responses.SkillResponse
 import com.habitrpg.android.habitica.models.responses.UnlockResponse
 import com.habitrpg.android.habitica.models.social.Group
+import com.habitrpg.android.habitica.models.social.GroupMembership
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.android.habitica.models.user.UserQuestStatus
 import com.habitrpg.android.habitica.proxy.AnalyticsManager
 import com.habitrpg.common.habitica.extensions.Optional
 import com.habitrpg.shared.habitica.models.responses.TaskDirection
@@ -28,7 +28,9 @@ import com.habitrpg.shared.habitica.models.tasks.Attribute
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.core.Maybe
 import io.reactivex.rxjava3.functions.BiFunction
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.withContext
 import java.util.Date
 import java.util.GregorianCalendar
 import java.util.concurrent.TimeUnit
@@ -70,45 +72,39 @@ class UserRepositoryImpl(
         return updateUser(userID, key, value)
     }
 
-    override fun retrieveUser(withTasks: Boolean): Flowable<User> =
-        retrieveUser(withTasks, false)
-
     @Suppress("ReturnCount")
-    override fun retrieveUser(withTasks: Boolean, forced: Boolean, overrideExisting: Boolean): Flowable<User> {
+    override suspend fun retrieveUser(withTasks: Boolean, forced: Boolean, overrideExisting: Boolean): User? {
         // Only retrieve again after 3 minutes or it's forced.
         if (forced || this.lastSync == null || Date().time - (this.lastSync?.time ?: 0) > 180000) {
+            val user = apiClient.retrieveUser(withTasks) ?: return null
             lastSync = Date()
-            return apiClient.retrieveUser(withTasks)
-                .doOnNext { localRepository.saveUser(it, overrideExisting) }
-                .doOnNext { user ->
-                    if (withTasks) {
-                        val id = user.id
-                        val tasksOrder = user.tasksOrder
-                        val tasks = user.tasks
-                        if (id != null && tasksOrder != null && tasks != null) {
-                            taskRepository.saveTasks(id, tasksOrder, tasks)
-                        }
-                    }
-                }
-                .flatMap { user ->
-                    val calendar = GregorianCalendar()
-                    val timeZone = calendar.timeZone
-                    val offset = -TimeUnit.MINUTES.convert(timeZone.getOffset(calendar.timeInMillis).toLong(), TimeUnit.MILLISECONDS)
-                    if (offset.toInt() != (user.preferences?.timezoneOffset ?: 0)) {
-                        return@flatMap updateUser(user.id ?: "", "preferences.timezoneOffset", offset.toString())
-                    } else {
-                        return@flatMap Flowable.just(user)
-                    }
+            localRepository.saveUser(user)
+            if (withTasks) {
+                val id = user.id
+                val tasksOrder = user.tasksOrder
+                val tasks = user.tasks
+                if (id != null && tasksOrder != null && tasks != null) {
+                    taskRepository.saveTasks(id, tasksOrder, tasks)
                 }
+            }
+            val calendar = GregorianCalendar()
+            val timeZone = calendar.timeZone
+            val offset = -TimeUnit.MINUTES.convert(timeZone.getOffset(calendar.timeInMillis).toLong(), TimeUnit.MILLISECONDS)
+            /*if (offset.toInt() != user.preferences?.timezoneOffset ?: 0) {
+                return@flatMap updateUser(user.id ?: "", "preferences.timezoneOffset", offset.toString())
+            } else {
+                return@flatMap Flowable.just(user)
+            }*/
+            return user
         } else {
-            return localRepository.getUserFlowable(userID).take(1)
+            return null
         }
     }
 
-    override fun revive(): Flowable<User> = zipWithLiveUser(apiClient.revive()) { newUser, user ->
-        mergeUser(user, newUser)
+    override suspend fun revive(): User? {
+        apiClient.revive()
+        return retrieveUser(false, true)
     }
-        .flatMap { retrieveUser(false, true) }
 
     override fun resetTutorial(): Maybe<User> {
         return localRepository.getTutorialSteps()
@@ -123,9 +119,13 @@ class UserRepositoryImpl(
             .flatMap { updateData -> updateUser(updateData).firstElement() }
     }
 
-    override fun sleep(user: User): Flowable<User> {
-        localRepository.modify(user) { it.preferences?.sleep = !(it.preferences?.sleep ?: false) }
-        return apiClient.sleep().map { user }
+    override suspend fun sleep(user: User): User {
+        val newValue = !(user.preferences?.sleep ?: false)
+        localRepository.modify(user) { it.preferences?.sleep = newValue }
+        if (apiClient.sleep() != true) {
+            localRepository.modify(user) { it.preferences?.sleep = !newValue }
+        }
+        return user
     }
 
     override fun getSkills(user: User): Flowable<out List<Skill>> =
@@ -137,7 +137,7 @@ class UserRepositoryImpl(
     override fun useSkill(key: String, target: String?, taskId: String): Flowable<SkillResponse> {
         return zipWithLiveUser(apiClient.useSkill(key, target ?: "", taskId)) { response, user ->
             response.hpDiff = (response.user?.stats?.hp ?: 0.0) - (user.stats?.hp ?: 0.0)
-            response.expDiff = (response.user?.stats?.exp ?: 0.0) - (user.stats?.exp ?: 0.0)
+            response.expDiff =(response.user?.stats?.exp ?: 0.0) - (user.stats?.exp ?: 0.0)
             response.goldDiff = (response.user?.stats?.gp ?: 0.0) - (user.stats?.gp ?: 0.0)
             response.damage = (response.user?.party?.quest?.progress?.up ?: 0.0f) - (user.party?.quest?.progress?.up ?: 0.0f)
             response.user?.let { mergeUser(user, it) }
@@ -148,7 +148,7 @@ class UserRepositoryImpl(
     override fun useSkill(key: String, target: String?): Flowable<SkillResponse> {
         return zipWithLiveUser(apiClient.useSkill(key, target ?: "")) { response, user ->
             response.hpDiff = (response.user?.stats?.hp ?: 0.0) - (user.stats?.hp ?: 0.0)
-            response.expDiff = (response.user?.stats?.exp ?: 0.0) - (user.stats?.exp ?: 0.0)
+            response.expDiff =(response.user?.stats?.exp ?: 0.0) - (user.stats?.exp ?: 0.0)
             response.goldDiff = (response.user?.stats?.gp ?: 0.0) - (user.stats?.gp ?: 0.0)
             response.damage = (response.user?.party?.quest?.progress?.up ?: 0.0f) - (user.party?.quest?.progress?.up ?: 0.0f)
             response.user?.let { mergeUser(user, it) }
@@ -156,12 +156,16 @@ class UserRepositoryImpl(
         }
     }
 
-    override fun changeClass(): Flowable<User> = apiClient.changeClass().flatMap { retrieveUser(withTasks = false, forced = true) }
+    override suspend fun disableClasses(): User? = apiClient.disableClasses()
 
-    override fun disableClasses(): Flowable<User> = apiClient.disableClasses().flatMap { retrieveUser(withTasks = false, forced = true) }
+    override suspend fun changeClass(selectedClass: String?): User? {
+        apiClient.changeClass(selectedClass)
+        return retrieveUser(false, forced = true)
+    }
 
-    override fun changeClass(selectedClass: String): Flowable<User> = apiClient.changeClass(selectedClass)
-        .flatMap { retrieveUser(false, forced = true) }
+    override fun unlockPath(customization: Customization): Flowable<UnlockResponse> {
+        return unlockPath(customization.path, customization.price ?: 0)
+    }
 
     override fun unlockPath(path: String, price: Int): Flowable<UnlockResponse> {
         return zipWithLiveUser(apiClient.unlockPath(path)) { unlockResponse, copiedUser ->
@@ -175,11 +179,7 @@ class UserRepositoryImpl(
         }
     }
 
-    override fun unlockPath(customization: Customization): Flowable<UnlockResponse> {
-        return unlockPath(customization.unlockPath, customization.price ?: 0)
-    }
-
-    override fun runCron() {
+    override suspend fun runCron() {
         runCron(ArrayList())
     }
 
@@ -188,9 +188,8 @@ class UserRepositoryImpl(
         return localRepository.getUserQuestStatus(userID)
     }
 
-    override fun reroll(): Flowable<User> {
+    override suspend fun reroll(): User? {
         return apiClient.reroll()
-            .flatMap { retrieveUser(true, true, true) }
     }
 
     override fun readNotifications(notificationIds: Map<String, List<String>>): Flowable<List<Any>> =
@@ -210,8 +209,9 @@ class UserRepositoryImpl(
             .doOnNext { apiClient.setLanguageCode(languageCode) }
     }
 
-    override fun resetAccount(): Flowable<User> {
-        return apiClient.resetAccount().flatMap { retrieveUser(withTasks = true, forced = true) }
+    override suspend fun resetAccount(): User? {
+        apiClient.resetAccount()
+        return retrieveUser(withTasks = true, forced = true)
     }
 
     override fun deleteAccount(password: String): Flowable<Void> =
@@ -262,7 +262,7 @@ class UserRepositoryImpl(
                     liveUser.stats?.points = liveUser.stats?.points?.dec()
                 }
             },
-            RxErrorHandler.handleEmptyError()
+            ExceptionHandler.rx()
         )
         return zipWithLiveUser(apiClient.allocatePoint(stat.value)) { stats, user ->
             localRepository.modify(user) { liveUser ->
@@ -295,26 +295,33 @@ class UserRepositoryImpl(
             stats
         }
 
-    override fun runCron(tasks: MutableList<Task>) {
-        var observable: Maybe<Any> = localRepository.getUserFlowable(userID).firstElement()
-            .filter { it.needsCron }
-            .map { user ->
-                localRepository.modify(user) { liveUser ->
-                    liveUser.needsCron = false
-                    liveUser.lastCron = Date()
+    override suspend fun runCron(tasks: MutableList<Task>) {
+        withContext(Dispatchers.Main) {
+            var observable: Maybe<Any> = localRepository.getUserFlowable(userID).firstElement()
+                .filter { it.needsCron }
+                .map { user ->
+                    localRepository.modify(user) { liveUser ->
+                        liveUser.needsCron = false
+                        liveUser.lastCron = Date()
+                    }
+                    user
                 }
-                user
+            if (tasks.isNotEmpty()) {
+                val scoringList = mutableListOf<Map<String, String>>()
+                for (task in tasks) {
+                    val map = mutableMapOf<String, String>()
+                    map["id"] = task.id ?: ""
+                    map["direction"] = TaskDirection.UP.text
+                    scoringList.add(map)
+                }
+                observable = observable.flatMap { taskRepository.bulkScoreTasks(scoringList).firstElement() }
             }
-        if (tasks.isNotEmpty()) {
-            val scoringList = tasks.map { mapOf(Pair("id", it.id ?: ""), Pair("direction", TaskDirection.UP.text)) }
-            observable = observable.flatMap { taskRepository.bulkScoreTasks(scoringList).firstElement() }
+            observable.flatMap { apiClient.runCron().firstElement() }
+                // .flatMap {
+                // this.retrieveUser(withTasks = true, forced = true)
+                // }
+                .subscribe({ }, ExceptionHandler.rx())
         }
-        observable.flatMap { apiClient.runCron().firstElement() }
-            .flatMap { this.retrieveUser(withTasks = true, forced = true).firstElement() }
-            .subscribe({ }, {
-                analyticsManager.logEvent("cron failed", bundleOf(Pair("error", it.localizedMessage)))
-                RxErrorHandler.reportError(it)
-            })
     }
 
     override fun useCustomization(type: String, category: String?, identifier: String): Flowable<User> {
@@ -340,7 +347,7 @@ class UserRepositoryImpl(
                         }
                     }
                 },
-                RxErrorHandler.handleEmptyError()
+                ExceptionHandler.rx()
             )
         }
         var updatePath = "preferences.$type"
@@ -375,22 +382,19 @@ class UserRepositoryImpl(
         return localRepository.getTeamPlans(userID)
     }
 
-    override fun retrieveTeamPlan(teamID: String): Flowable<Group> {
-        return Flowable.zip(
-            apiClient.getGroup(teamID), apiClient.getTeamPlanTasks(teamID)
-        ) { team, tasks ->
-            team.tasks = tasks
-            team
+    override suspend fun retrieveTeamPlan(teamID: String): Group? {
+        val team = apiClient.getGroup(teamID) ?: return null
+        val tasks = apiClient.getTeamPlanTasks(teamID)
+        localRepository.save(team)
+        val id = team.id
+        val tasksOrder = team.tasksOrder
+        if (id.isNotBlank() && tasksOrder != null && tasks != null) {
+            taskRepository.saveTasks(id, tasksOrder, tasks)
         }
-            .doOnNext { localRepository.save(it) }
-            .doOnNext { team ->
-                val id = team.id
-                val tasksOrder = team.tasksOrder
-                val tasks = team.tasks
-                if (id.isNotBlank() && tasksOrder != null && tasks != null) {
-                    taskRepository.saveTasks(id, tasksOrder, tasks)
-                }
-            }
+        val members = apiClient.getGroupMembers(teamID, true) ?: return team
+        localRepository.save(members.map { it.id?.let { member -> GroupMembership(member, id) } }.filterNotNull())
+        members.let { localRepository.save(members) }
+        return team
     }
 
     override fun getTeamPlan(teamID: String): Flowable<Group> {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.kt
index 252e454f5..895c57fe3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.kt
@@ -28,7 +28,7 @@ interface InventoryLocalRepository : ContentLocalRepository {
     fun getOwnedPets(userID: String): Flow<List<OwnedPet>>
 
     fun getInAppRewards(): Flowable<out List<ShopItem>>
-    fun getQuestContent(key: String): Flowable<QuestContent>
+    fun getQuestContent(key: String): Flow<QuestContent?>
     fun getQuestContent(keys: List<String>): Flow<List<QuestContent>>
 
     fun getEquipment(searchedKeys: List<String>): Flowable<out List<Equipment>>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.kt
index bd0cc9518..b1f8dbdd5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.kt
@@ -7,29 +7,30 @@ import com.habitrpg.android.habitica.models.social.GroupMembership
 import com.habitrpg.android.habitica.models.social.InboxConversation
 import com.habitrpg.android.habitica.models.user.User
 import io.reactivex.rxjava3.core.Flowable
+import io.realm.RealmResults
 import kotlinx.coroutines.flow.Flow
 
 interface SocialLocalRepository : BaseLocalRepository {
     fun getPublicGuilds(): Flowable<out List<Group>>
 
-    fun getUserGroups(userID: String, type: String?): Flowable<out List<Group>>
+    fun getUserGroups(userID: String, type: String?): Flow<List<Group>>
     fun getGroups(type: String): Flowable<out List<Group>>
 
     fun getGroup(id: String): Flow<Group?>
-    fun getGroupFlowable(id: String): Flowable<Group>
     fun saveGroup(group: Group)
 
     fun getGroupChat(groupId: String): Flowable<out List<ChatMessage>>
 
     fun deleteMessage(id: String)
 
-    fun getGroupMembers(partyId: String): Flow<List<Member>>
+    fun getPartyMembers(partyId: String): Flow<List<Member>>
+    fun getGroupMembers(groupID: String): Flow<List<Member>>
 
     fun updateRSVPNeeded(user: User?, newValue: Boolean)
 
     fun likeMessage(chatMessage: ChatMessage, userId: String, liked: Boolean)
 
-    fun saveGroupMembers(groupId: String?, members: List<Member>)
+    fun savePartyMembers(groupId: String?, members: List<Member>)
 
     fun removeQuest(partyId: String)
 
@@ -39,13 +40,13 @@ interface SocialLocalRepository : BaseLocalRepository {
 
     fun doesGroupExist(id: String): Boolean
     fun updateMembership(userId: String, id: String, isMember: Boolean)
-    fun getGroupMembership(userId: String, id: String): Flowable<GroupMembership>
+    fun getGroupMembership(userId: String, id: String): Flow<GroupMembership?>
     fun getGroupMemberships(userId: String): Flowable<out List<GroupMembership>>
     fun rejectGroupInvitation(userID: String, groupID: String)
 
-    fun getInboxMessages(userId: String, replyToUserID: String?): Flowable<out List<ChatMessage>>
+    fun getInboxMessages(userId: String, replyToUserID: String?): Flow<RealmResults<ChatMessage>>
 
-    fun getInboxConversation(userId: String): Flowable<out List<InboxConversation>>
+    fun getInboxConversation(userId: String): Flow<RealmResults<InboxConversation>>
     fun saveGroupMemberships(userID: String?, memberships: List<GroupMembership>)
     fun saveInboxMessages(
         userID: String,
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.kt
index 4697c2ead..6f8b80a60 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.kt
@@ -19,8 +19,8 @@ interface TaskLocalRepository : BaseLocalRepository {
 
     fun deleteTask(taskID: String)
 
-    fun getTask(taskId: String): Flowable<Task>
-    fun getTaskCopy(taskId: String): Flowable<Task>
+    fun getTask(taskId: String): Flow<Task>
+    fun getTaskCopy(taskId: String): Flow<Task>
 
     fun markTaskCompleted(taskId: String, isCompleted: Boolean)
 
@@ -33,6 +33,7 @@ interface TaskLocalRepository : BaseLocalRepository {
     fun updateTaskPositions(taskOrder: List<String>)
     fun saveCompletedTodos(userId: String, tasks: MutableCollection<Task>)
     fun getErroredTasks(userID: String): Flowable<out List<Task>>
-    fun getUser(userID: String): Flowable<User>
+    fun getUserFlowable(userID: String): Flowable<User>
+    fun getUser(userID: String): Flow<User>
     fun getTasksForChallenge(challengeID: String?, userID: String?): Flowable<out List<Task>>
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt
index 366f580af..7d1159c6f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt
@@ -1,7 +1,7 @@
 package com.habitrpg.android.habitica.data.local.implementation
 
 import com.habitrpg.android.habitica.data.local.InventoryLocalRepository
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.inventory.Egg
 import com.habitrpg.android.habitica.models.inventory.Equipment
 import com.habitrpg.android.habitica.models.inventory.Food
@@ -39,14 +39,12 @@ class RealmInventoryLocalRepository(realm: Realm) : RealmContentLocalRepository(
                 .filter { it.isLoaded }
     }
 
-    override fun getQuestContent(key: String): Flowable<QuestContent> {
-        return RxJavaBridge.toV3Flowable(
-            realm.where(QuestContent::class.java).equalTo("key", key)
+    override fun getQuestContent(key: String): Flow<QuestContent?> {
+        return realm.where(QuestContent::class.java).equalTo("key", key)
                 .findAll()
-                .asFlowable()
+                .toFlow()
                 .filter { content -> content.isLoaded && content.isValid && !content.isEmpty() }
                 .map { content -> content.first() }
-        )
     }
 
     override fun getEquipment(searchedKeys: List<String>): Flowable<out List<Equipment>> {
@@ -240,7 +238,7 @@ class RealmInventoryLocalRepository(realm: Realm) : RealmContentLocalRepository(
     }
 
     override fun changeOwnedCount(type: String, key: String, userID: String, amountToAdd: Int) {
-        getOwnedItem(userID, type, key, true).firstElement().subscribe({ changeOwnedCount(it, amountToAdd) }, RxErrorHandler.handleEmptyError())
+        getOwnedItem(userID, type, key, true).firstElement().subscribe({ changeOwnedCount(it, amountToAdd) }, ExceptionHandler.rx())
     }
 
     override fun changeOwnedCount(item: OwnedItem, amountToAdd: Int?) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmSocialLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmSocialLocalRepository.kt
index 5bc9eeb68..eb1f5dec9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmSocialLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmSocialLocalRepository.kt
@@ -14,21 +14,21 @@ import io.reactivex.rxjava3.core.Flowable
 import io.realm.Realm
 import io.realm.Sort
 import io.realm.kotlin.toFlow
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.map
 
 class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm), SocialLocalRepository {
 
-    override fun getGroupMembership(userId: String, id: String): Flowable<GroupMembership> = RxJavaBridge.toV3Flowable(
-        realm.where(GroupMembership::class.java)
+    override fun getGroupMembership(userId: String, id: String) = realm.where(GroupMembership::class.java)
             .equalTo("userID", userId)
             .equalTo("groupID", id)
             .findAll()
-            .asFlowable()
+            .toFlow()
             .filter { it.isLoaded && it.isNotEmpty() }
             .map { it.first() }
-    )
 
     override fun getGroupMemberships(userId: String): Flowable<out List<GroupMembership>> = RxJavaBridge.toV3Flowable(
         realm.where(GroupMembership::class.java)
@@ -134,29 +134,25 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
             .filter { it.isLoaded }
     )
 
-    override fun getUserGroups(userID: String, type: String?): Flowable<out List<Group>> = RxJavaBridge.toV3Flowable(
-        realm.where(GroupMembership::class.java)
+    @OptIn(ExperimentalCoroutinesApi::class)
+    override fun getUserGroups(userID: String, type: String?) = realm.where(GroupMembership::class.java)
             .equalTo("userID", userID)
             .findAll()
-            .asFlowable()
-            .filter { it.isLoaded }
-    )
-        .flatMap { memberships ->
-            RxJavaBridge.toV3Flowable(
-                realm.where(Group::class.java)
-                    .equalTo("type", type ?: "guild")
-                    .notEqualTo("id", Group.TAVERN_ID)
-                    .`in`(
-                        "id",
-                        memberships.map {
-                            return@map it.groupID
-                        }.toTypedArray()
-                    )
-                    .sort("memberCount", Sort.DESCENDING)
-                    .findAll()
-                    .asFlowable()
-                    .filter { it.isLoaded }
-            )
+            .toFlow()
+        .filter { it.isLoaded }
+        .flatMapLatest { memberships ->
+            realm.where(Group::class.java)
+                .equalTo("type", type ?: "guild")
+                .notEqualTo("id", Group.TAVERN_ID)
+                .`in`(
+                    "id",
+                    memberships.map {
+                        return@map it.groupID
+                    }.toTypedArray()
+                )
+                .sort("memberCount", Sort.DESCENDING)
+                .findAll()
+                .toFlow()
         }
 
     override fun getGroups(type: String): Flowable<out List<Group>> {
@@ -169,17 +165,6 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
         )
     }
 
-    override fun getGroupFlowable(id: String): Flowable<Group> {
-        return RxJavaBridge.toV3Flowable(
-            realm.where(Group::class.java)
-                .equalTo("id", id)
-                .findAll()
-                .asFlowable()
-                .filter { group -> group.isLoaded && group.isValid && !group.isEmpty() }
-                .map { groups -> groups.first() }
-        )
-    }
-
     override fun getGroup(id: String): Flow<Group?> {
         return realm.where(Group::class.java)
             .equalTo("id", id)
@@ -205,13 +190,17 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
         executeTransaction { chatMessage?.deleteFromRealm() }
     }
 
-    override fun getGroupMembers(partyId: String): Flow<List<Member>> {
-        return realm.where(Member::class.java)
+    override fun getPartyMembers(partyId: String) = realm.where(Member::class.java)
                 .equalTo("party.id", partyId)
                 .findAll()
-                .toFlow()
-                .filter { it.isLoaded }
-    }
+            .toFlow()
+
+    override fun getGroupMembers(groupID: String) = realm.where(GroupMembership::class.java)
+        .equalTo("groupID", groupID)
+        .findAll()
+        .toFlow()
+        .map { memberships -> memberships.map { it.userID }.toTypedArray() }
+        .flatMapLatest { realm.where(Member::class.java).`in`("id", it).findAll().toFlow() }
 
     override fun updateRSVPNeeded(user: User?, newValue: Boolean) {
         executeTransaction { user?.party?.quest?.RSVPNeeded = newValue }
@@ -239,7 +228,7 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
         }
     }
 
-    override fun saveGroupMembers(groupId: String?, members: List<Member>) {
+    override fun savePartyMembers(groupId: String?, members: List<Member>) {
         saveSyncronous(members)
         if (groupId != null) {
             val existingMembers = realm.where(Member::class.java).equalTo("party.id", groupId).findAll()
@@ -302,27 +291,19 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
         return party != null && party.isValid
     }
 
-    override fun getInboxMessages(userId: String, replyToUserID: String?): Flowable<out List<ChatMessage>> {
-        return RxJavaBridge.toV3Flowable(
-            realm.where(ChatMessage::class.java)
+    override fun getInboxMessages(userId: String, replyToUserID: String?) = realm.where(ChatMessage::class.java)
                 .equalTo("isInboxMessage", true)
                 .equalTo("uuid", replyToUserID)
                 .equalTo("userID", userId)
                 .sort("timestamp", Sort.DESCENDING)
                 .findAll()
-                .asFlowable()
+                .toFlow()
                 .filter { it.isLoaded }
-        )
-    }
 
-    override fun getInboxConversation(userId: String): Flowable<out List<InboxConversation>> {
-        return RxJavaBridge.toV3Flowable(
-            realm.where(InboxConversation::class.java)
+    override fun getInboxConversation(userId: String) = realm.where(InboxConversation::class.java)
                 .equalTo("userID", userId)
                 .sort("timestamp", Sort.DESCENDING)
                 .findAll()
-                .asFlowable()
+                .toFlow()
                 .filter { it.isLoaded }
-        )
-    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.kt
index 2f8d1e5bd..6d97a4e61 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.kt
@@ -12,42 +12,55 @@ import hu.akarnokd.rxjava3.bridge.RxJavaBridge
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.core.Maybe
 import io.realm.Realm
+import io.realm.RealmResults
 import io.realm.Sort
 import io.realm.kotlin.toFlow
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.map
 
 class RealmTaskLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm), TaskLocalRepository {
 
     override fun getTasks(taskType: TaskType, userID: String, includedGroupIDs: Array<String>): Flow<List<Task>> {
         if (realm.isClosed) return emptyFlow()
-        return realm.where(Task::class.java)
-            .equalTo("typeValue", taskType.value)
-            .beginGroup()
-            .equalTo("userId", userID)
-            .or()
-            .`in`("group.groupID", includedGroupIDs)
-            .endGroup()
-            .sort("position", Sort.ASCENDING, "dateCreated", Sort.DESCENDING)
-            .findAll()
+        return findTasks(taskType, userID, includedGroupIDs)
             .toFlow()
             .filter { it.isLoaded }
     }
 
     override fun getTasksFlowable(taskType: TaskType, userID: String, includedGroupIDs: Array<String>): Flowable<out List<Task>> {
         if (realm.isClosed) return Flowable.empty()
-        return RxJavaBridge.toV3Flowable(realm.where(Task::class.java)
+        return RxJavaBridge.toV3Flowable(findTasks(taskType, userID, includedGroupIDs)
+            .asFlowable()
+            .filter { it.isLoaded })
+    }
+
+    private fun findTasks(
+        taskType: TaskType,
+        ownerID: String,
+        includedGroupIDs: Array<String>
+    ): RealmResults<Task> {
+        return realm.where(Task::class.java)
             .equalTo("typeValue", taskType.value)
             .beginGroup()
-            .equalTo("userId", userID)
+            .equalTo("userId", ownerID)
             .or()
+            .beginGroup()
             .`in`("group.groupID", includedGroupIDs)
+            .and()
+            .beginGroup()
+            .contains("group.assignedUsers", ownerID)
+            .or()
+            .isEmpty("group.assignedUsers")
+            .endGroup()
+            .endGroup()
+            .or()
+            .equalTo("group.groupID", ownerID)
             .endGroup()
             .sort("position", Sort.ASCENDING, "dateCreated", Sort.DESCENDING)
             .findAll()
-            .asFlowable()
-            .filter { it.isLoaded })
     }
 
     override fun getTasks(userId: String): Flow<List<Task>> {
@@ -126,14 +139,13 @@ class RealmTaskLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
         return taskList
     }
 
-    private fun removeOldTasks(userID: String, onlineTaskList: List<Task>) {
-        val groupIDs = onlineTaskList.map { it.group?.groupID }.distinct().toTypedArray()
+    private fun removeOldTasks(ownerID: String, onlineTaskList: List<Task>) {
         if (realm.isClosed) return
         val localTasks = realm.where(Task::class.java)
             .beginGroup()
-            .equalTo("userId", userID)
+            .equalTo("userId", ownerID)
             .or()
-            .`in`("group.groupID", groupIDs)
+            .equalTo("group.groupID", ownerID)
             .endGroup()
             .beginGroup()
             .beginGroup()
@@ -177,19 +189,17 @@ class RealmTaskLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
         }
     }
 
-    override fun getTask(taskId: String): Flowable<Task> {
+    override fun getTask(taskId: String): Flow<Task> {
         if (realm.isClosed) {
-            return Flowable.empty()
+            return emptyFlow()
         }
-        return RxJavaBridge.toV3Flowable(
-            realm.where(Task::class.java).equalTo("id", taskId).findAll().asFlowable()
-                .filter { realmObject -> realmObject.isLoaded && realmObject.isNotEmpty() }
-                .map { it.first() }
-                .cast(Task::class.java)
-        )
+        return realm.where(Task::class.java).equalTo("id", taskId).findAll().toFlow()
+            .filter { realmObject -> realmObject.isLoaded && realmObject.isNotEmpty() }
+            .map { it.first() }
+            .filterNotNull()
     }
 
-    override fun getTaskCopy(taskId: String): Flowable<Task> {
+    override fun getTaskCopy(taskId: String): Flow<Task> {
         return getTask(taskId)
             .map { task ->
                 return@map if (task.isManaged && task.isValid) {
@@ -260,7 +270,7 @@ class RealmTaskLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
         ).retry(1)
     }
 
-    override fun getUser(userID: String): Flowable<User> {
+    override fun getUserFlowable(userID: String): Flowable<User> {
         return RxJavaBridge.toV3Flowable(
             realm.where(User::class.java)
                 .equalTo("id", userID)
@@ -271,6 +281,16 @@ class RealmTaskLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
         )
     }
 
+    override fun getUser(userID: String): Flow<User> {
+        return realm.where(User::class.java)
+            .equalTo("id", userID)
+            .findAll()
+            .toFlow()
+            .filter { realmObject -> realmObject.isLoaded && realmObject.isValid && !realmObject.isEmpty() }
+            .map { users -> users.first() }
+            .filterNotNull()
+    }
+
     override fun getTasksForChallenge(challengeID: String?, userID: String?): Flowable<out List<Task>> {
         return RxJavaBridge.toV3Flowable(
             realm.where(Task::class.java)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Flowable-Extensions.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Flowable-Extensions.kt
index 6d25b030e..c27f2de98 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Flowable-Extensions.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Flowable-Extensions.kt
@@ -1,10 +1,10 @@
 package com.habitrpg.android.habitica.extensions
 
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.disposables.Disposable
 import io.reactivex.rxjava3.functions.Consumer
 
 fun <T : Any> Flowable<T>.subscribeWithErrorHandler(function: Consumer<T>): Disposable {
-    return subscribe(function, RxErrorHandler.handleEmptyError())
+    return subscribe(function, ExceptionHandler.rx())
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt
index c23b8c098..ff3e5cc5b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt
@@ -18,12 +18,16 @@ class AppConfigManager(contentRepository: ContentRepository?): com.habitrpg.comm
     private var worldState: WorldState? = null
 
     init {
-        contentRepository?.getWorldState()?.subscribe(
-            {
-                worldState = it
-            },
-            RxErrorHandler.handleEmptyError()
-        )
+        try {
+            contentRepository?.getWorldState()?.subscribe(
+                {
+                    worldState = it
+                },
+                ExceptionHandler.rx()
+            )
+        } catch (_: java.lang.IllegalStateException) {
+            // pass
+        }
     }
 
     private val remoteConfig = FirebaseRemoteConfig.getInstance()
@@ -137,9 +141,7 @@ class AppConfigManager(contentRepository: ContentRepository?): com.habitrpg.comm
     }
 
     fun enableTeamBoards(): Boolean {
-        if (BuildConfig.DEBUG) {
-            return true
-        }
+        return true
         return remoteConfig.getBoolean("enableTeamBoards")
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RxErrorHandler.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/ExceptionHandler.kt
similarity index 73%
rename from Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RxErrorHandler.kt
rename to Habitica/src/main/java/com/habitrpg/android/habitica/helpers/ExceptionHandler.kt
index dce9aebb5..2e1f573aa 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RxErrorHandler.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/ExceptionHandler.kt
@@ -4,24 +4,31 @@ import android.util.Log
 import com.habitrpg.android.habitica.BuildConfig
 import com.habitrpg.android.habitica.proxy.AnalyticsManager
 import io.reactivex.rxjava3.functions.Consumer
-import java.io.EOFException
-import java.io.IOException
+import kotlinx.coroutines.CoroutineExceptionHandler
 import okhttp3.internal.http2.ConnectionShutdownException
 import retrofit2.HttpException
+import java.io.EOFException
+import java.io.IOException
 
-class RxErrorHandler {
+class ExceptionHandler {
     private var analyticsManager: AnalyticsManager? = null
 
     companion object {
 
-        private var instance: RxErrorHandler? = null
+        private var instance = ExceptionHandler()
 
         fun init(analyticsManager: AnalyticsManager) {
-            instance = RxErrorHandler()
-            instance?.analyticsManager = analyticsManager
+            instance.analyticsManager = analyticsManager
         }
 
-        fun handleEmptyError(): Consumer<Throwable> {
+        fun coroutine(handler: ((Throwable) -> Unit)? = null): CoroutineExceptionHandler {
+            return CoroutineExceptionHandler { _, throwable ->
+                reportError(throwable)
+                handler?.invoke(throwable)
+            }
+        }
+
+        fun rx(): Consumer<Throwable> {
             // Can't be turned into a lambda, because it then doesn't work for some reason.
             return Consumer { reportError(it) }
         }
@@ -40,7 +47,7 @@ class RxErrorHandler {
                     !retrofit2.adapter.rxjava3.HttpException::class.java.isAssignableFrom(throwable.javaClass) &&
                     throwable !is ConnectionShutdownException
                 ) {
-                    instance?.analyticsManager?.logException(throwable)
+                    instance.analyticsManager?.logException(throwable)
                 }
             }
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/GroupPlanInfoProvider.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/GroupPlanInfoProvider.kt
new file mode 100644
index 000000000..60d608130
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/GroupPlanInfoProvider.kt
@@ -0,0 +1,10 @@
+package com.habitrpg.android.habitica.helpers
+
+import android.content.res.Resources
+import com.habitrpg.android.habitica.models.tasks.Task
+
+interface GroupPlanInfoProvider {
+    fun assignedTextForTask(resources: Resources, assignedUsers: List<String>): String
+    fun canScoreTask(task: Task): Boolean
+    fun canEditTask(task: Task): Boolean
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationsManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationsManager.kt
index c24f5edaf..96eaeb26b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationsManager.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationsManager.kt
@@ -120,6 +120,6 @@ class MainNotificationsManager: NotificationsManager {
 
     private fun readNotification(notification: Notification) {
         apiClient?.get()?.readNotification(notification.id)
-            ?.subscribe({ }, RxErrorHandler.handleEmptyError())
+            ?.subscribe({ }, ExceptionHandler.rx())
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt
index ba9d71278..6acb1c644 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt
@@ -25,26 +25,25 @@ import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.extensions.addOkButton
-import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
-import com.habitrpg.common.habitica.models.IAPGift
-import com.habitrpg.common.habitica.models.PurchaseValidationRequest
-import com.habitrpg.common.habitica.models.Transaction
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.proxy.AnalyticsManager
 import com.habitrpg.android.habitica.ui.activities.PurchaseActivity
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import io.reactivex.rxjava3.core.Flowable
-import java.util.Date
-import kotlin.time.DurationUnit
-import kotlin.time.toDuration
+import com.habitrpg.common.habitica.models.IAPGift
+import com.habitrpg.common.habitica.models.PurchaseValidationRequest
+import com.habitrpg.common.habitica.models.Transaction
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.json.JSONObject
 import retrofit2.HttpException
+import java.util.Date
+import kotlin.time.DurationUnit
+import kotlin.time.toDuration
 
 class PurchaseHandler(
     private val context: Context,
@@ -88,7 +87,7 @@ class PurchaseHandler(
                 return
             }
             BillingClient.BillingResponseCode.ITEM_ALREADY_OWNED -> {
-                CoroutineScope(Dispatchers.IO).launch {
+                CoroutineScope(Dispatchers.IO).launch(ExceptionHandler.coroutine()) {
                     for (purchase in purchases) {
                         consume(purchase)
                     }
@@ -186,7 +185,8 @@ class PurchaseHandler(
         return skuDetailsResult.skuDetailsList
     }
 
-    fun purchase(activity: Activity, skuDetails: SkuDetails, recipient: String? = null) {
+    fun purchase(activity: Activity, skuDetails: SkuDetails, recipient: String? = null, isSaleGemPurchase: Boolean = false) {
+        this.isSaleGemPurchase = isSaleGemPurchase
         recipient?.let {
             addGift(skuDetails.sku, it)
         }
@@ -219,7 +219,7 @@ class PurchaseHandler(
                 apiClient.validatePurchase(validationRequest).subscribe({
                     processedPurchase(purchase)
                     val gift = removeGift(sku)
-                    CoroutineScope(Dispatchers.IO).launch {
+                    CoroutineScope(Dispatchers.IO).launch(ExceptionHandler.coroutine()) {
                         consume(purchase)
                     }
                     displayConfirmationDialog(purchase, gift?.second)
@@ -232,7 +232,7 @@ class PurchaseHandler(
                 apiClient.validateNoRenewSubscription(validationRequest).subscribe({
                     processedPurchase(purchase)
                     val gift = removeGift(sku)
-                    CoroutineScope(Dispatchers.IO).launch {
+                    CoroutineScope(Dispatchers.IO).launch(ExceptionHandler.coroutine()) {
                         consume(purchase)
                     }
                     displayConfirmationDialog(purchase, gift?.second)
@@ -245,7 +245,7 @@ class PurchaseHandler(
                 apiClient.validateSubscription(validationRequest).subscribe({
                     processedPurchase(purchase)
                     analyticsManager.logEvent("user_subscribed", bundleOf(Pair("sku", sku)))
-                    CoroutineScope(Dispatchers.IO).launch {
+                    CoroutineScope(Dispatchers.IO).launch(ExceptionHandler.coroutine()) {
                         acknowledgePurchase(purchase)
                     }
                     displayConfirmationDialog(purchase)
@@ -268,7 +268,9 @@ class PurchaseHandler(
     }
 
     private fun processedPurchase(purchase: Purchase) {
-        userViewModel.userRepository.retrieveUser(false, true).subscribeWithErrorHandler {}
+        MainScope().launch(ExceptionHandler.coroutine()) {
+            userViewModel.userRepository.retrieveUser(false, true)
+        }
     }
 
     private fun buildValidationRequest(purchase: Purchase): PurchaseValidationRequest {
@@ -296,7 +298,7 @@ class PurchaseHandler(
                 if (res.message != null && res.message == "RECEIPT_ALREADY_USED") {
                     processedPurchase(purchase)
                     removeGift(purchase.skus.firstOrNull())
-                    CoroutineScope(Dispatchers.IO).launch {
+                    CoroutineScope(Dispatchers.IO).launch(ExceptionHandler.coroutine()) {
                         consume(purchase)
                     }
                     return
@@ -331,9 +333,9 @@ class PurchaseHandler(
         return fallback
     }
 
-    fun cancelSubscription(): Flowable<User> {
-        return apiClient.cancelSubscription()
-            .flatMap { userViewModel.userRepository.retrieveUser(false, true) }
+    suspend fun cancelSubscription(): User? {
+        apiClient.cancelSubscription()
+        return userViewModel.userRepository.retrieveUser(false, true)
     }
 
     private fun durationString(sku: String): String {
@@ -346,18 +348,31 @@ class PurchaseHandler(
         }
     }
 
+    private var isSaleGemPurchase = false
+
     private fun gemAmountString(sku: String): String {
-        return when (sku) {
-            PurchaseTypes.Purchase4Gems -> "4"
-            PurchaseTypes.Purchase21Gems -> "21"
-            PurchaseTypes.Purchase42Gems -> "42"
-            PurchaseTypes.Purchase84Gems -> "84"
-            else -> ""
+        if (isSaleGemPurchase) {
+            isSaleGemPurchase = false
+            return when (sku) {
+                PurchaseTypes.Purchase4Gems -> "5"
+                PurchaseTypes.Purchase21Gems -> "30"
+                PurchaseTypes.Purchase42Gems -> "60"
+                PurchaseTypes.Purchase84Gems -> "125"
+                else -> ""
+            }
+        } else {
+            return when (sku) {
+                PurchaseTypes.Purchase4Gems -> "4"
+                PurchaseTypes.Purchase21Gems -> "21"
+                PurchaseTypes.Purchase42Gems -> "42"
+                PurchaseTypes.Purchase84Gems -> "84"
+                else -> ""
+            }
         }
     }
 
     private fun displayConfirmationDialog(purchase: Purchase, giftedTo: String? = null) {
-        CoroutineScope(Dispatchers.Main).launch {
+        CoroutineScope(Dispatchers.Main).launch(ExceptionHandler.coroutine()) {
             val application = (context as? HabiticaBaseApplication)
                 ?: (context.applicationContext as? HabiticaBaseApplication) ?: return@launch
             val sku = purchase.skus.firstOrNull() ?: return@launch
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFile.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFile.kt
index 0864cffe4..c715886b1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFile.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFile.kt
@@ -37,7 +37,7 @@ class SoundFile(val theme: String, private val fileName: String) {
             player?.setDataSource(file?.path)
             val attributes = AudioAttributes.Builder()
                 .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
-                .setLegacyStreamType(AudioManager.STREAM_NOTIFICATION)
+                .setLegacyStreamType(AudioManager.STREAM_MUSIC)
                 .build()
             player?.setAudioAttributes(attributes)
             player?.prepare()
@@ -48,7 +48,7 @@ class SoundFile(val theme: String, private val fileName: String) {
             player?.start()
         } catch (e: IllegalStateException) {
         } catch (e: Exception) {
-            RxErrorHandler.reportError(e)
+            ExceptionHandler.reportError(e)
         }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundManager.kt
index d4387f280..178e461e4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundManager.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundManager.kt
@@ -34,7 +34,7 @@ class SoundManager {
         soundFiles.add(SoundFile(soundTheme, SoundReward))
         soundFiles.add(SoundFile(soundTheme, SoundTodo))
         soundFileLoader.download(soundFiles)
-            .subscribe({}, RxErrorHandler.handleEmptyError())
+            .subscribe({}, ExceptionHandler.rx())
     }
 
     fun loadAndPlayAudio(type: String) {
@@ -54,7 +54,7 @@ class SoundManager {
                     loadedSoundFiles[type] = file
                     file.play()
                 },
-                RxErrorHandler.handleEmptyError()
+                ExceptionHandler.rx()
             )
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt
index 3431f4b88..2550ed7fc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt
@@ -16,7 +16,11 @@ import com.habitrpg.android.habitica.receivers.TaskReceiver
 import com.habitrpg.shared.habitica.HLogger
 import com.habitrpg.shared.habitica.LogLevel
 import com.habitrpg.shared.habitica.models.tasks.TaskType
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.launch
 import java.time.ZoneId
 import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter
@@ -55,10 +59,12 @@ class TaskAlarmManager(
     // We currently only use this function to schedule the next reminder for dailies
     // We may be able to use repeating alarms instead of this in the future
     fun addAlarmForTaskId(taskId: String) {
-        taskRepository.getTaskCopy(taskId)
-            .filter { task -> task.isValid && task.isManaged && TaskType.DAILY == task.type }
-            .firstElement()
-            .subscribe({ this.setAlarmsForTask(it) }, RxErrorHandler.handleEmptyError())
+        MainScope().launch(ExceptionHandler.coroutine()) {
+            val task = taskRepository.getTaskCopy(taskId)
+                .filter { task -> task.isValid && task.isManaged && TaskType.DAILY == task.type }
+                .first()
+            setAlarmsForTask(task)
+        }
     }
 
     suspend fun scheduleAllSavedAlarms(preventDailyReminder: Boolean) {
@@ -216,7 +222,11 @@ class TaskAlarmManager(
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
                 alarmManager?.setWindow(AlarmManager.RTC_WAKEUP, time, 60000, pendingIntent)
             } else {
-                alarmManager?.setAlarmClock(AlarmClockInfo(time, pendingIntent), pendingIntent)
+                try {
+                    alarmManager?.setAlarmClock(AlarmClockInfo(time, pendingIntent), pendingIntent)
+                } catch (e: SecurityException) {
+                    alarmManager?.setWindow(AlarmManager.RTC_WAKEUP, time, 60000, pendingIntent)
+                }
             }
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseMessagingService.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseMessagingService.kt
index d4cdcd1ad..93709ac1d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseMessagingService.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseMessagingService.kt
@@ -16,13 +16,16 @@ class HabiticaFirebaseMessagingService : FirebaseMessagingService() {
     internal lateinit var pushNotificationManager: PushNotificationManager
 
     override fun onMessageReceived(remoteMessage: RemoteMessage) {
-        userComponent?.inject(this)
-        if (this::pushNotificationManager.isInitialized) {
-            pushNotificationManager.displayNotification(remoteMessage)
+        try {
+            userComponent?.inject(this)
+        } catch (_: java.lang.IllegalStateException) {
+        }
+        PushNotificationManager.displayNotification(remoteMessage, applicationContext)
 
-            if (remoteMessage.data["identifier"]?.contains(PushNotificationManager.WON_CHALLENGE_PUSH_NOTIFICATION_KEY) == true) {
+        if (remoteMessage.data["identifier"]?.contains(PushNotificationManager.WON_CHALLENGE_PUSH_NOTIFICATION_KEY) == true) {
+            // if (this::userRepository.isInitialized) {
                 // userRepository.retrieveUser(true).subscribe({}, RxErrorHandler.handleEmptyError())
-            }
+            // }
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.kt
index ec2a1c035..91cb2c279 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.kt
@@ -7,6 +7,7 @@ import android.media.RingtoneManager
 import androidx.annotation.CallSuper
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
+import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.withImmutableFlag
 import com.habitrpg.android.habitica.ui.activities.MainActivity
@@ -32,6 +33,7 @@ abstract class HabiticaLocalNotification(
         val path = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION)
         return notificationBuilder
             .setSound(path)
+            .setColor(ContextCompat.getColor(context, R.color.brand_300))
     }
 
     @CallSuper
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotificationFactory.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotificationFactory.kt
index a71cfb522..f45e3e122 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotificationFactory.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotificationFactory.kt
@@ -2,9 +2,6 @@ package com.habitrpg.android.habitica.helpers.notifications
 
 import android.content.Context
 
-/**
- * Created by keithholliday on 6/28/16.
- */
 class HabiticaLocalNotificationFactory {
     // use getShape method to get object of type shape
     fun build(notificationType: String?, context: Context?): HabiticaLocalNotification {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.kt
index f6ce17841..8fac75a74 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.kt
@@ -7,7 +7,7 @@ import com.google.firebase.messaging.FirebaseMessaging
 import com.google.firebase.messaging.RemoteMessage
 import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.helpers.AmplitudeManager
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.user.User
 
 class PushNotificationManager(
@@ -34,27 +34,31 @@ class PushNotificationManager(
     }
 
     fun addPushDeviceUsingStoredToken() {
-        FirebaseMessaging.getInstance().token.addOnCompleteListener {
-            if (!it.isSuccessful) {
-                return@addOnCompleteListener
+        if (refreshedToken.isNotBlank()) {
+            addRefreshToken()
+        } else {
+            FirebaseMessaging.getInstance().token.addOnCompleteListener {
+                refreshedToken = it.result
+                addRefreshToken()
             }
-            this.refreshedToken = it.result
-            if (this.refreshedToken.isEmpty() || this.user == null || this.userHasPushDevice() || !this.userIsSubscribedToNotifications()) {
-                return@addOnCompleteListener
-            }
-
-            val pushDeviceData = HashMap<String, String>()
-            pushDeviceData["regId"] = this.refreshedToken
-            pushDeviceData["type"] = "android"
-            apiClient.addPushDevice(pushDeviceData).subscribe({ }, RxErrorHandler.handleEmptyError())
         }
     }
 
-    fun removePushDeviceUsingStoredToken() {
-        if (this.refreshedToken.isEmpty()) {
+    private fun addRefreshToken() {
+        if (this.refreshedToken.isEmpty() || this.user == null || this.userHasPushDevice()) {
             return
         }
-        apiClient.deletePushDevice(this.refreshedToken).subscribe({ }, RxErrorHandler.handleEmptyError())
+        val pushDeviceData = HashMap<String, String>()
+        pushDeviceData["regId"] = this.refreshedToken
+        pushDeviceData["type"] = "android"
+        apiClient.addPushDevice(pushDeviceData).subscribe({ }, ExceptionHandler.rx())
+    }
+
+    fun removePushDeviceUsingStoredToken() {
+        if (this.refreshedToken.isEmpty() || !userHasPushDevice()) {
+            return
+        }
+        apiClient.deletePushDevice(this.refreshedToken).subscribe({ }, ExceptionHandler.rx())
     }
 
     private fun userHasPushDevice(): Boolean {
@@ -66,47 +70,17 @@ class PushNotificationManager(
         return this.user?.pushDevices == null
     }
 
-    fun displayNotification(remoteMessage: RemoteMessage) {
-        val remoteMessageIdentifier = remoteMessage.data["identifier"]
-
-        val notificationFactory = HabiticaLocalNotificationFactory()
-        val notification = notificationFactory.build(remoteMessageIdentifier, context)
-        if (userIsSubscribedToNotificationType(remoteMessageIdentifier)) {
-            if (remoteMessage.data.containsKey("sendAnalytics")) {
-                val additionalData = HashMap<String, Any>()
-                additionalData["identifier"] = remoteMessageIdentifier ?: ""
-                AmplitudeManager.sendEvent(
-                    "receive notification",
-                    AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR,
-                    AmplitudeManager.EVENT_HITTYPE_EVENT,
-                    additionalData
-                )
-            }
-            notification.setExtras(remoteMessage.data)
-            notification.notifyLocally(remoteMessage.data["title"], remoteMessage.data["body"], remoteMessage.data)
-        }
-    }
-
-    private fun userIsSubscribedToNotifications(): Boolean {
-        return sharedPreferences.getBoolean("pushNotifications", true)
-    }
-
     private fun userIsSubscribedToNotificationType(type: String?): Boolean {
-        var key = ""
-
-        if (type == null) {
-            return true
-        }
-
-        when {
-            type == PARTY_INVITE_PUSH_NOTIFICATION_KEY -> key = "preference_push_invited_to_party"
-            type.contains(RECEIVED_PRIVATE_MESSAGE_PUSH_NOTIFICATION_KEY) -> key = "preference_push_received_a_private_message"
-            type.contains(RECEIVED_GEMS_PUSH_NOTIFICATION_KEY) -> key = "preference_push_gifted_gems"
-            type.contains(RECEIVED_SUBSCRIPTION_GIFT_PUSH_NOTIFICATION_KEY) -> key = "preference_push_gifted_subscription"
-            type.contains(GUILD_INVITE_PUSH_NOTIFICATION_KEY) -> key = "preference_push_invited_to_guild"
-            type.contains(QUEST_INVITE_PUSH_NOTIFICATION_KEY) -> key = "preference_push_invited_to_quest"
-            type.contains(QUEST_BEGUN_PUSH_NOTIFICATION_KEY) -> key = "preference_push_your_quest_has_begun"
-            type.contains(WON_CHALLENGE_PUSH_NOTIFICATION_KEY) -> key = "preference_push_you_won_challenge"
+        val key = when {
+            type == PARTY_INVITE_PUSH_NOTIFICATION_KEY -> "preference_push_invited_to_party"
+            type?.contains(RECEIVED_PRIVATE_MESSAGE_PUSH_NOTIFICATION_KEY) == true -> "preference_push_received_a_private_message"
+            type?.contains(RECEIVED_GEMS_PUSH_NOTIFICATION_KEY) == true -> "preference_push_gifted_gems"
+            type?.contains(RECEIVED_SUBSCRIPTION_GIFT_PUSH_NOTIFICATION_KEY) == true -> "preference_push_gifted_subscription"
+            type?.contains(GUILD_INVITE_PUSH_NOTIFICATION_KEY) == true -> "preference_push_invited_to_guild"
+            type?.contains(QUEST_INVITE_PUSH_NOTIFICATION_KEY) == true -> "preference_push_invited_to_quest"
+            type?.contains(QUEST_BEGUN_PUSH_NOTIFICATION_KEY) == true -> "preference_push_your_quest_has_begun"
+            type?.contains(WON_CHALLENGE_PUSH_NOTIFICATION_KEY) == true -> "preference_push_you_won_challenge"
+            else -> return true
         }
 
         return sharedPreferences.getBoolean(key, true)
@@ -127,5 +101,28 @@ class PushNotificationManager(
         const val GROUP_ACTIVITY_NOTIFICATION_KEY = "groupActivity"
         const val G1G1_PROMO_KEY = "g1g1Promo"
         private const val DEVICE_TOKEN_PREFERENCE_KEY = "device-token-preference"
+
+        fun displayNotification(remoteMessage: RemoteMessage, context: Context, pushNotificationManager: PushNotificationManager? = null) {
+            val remoteMessageIdentifier = remoteMessage.data["identifier"]
+
+            val notificationFactory = HabiticaLocalNotificationFactory()
+            val notification = notificationFactory.build(remoteMessageIdentifier,
+                context
+            )
+            if (pushNotificationManager?.userIsSubscribedToNotificationType(remoteMessageIdentifier) != false) {
+                if (remoteMessage.data.containsKey("sendAnalytics")) {
+                    val additionalData = HashMap<String, Any>()
+                    additionalData["identifier"] = remoteMessageIdentifier ?: ""
+                    AmplitudeManager.sendEvent(
+                        "receive notification",
+                        AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR,
+                        AmplitudeManager.EVENT_HITTYPE_EVENT,
+                        additionalData
+                    )
+                }
+                notification.setExtras(remoteMessage.data)
+                notification.notifyLocally(remoteMessage.data["title"], remoteMessage.data["body"], remoteMessage.data)
+            }
+        }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/BuyRewardUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/BuyRewardUseCase.kt
index 8f0c30ac5..617c50a8a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/BuyRewardUseCase.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/BuyRewardUseCase.kt
@@ -1,30 +1,27 @@
 package com.habitrpg.android.habitica.interactors
 
 import com.habitrpg.android.habitica.data.TaskRepository
-import com.habitrpg.android.habitica.executors.PostExecutionThread
 import com.habitrpg.android.habitica.helpers.SoundManager
-import com.habitrpg.shared.habitica.models.responses.TaskScoringResult
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.models.user.User
-import io.reactivex.rxjava3.core.Flowable
+import com.habitrpg.shared.habitica.models.responses.TaskScoringResult
 import javax.inject.Inject
 
 class BuyRewardUseCase @Inject
 constructor(
     private val taskRepository: TaskRepository,
     private val soundManager: SoundManager,
-    postExecutionThread: PostExecutionThread
-) : UseCase<BuyRewardUseCase.RequestValues, TaskScoringResult?>(postExecutionThread) {
+) : FlowUseCase<BuyRewardUseCase.RequestValues, TaskScoringResult?>() {
 
-    override fun buildUseCaseObservable(requestValues: RequestValues): Flowable<TaskScoringResult?> {
-        return taskRepository
-            .taskChecked(requestValues.user, requestValues.task, false, false, requestValues.notifyFunc)
-            .doOnNext { soundManager.loadAndPlayAudio(SoundManager.SoundReward) }
+    override suspend fun run(requestValues: RequestValues): TaskScoringResult? {
+        val response = taskRepository.taskChecked(requestValues.user, requestValues.task, false, false, requestValues.notifyFunc)
+        soundManager.loadAndPlayAudio(SoundManager.SoundReward)
+        return response
     }
 
     class RequestValues(
         internal val user: User?,
         val task: Task,
         val notifyFunc: (TaskScoringResult) -> Unit
-    ) : UseCase.RequestValues
+    ) : FlowUseCase.RequestValues
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/HatchPetUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/HatchPetUseCase.kt
index a6b08896e..4125c9194 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/HatchPetUseCase.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/HatchPetUseCase.kt
@@ -8,7 +8,7 @@ import android.widget.FrameLayout
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.executors.PostExecutionThread
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.inventory.Egg
 import com.habitrpg.android.habitica.models.inventory.HatchingPotion
 import com.habitrpg.android.habitica.models.user.Items
@@ -37,7 +37,7 @@ constructor(
             dialog.setAdditionalContentView(petWrapper)
             dialog.addButton(R.string.equip, true) { _, _ ->
                 inventoryRepository.equip("pet", requestValues.egg.key + "-" + requestValues.potion.key)
-                    .subscribe({}, RxErrorHandler.handleEmptyError())
+                    .subscribe({}, ExceptionHandler.rx())
             }
             dialog.addButton(R.string.share, false) { hatchingDialog, _ ->
                 val message = requestValues.context.getString(R.string.share_hatched, potionName, eggName)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.kt
index 116a782d5..669a660ab 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.kt
@@ -5,7 +5,7 @@ import android.view.ViewGroup
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.DialogLevelup10Binding
 import com.habitrpg.android.habitica.executors.PostExecutionThread
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.SoundManager
 import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.models.user.User
@@ -94,7 +94,7 @@ constructor(
 
     private fun showClassSelection(requestValues: RequestValues) {
         checkClassSelectionUseCase.observable(CheckClassSelectionUseCase.RequestValues(requestValues.user, true, null, requestValues.activity))
-            .subscribe({ }, RxErrorHandler.handleEmptyError())
+            .subscribe({ }, ExceptionHandler.rx())
     }
 
     class RequestValues(
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.kt
index fa1ffd430..19b3f55b2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.kt
@@ -14,14 +14,13 @@ import androidx.core.util.Pair
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.executors.PostExecutionThread
-import com.habitrpg.android.habitica.extensions.filterMap
-import com.habitrpg.shared.habitica.extensions.round
 import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.activities.BaseActivity
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.SnackbarDisplayType
+import com.habitrpg.shared.habitica.extensions.round
 import io.reactivex.rxjava3.core.Flowable
 import javax.inject.Inject
 import kotlin.math.abs
@@ -48,8 +47,9 @@ constructor(
             }
             if (requestValues.hasLeveledUp == true) {
                 return@defer levelUpUseCase.observable(LevelUpUseCase.RequestValues(requestValues.user, requestValues.level, requestValues.context, requestValues.snackbarTargetView))
-                    .flatMap { userRepository.retrieveUser(true) }
-                    .filterMap { it.stats }
+                    // TODO: .flatMap { userRepository.retrieveUser(true) }
+                    .flatMap { userRepository.getUserFlowable().firstElement().toFlowable() }
+                    .map { it.stats }
             } else {
                 return@defer Flowable.just(stats)
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ShowNotificationInteractor.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ShowNotificationInteractor.kt
index 9464d05ab..e81295281 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ShowNotificationInteractor.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ShowNotificationInteractor.kt
@@ -7,6 +7,7 @@ import android.widget.TextView
 import androidx.lifecycle.LifecycleCoroutineScope
 import com.google.firebase.analytics.FirebaseAnalytics
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.SnackbarActivity
@@ -126,7 +127,7 @@ class ShowNotificationInteractor(
         } else {
             200
         }
-        lifecycleScope.launch {
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
             delay(delayTime)
             lifecycleScope.launch(context = Dispatchers.Main) {
                 val dialog = AchievementDialog(activity)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/UseCase.java b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/UseCase.java
deleted file mode 100644
index 7f4088282..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/UseCase.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.habitrpg.android.habitica.interactors;
-
-import com.habitrpg.android.habitica.executors.PostExecutionThread;
-
-import io.reactivex.rxjava3.core.Flowable;
-
-public abstract class UseCase<Q extends UseCase.RequestValues, T> {
-
-    private final PostExecutionThread postExecutionThread;
-
-    protected UseCase(PostExecutionThread postExecutionThread) {
-        this.postExecutionThread = postExecutionThread;
-    }
-
-    protected abstract Flowable<T> buildUseCaseObservable(Q requestValues);
-
-    public Flowable<T> observable(Q requestValues) {
-        return this.buildUseCaseObservable(requestValues)
-                .subscribeOn(postExecutionThread.getScheduler())
-                .observeOn(postExecutionThread.getScheduler());
-    }
-
-    public interface RequestValues {
-
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/UseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/UseCase.kt
new file mode 100644
index 000000000..d60e1ed32
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/UseCase.kt
@@ -0,0 +1,28 @@
+package com.habitrpg.android.habitica.interactors
+
+import com.habitrpg.android.habitica.executors.PostExecutionThread
+import io.reactivex.rxjava3.core.Flowable
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+abstract class UseCase<Q : UseCase.RequestValues?, T: Any> protected constructor(private val postExecutionThread: PostExecutionThread) {
+    protected abstract fun buildUseCaseObservable(requestValues: Q): Flowable<T>
+    fun observable(requestValues: Q): Flowable<T> {
+        return buildUseCaseObservable(requestValues)
+            .subscribeOn(postExecutionThread.scheduler)
+            .observeOn(postExecutionThread.scheduler)
+    }
+
+    interface RequestValues
+}
+
+abstract class FlowUseCase<Q : FlowUseCase.RequestValues?, T> {
+    protected abstract suspend fun run(requestValues: Q): T
+    suspend fun observable(requestValues: Q): T {
+        return withContext(Dispatchers.IO) {
+            run(requestValues)
+        }
+    }
+
+    interface RequestValues
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/FallExtraGemsHabiticaPromotion.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/FallExtraGemsHabiticaPromotion.kt
index 01fa95cc4..0fb1d45c7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/FallExtraGemsHabiticaPromotion.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/FallExtraGemsHabiticaPromotion.kt
@@ -1,5 +1,6 @@
 package com.habitrpg.android.habitica.models.promotions
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.Color
 import android.graphics.drawable.Drawable
@@ -88,18 +89,33 @@ class FallExtraGemsHabiticaPromotion(startDate: Date?, endDate: Date?) : Habitic
     override fun configurePurchaseBanner(binding: FragmentSubscriptionBinding) {
     }
 
+    @SuppressLint("SetTextI18n")
     override fun configureGemView(binding: PurchaseGemViewBinding, regularAmount: Int) {
         val context = binding.root.context
         binding.root.background = promoBackgroundDrawable(context)
         binding.purchaseButton.background = buttonDrawable(context)
+        binding.purchaseButton.setTextColor(ContextCompat.getColor(context, R.color.white))
         binding.gemAmount.setTextColor(Color.parseColor("#FEE2B6"))
+        binding.gemLabel.setTextColor(Color.parseColor("#FEE2B6"))
         binding.footerTextView.visibility = View.VISIBLE
         binding.footerTextView.text = context.getString(R.string.usually_x_gems, regularAmount)
-        binding.gemAmount.text = when (regularAmount) {
-            4 -> "5 GEMS"
-            21 -> "30 GEMS"
-            42 -> "60 GEMS"
-            84 -> "125 GEMS"
+        when (regularAmount) {
+            4 -> {
+                binding.gemAmount.text = "5"
+                binding.gemImage.setImageResource(R.drawable.fall_gems_4)
+            }
+            21 -> {
+                binding.gemAmount.text = "30"
+                binding.gemImage.setImageResource(R.drawable.fall_gems_21)
+            }
+            42 -> {
+                binding.gemAmount.text = "60"
+                binding.gemImage.setImageResource(R.drawable.fall_gems_42)
+            }
+            84 -> {
+                binding.gemAmount.text = "125"
+                binding.gemImage.setImageResource(R.drawable.fall_gems_84)
+            }
             else -> regularAmount.toString()
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/SpookyExtraGemsHabiticaPromotion.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/SpookyExtraGemsHabiticaPromotion.kt
index 836614ade..4ebcea8fb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/SpookyExtraGemsHabiticaPromotion.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/promotions/SpookyExtraGemsHabiticaPromotion.kt
@@ -1,5 +1,6 @@
 package com.habitrpg.android.habitica.models.promotions
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.Color
 import android.graphics.drawable.Drawable
@@ -88,18 +89,33 @@ class SpookyExtraGemsHabiticaPromotion(startDate: Date?, endDate: Date?) : Habit
     override fun configurePurchaseBanner(binding: FragmentSubscriptionBinding) {
     }
 
+    @SuppressLint("SetTextI18n")
     override fun configureGemView(binding: PurchaseGemViewBinding, regularAmount: Int) {
         val context = binding.root.context
         binding.root.background = promoBackgroundDrawable(context)
         binding.purchaseButton.background = buttonDrawable(context)
+        binding.purchaseButton.setTextColor(ContextCompat.getColor(context, R.color.white))
         binding.gemAmount.setTextColor(Color.parseColor("#FEE2B6"))
+        binding.gemLabel.setTextColor(Color.parseColor("#FEE2B6"))
         binding.footerTextView.visibility = View.VISIBLE
         binding.footerTextView.text = context.getString(R.string.usually_x_gems, regularAmount)
-        binding.gemAmount.text = when (regularAmount) {
-            4 -> "5 GEMS"
-            21 -> "30 GEMS"
-            42 -> "60 GEMS"
-            84 -> "125 GEMS"
+        when (regularAmount) {
+            4 -> {
+                binding.gemAmount.text = "5"
+                binding.gemImage.setImageResource(R.drawable.spooky_gems_4)
+            }
+            21 -> {
+                binding.gemAmount.text = "30"
+                binding.gemImage.setImageResource(R.drawable.spooky_gems_21)
+            }
+            42 -> {
+                binding.gemAmount.text = "60"
+                binding.gemImage.setImageResource(R.drawable.spooky_gems_42)
+            }
+            84 -> {
+                binding.gemAmount.text = "125"
+                binding.gemImage.setImageResource(R.drawable.spooky_gems_84)
+            }
             else -> regularAmount.toString()
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.kt
index 85c8e53fb..433cf3c7d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.kt
@@ -4,7 +4,6 @@ import com.google.gson.annotations.SerializedName
 import com.habitrpg.android.habitica.models.BaseMainObject
 import com.habitrpg.android.habitica.models.inventory.Quest
 import com.habitrpg.android.habitica.models.tasks.TaskList
-import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.shared.habitica.models.tasks.TasksOrder
 import io.realm.RealmList
 import io.realm.RealmObject
@@ -34,7 +33,6 @@ open class Group : RealmObject(), BaseMainObject {
     var logo: String? = null
     var quest: Quest? = null
     var privacy: String? = null
-    var members: RealmList<User>? = null
     var challengeCount: Int = 0
     var leaderMessage: String? = null
     var leaderOnlyChallenges: Boolean = false
@@ -43,8 +41,6 @@ open class Group : RealmObject(), BaseMainObject {
 
     @Ignore
     var tasksOrder: TasksOrder? = null
-    @Ignore
-    var tasks: TaskList? = null
 
     override fun equals(other: Any?): Boolean {
         if (this === other) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt
index 0c4de801f..19fed52b9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt
@@ -5,7 +5,7 @@ import android.os.Parcelable
 import android.text.Spanned
 import com.google.gson.annotations.SerializedName
 import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.BaseMainObject
 import com.habitrpg.android.habitica.models.Tag
 import com.habitrpg.common.habitica.helpers.MarkdownParser
@@ -92,8 +92,11 @@ open class Task : RealmObject, BaseMainObject, Parcelable, BaseTask {
     var nextDue: RealmList<Date>? = null
     var updatedAt: Date? = null
     val isUpdatedToday: Boolean
-        get() = ZonedDateTime.ofInstant(updatedAt?.toInstant(), ZoneId.systemDefault()).toLocalDate()
-            .equals(ZonedDateTime.now().withZoneSameLocal(ZoneId.systemDefault()).toLocalDate())
+        get() {
+            val updatedAt = updatedAt ?: return false
+            return ZonedDateTime.ofInstant(updatedAt.toInstant(), ZoneId.systemDefault()).toLocalDate()
+                .equals(ZonedDateTime.now().withZoneSameLocal(ZoneId.systemDefault()).toLocalDate())
+        }
 
 
     // Needed for offline creating/updating
@@ -114,6 +117,30 @@ open class Task : RealmObject, BaseMainObject, Parcelable, BaseTask {
     val completedChecklistCount: Int
         get() = checklist?.count { it.completed } ?: 0
 
+    fun completed(byUserID: String?): Boolean {
+        return if (isGroupTask) {
+            group?.assignedUsersDetail?.firstOrNull { it.assignedUserID == byUserID }?.completed ?: completed
+        } else {
+            completed
+        }
+    }
+
+    fun completeForUser(userID: String?, completed: Boolean) {
+        if (isGroupTask && group?.assignedUsersDetail?.isNotEmpty() == true) {
+            group?.assignedUsersDetail?.firstOrNull { it.assignedUserID == userID }?.completed = completed
+            if (group?.assignedUsersDetail?.filter { it.completed != completed }?.isEmpty() == true) {
+                this.completed = completed
+            }
+        } else {
+            this.completed = completed
+        }
+    }
+
+    fun isDisplayedActiveForUser(userID: String?): Boolean {
+        val isActive = ((isDue == true && type == TaskType.DAILY) || type == TaskType.TODO)
+        return isActive && !completed(userID)
+    }
+
     val streakString: String?
         get() {
             return if (counterUp != null && (counterUp ?: 0) > 0 && counterDown != null && (counterDown ?: 0) > 0) {
@@ -436,7 +463,7 @@ open class Task : RealmObject, BaseMainObject, Parcelable, BaseTask {
                         i += 1
                     }
                 } catch (e: JSONException) {
-                    RxErrorHandler.reportError(e)
+                    ExceptionHandler.reportError(e)
                 }
             }
             this.weeksOfMonth = weeksOfMonth.toList()
@@ -465,7 +492,7 @@ open class Task : RealmObject, BaseMainObject, Parcelable, BaseTask {
                         i += 1
                     }
                 } catch (e: JSONException) {
-                    RxErrorHandler.reportError(e)
+                    ExceptionHandler.reportError(e)
                 }
             }
             this.daysOfMonth = daysOfMonth
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskGroupPlan.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskGroupPlan.kt
index 49e2191da..2e936526c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskGroupPlan.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskGroupPlan.kt
@@ -7,6 +7,15 @@ import io.realm.RealmObject
 import io.realm.annotations.RealmClass
 import java.util.Date
 
+@RealmClass(embedded = true)
+open class GroupAssignedDetails: RealmObject(), BaseObject {
+    var assignedDate: String? = null
+    var assignedUsername: String? = null
+    var assignedUserID: String? = null
+    var assigningUsername: String? = null
+    var completed: Boolean = false
+}
+
 @RealmClass(embedded = true)
 open class TaskGroupPlan : RealmObject(), BaseObject {
 
@@ -17,6 +26,7 @@ open class TaskGroupPlan : RealmObject(), BaseObject {
     var assignedDate: Date? = null
     var assigningUsername: String? = null
     var assignedUsers: RealmList<String> = RealmList()
+    var assignedUsersDetail: RealmList<GroupAssignedDetails> = RealmList()
 
     var approvalRequested: Boolean? = false
     var approvalApproved: Boolean? = false
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt
index 070cff23e..4113e4ba5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.kt
@@ -30,7 +30,7 @@ open class Preferences : RealmObject(), AvatarPreferences, BaseObject {
                 } else {
                     "chair_" + field!!
                 }
-            } else null
+            } else "chair_none"
         }
     var language: String? = null
     var sound: String? = null
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Stats.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Stats.kt
index 43a1b322f..6758fa30a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Stats.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Stats.kt
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.models.user
 
-import android.content.Context
+import android.content.res.Resources
 import com.google.gson.annotations.SerializedName
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.models.BaseObject
@@ -50,13 +50,13 @@ open class Stats : RealmObject(), AvatarStats, BaseObject {
             }
         }
 
-    fun getTranslatedClassName(context: Context): String {
+    fun getTranslatedClassName(resources: Resources): String {
         return when (habitClass) {
-            HEALER -> context.getString(R.string.healer)
-            ROGUE -> context.getString(R.string.rogue)
-            WARRIOR -> context.getString(R.string.warrior)
-            MAGE -> context.getString(R.string.mage)
-            else -> context.getString(R.string.warrior)
+            HEALER -> resources.getString(R.string.healer)
+            ROGUE -> resources.getString(R.string.rogue)
+            WARRIOR -> resources.getString(R.string.warrior)
+            MAGE -> resources.getString(R.string.mage)
+            else -> resources.getString(R.string.warrior)
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserModule.java b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserModule.java
deleted file mode 100644
index 3de77ecbe..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserModule.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.habitrpg.android.habitica.modules;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-
-import com.habitrpg.android.habitica.BuildConfig;
-import com.habitrpg.android.habitica.data.TaskRepository;
-import com.habitrpg.android.habitica.data.UserRepository;
-import com.habitrpg.android.habitica.helpers.TaskAlarmManager;
-import com.habitrpg.android.habitica.helpers.UserScope;
-import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel;
-
-import javax.inject.Named;
-
-import dagger.Module;
-import dagger.Provides;
-
-@Module
-public class UserModule {
-    public static final String NAMED_USER_ID = "userId";
-
-    @Provides
-    @UserScope
-    TaskAlarmManager providesTaskAlarmManager(Context context, TaskRepository taskRepository, @Named(NAMED_USER_ID) String userId) {
-        return new TaskAlarmManager(context, taskRepository, userId);
-    }
-
-    @Provides
-    @Named(NAMED_USER_ID)
-    @UserScope
-    public String providesUserID(SharedPreferences sharedPreferences) {
-        if (BuildConfig.DEBUG && !BuildConfig.TEST_USER_ID.isEmpty()) {
-            return BuildConfig.TEST_USER_ID;
-        } else {
-            return sharedPreferences.getString("UserID", "");
-        }
-    }
-
-    @Provides
-    @UserScope
-    MainUserViewModel providesUserViewModel(UserRepository userRepository) {
-        return new MainUserViewModel(userRepository);
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserModule.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserModule.kt
new file mode 100644
index 000000000..24acf248f
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserModule.kt
@@ -0,0 +1,50 @@
+package com.habitrpg.android.habitica.modules
+
+import android.content.Context
+import android.content.SharedPreferences
+import com.habitrpg.android.habitica.BuildConfig
+import com.habitrpg.android.habitica.data.SocialRepository
+import com.habitrpg.android.habitica.data.TaskRepository
+import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.android.habitica.helpers.TaskAlarmManager
+import com.habitrpg.android.habitica.helpers.UserScope
+import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
+import dagger.Module
+import dagger.Provides
+import javax.inject.Named
+
+@Module
+class UserModule {
+    @Provides
+    @UserScope
+    fun providesTaskAlarmManager(
+        context: Context,
+        taskRepository: TaskRepository,
+        @Named(NAMED_USER_ID) userId: String
+    ): TaskAlarmManager {
+        return TaskAlarmManager(context, taskRepository, userId)
+    }
+
+    @Provides
+    @Named(NAMED_USER_ID)
+    @UserScope
+    fun providesUserID(sharedPreferences: SharedPreferences): String {
+        return if (BuildConfig.DEBUG && BuildConfig.TEST_USER_ID.isNotEmpty()) {
+            BuildConfig.TEST_USER_ID
+        } else {
+            sharedPreferences.getString("UserID", "") ?: ""
+        }
+    }
+
+    @Provides
+    @UserScope
+    fun providesUserViewModel(
+        @Named(NAMED_USER_ID) userID: String,
+        userRepository: UserRepository,
+        socialRepository: SocialRepository
+    ) = MainUserViewModel(userID, userRepository, socialRepository)
+
+    companion object {
+        const val NAMED_USER_ID = "userId"
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/LocalNotificationActionReceiver.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/LocalNotificationActionReceiver.kt
index 94c65e650..4ecc891e7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/LocalNotificationActionReceiver.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/LocalNotificationActionReceiver.kt
@@ -14,9 +14,11 @@ import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.data.UserRepository
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.interactors.NotifyUserUseCase
 import com.habitrpg.android.habitica.models.user.User
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class LocalNotificationActionReceiver : BroadcastReceiver() {
@@ -56,30 +58,34 @@ class LocalNotificationActionReceiver : BroadcastReceiver() {
         when (action) {
             context?.getString(R.string.accept_party_invite) -> {
                 groupID?.let {
-                    socialRepository.joinGroup(it).subscribe({ }, RxErrorHandler.handleEmptyError())
+                    MainScope().launch(ExceptionHandler.coroutine()) {
+                        socialRepository.joinGroup(it)
+                    }
                 }
             }
             context?.getString(R.string.reject_party_invite) -> {
                 groupID?.let {
                     socialRepository.rejectGroupInvite(it)
-                        .subscribe({ }, RxErrorHandler.handleEmptyError())
+                        .subscribe({ }, ExceptionHandler.rx())
                 }
             }
             context?.getString(R.string.accept_quest_invite) -> {
-                socialRepository.acceptQuest(user).subscribe({ }, RxErrorHandler.handleEmptyError())
+                socialRepository.acceptQuest(user).subscribe({ }, ExceptionHandler.rx())
             }
             context?.getString(R.string.reject_quest_invite) -> {
-                socialRepository.rejectQuest(user).subscribe({ }, RxErrorHandler.handleEmptyError())
+                socialRepository.rejectQuest(user).subscribe({ }, ExceptionHandler.rx())
             }
             context?.getString(R.string.accept_guild_invite) -> {
                 groupID?.let {
-                    socialRepository.joinGroup(it).subscribe({ }, RxErrorHandler.handleEmptyError())
+                    MainScope().launch(ExceptionHandler.coroutine()) {
+                        socialRepository.joinGroup(it)
+                    }
                 }
             }
             context?.getString(R.string.reject_guild_invite) -> {
                 groupID?.let {
                     socialRepository.rejectGroupInvite(it)
-                        .subscribe({ }, RxErrorHandler.handleEmptyError())
+                        .subscribe({ }, ExceptionHandler.rx())
                 }
             }
             context?.getString(R.string.group_message_reply) -> {
@@ -91,7 +97,7 @@ class LocalNotificationActionReceiver : BroadcastReceiver() {
                                     NotificationManagerCompat.from(c).cancel(it.hashCode())
                                 }
                             },
-                            RxErrorHandler.handleEmptyError()
+                            ExceptionHandler.rx()
                         )
                     }
                 }
@@ -99,23 +105,25 @@ class LocalNotificationActionReceiver : BroadcastReceiver() {
             context?.getString(R.string.inbox_message_reply) -> {
                 senderID?.let {
                     getMessageText(context?.getString(R.string.inbox_message_reply))?.let { message ->
-                        socialRepository.postPrivateMessage(it, message)
-                            .subscribe({ }, RxErrorHandler.handleEmptyError())
+                        MainScope().launch(ExceptionHandler.coroutine()) {
+                            socialRepository.postPrivateMessage(it, message)
+                        }
                     }
                 }
             }
             context?.getString(R.string.complete_task_action) -> {
                 taskID?.let {
-                    taskRepository.taskChecked(null, it, up = true, force = false) {
-                    }.subscribe({
-                        val pair = NotifyUserUseCase.getNotificationAndAddStatsToUserAsText(
-                            it?.experienceDelta,
-                            it?.healthDelta,
-                            it?.goldDelta,
-                            it?.manaDelta
-                        )
-                        showToast(pair.first)
-                    }, RxErrorHandler.handleEmptyError())
+                    MainScope().launch(ExceptionHandler.coroutine()) {
+                        taskRepository.taskChecked(null, it, up = true, force = false) {
+                            val pair = NotifyUserUseCase.getNotificationAndAddStatsToUserAsText(
+                                it.experienceDelta,
+                                it.healthDelta,
+                                it.goldDelta,
+                                it.manaDelta
+                            )
+                            showToast(pair.first)
+                        }
+                    }
                 }
             }
         }
@@ -127,6 +135,8 @@ class LocalNotificationActionReceiver : BroadcastReceiver() {
     }
 
     private fun getMessageText(key: String?): String? {
-        return intent?.let { RemoteInput.getResultsFromIntent(it)?.getCharSequence(key)?.toString() }
+        return intent?.let {
+            RemoteInput.getResultsFromIntent(it)?.getCharSequence(key)?.toString()
+        }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/NotificationPublisher.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/NotificationPublisher.kt
index 42bfe863f..dd0dac59a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/NotificationPublisher.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/NotificationPublisher.kt
@@ -15,7 +15,7 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.extensions.withImmutableFlag
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.TaskAlarmManager
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.models.user.User
@@ -27,7 +27,6 @@ import java.util.Date
 import java.util.Random
 import javax.inject.Inject
 
-@Suppress("DEPRECATION")
 // https://gist.github.com/BrandonSmith/6679223
 class NotificationPublisher : BroadcastReceiver() {
 
@@ -76,7 +75,7 @@ class NotificationPublisher : BroadcastReceiver() {
                         notify(intent, buildNotification(wasInactive, pair.second.authentication?.timestamps?.createdAt))
                     }
                 },
-                RxErrorHandler.handleEmptyError()
+                ExceptionHandler.rx()
             )
         } else {
             notify(intent, buildNotification(wasInactive))
@@ -145,8 +144,7 @@ class NotificationPublisher : BroadcastReceiver() {
 
     private fun getRandomDailyTip(): String {
         val thisContext = context ?: return ""
-        val index = Random().nextInt(4)
-        return when (index) {
+        return when (Random().nextInt(10)) {
             0 -> thisContext.getString(R.string.daily_tip_0)
             1 -> thisContext.getString(R.string.daily_tip_1)
             2 -> thisContext.getString(R.string.daily_tip_2)
@@ -162,7 +160,6 @@ class NotificationPublisher : BroadcastReceiver() {
     }
 
     companion object {
-
         var NOTIFICATION_ID = "notification-id"
         var CHECK_DAILIES = "check-dailies"
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskAlarmBootReceiver.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskAlarmBootReceiver.kt
index a7d527141..cb66c792e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskAlarmBootReceiver.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskAlarmBootReceiver.kt
@@ -5,10 +5,10 @@ import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
 import com.habitrpg.android.habitica.HabiticaBaseApplication
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.TaskAlarmManager
 import com.habitrpg.shared.habitica.HLogger
 import com.habitrpg.shared.habitica.LogLevel
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
 import javax.inject.Inject
@@ -25,7 +25,7 @@ class TaskAlarmBootReceiver : BroadcastReceiver() {
             return
         }
         HabiticaBaseApplication.userComponent?.inject(this)
-        MainScope().launch(Dispatchers.Main) {
+        MainScope().launch(ExceptionHandler.coroutine()) {
             taskAlarmManager.scheduleAllSavedAlarms(sharedPreferences.getBoolean("preventDailyReminder", false))
         }
         HLogger.log(LogLevel.INFO, this::javaClass.name, "onReceive")
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt
index 470bb7ed4..b5dfbebb6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt
@@ -9,18 +9,21 @@ import android.media.RingtoneManager
 import android.os.Build
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
+import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.extensions.withImmutableFlag
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.TaskAlarmManager
 import com.habitrpg.android.habitica.models.tasks.Task
-import com.habitrpg.shared.habitica.models.tasks.TaskType
 import com.habitrpg.android.habitica.ui.activities.MainActivity
 import com.habitrpg.shared.habitica.HLogger
 import com.habitrpg.shared.habitica.LogLevel
-import io.reactivex.rxjava3.functions.Consumer
+import com.habitrpg.shared.habitica.models.tasks.TaskType
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class TaskReceiver : BroadcastReceiver() {
@@ -42,18 +45,13 @@ class TaskReceiver : BroadcastReceiver() {
                 taskAlarmManager.addAlarmForTaskId(taskId)
             }
 
-            taskRepository.getTask(taskId ?: "")
-                .firstElement()
-                .subscribe(
-                    Consumer {
-                        if (it.isUpdatedToday && it.completed) {
-                            return@Consumer
-                        }
-
-                        createNotification(context, it)
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
+            MainScope().launch(ExceptionHandler.coroutine()) {
+                val task = taskRepository.getTask(taskId ?: "").firstOrNull() ?: return@launch
+                if (task.isUpdatedToday && task.completed) {
+                    return@launch
+                }
+                createNotification(context, task)
+            }
         }
     }
 
@@ -67,6 +65,7 @@ class TaskReceiver : BroadcastReceiver() {
 
         var notificationBuilder = NotificationCompat.Builder(context, "default")
             .setSmallIcon(R.drawable.ic_gryphon_white)
+            .setColor(ContextCompat.getColor(context, R.color.brand_300))
             .setContentTitle(task.text)
             .setStyle(
                 NotificationCompat.BigTextStyle()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.kt
index f15bdade5..83839e640 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.kt
@@ -60,7 +60,7 @@ class AvatarWithBarsViewModel(
         binding.avatarView.setAvatar(user)
 
         if (stats.habitClass != null && stats is Stats) {
-            userClass = stats.getTranslatedClassName(context)
+            userClass = stats.getTranslatedClassName(context.resources)
         }
 
         binding.mpBar.visibility = if (stats.habitClass == null || (stats.lvl
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AdventureGuideActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AdventureGuideActivity.kt
index 15b6b6907..55564e5c6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AdventureGuideActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AdventureGuideActivity.kt
@@ -16,8 +16,8 @@ import com.habitrpg.android.habitica.databinding.AdventureGuideItemBinding
 import com.habitrpg.android.habitica.extensions.fromHtml
 import com.habitrpg.android.habitica.helpers.AmplitudeManager
 import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
+import com.habitrpg.common.habitica.extensions.loadImage
 import javax.inject.Inject
 
 class AdventureGuideActivity : BaseActivity() {
@@ -33,7 +33,7 @@ class AdventureGuideActivity : BaseActivity() {
         return R.layout.activity_main
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivityAdventureGuideBinding.inflate(layoutInflater)
         return binding.root
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt
index 3430e6981..c09c999f1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ArmoireActivity.kt
@@ -17,7 +17,8 @@ import com.habitrpg.android.habitica.databinding.ActivityArmoireBinding
 import com.habitrpg.android.habitica.helpers.AdHandler
 import com.habitrpg.android.habitica.helpers.AdType
 import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
+import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.ads.AdButton
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaBottomSheetDialog
@@ -48,7 +49,7 @@ class ArmoireActivity : BaseActivity() {
         component?.inject(this)
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivityArmoireBinding.inflate(layoutInflater)
         return binding.root
     }
@@ -93,7 +94,7 @@ class ArmoireActivity : BaseActivity() {
                             binding.adButton.visibility = View.INVISIBLE
                             hasAnimatedChanges = false
                             gold = null
-                        }, RxErrorHandler.handleEmptyError())
+                        }, ExceptionHandler.rx())
                 )
             }
             handler.prepare {
@@ -116,7 +117,7 @@ class ArmoireActivity : BaseActivity() {
             finish()
         }
         binding.equipButton.setOnClickListener {
-            equipmentKey?.let { it1 -> inventoryRepository.equip("equipped", it1).subscribe({}, RxErrorHandler.handleEmptyError()) }
+            equipmentKey?.let { it1 -> inventoryRepository.equip("equipped", it1).subscribe({}, ExceptionHandler.rx()) }
             finish()
         }
         binding.dropRateButton.setOnClickListener {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt
index 8eac5a2fc..0e63b948f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt
@@ -26,10 +26,9 @@ import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.UserRepository
-import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
 import com.habitrpg.android.habitica.extensions.updateStatusBarColor
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.NotificationsManager
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.interactors.ShowNotificationInteractor
 import com.habitrpg.android.habitica.proxy.AnalyticsManager
 import com.habitrpg.android.habitica.ui.helpers.ToolbarColorHelper
@@ -38,6 +37,7 @@ import com.habitrpg.common.habitica.extensions.getThemeColor
 import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.common.habitica.helpers.LanguageHelper
 import io.reactivex.rxjava3.disposables.CompositeDisposable
+import kotlinx.coroutines.launch
 import java.util.Date
 import java.util.Locale
 import javax.inject.Inject
@@ -60,10 +60,10 @@ abstract class BaseActivity : AppCompatActivity() {
 
     internal var toolbar: Toolbar? = null
 
-    protected abstract fun getLayoutResId(): Int
+    protected abstract fun getLayoutResId(): Int?
 
-    open fun getContentView(): View {
-        return (getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater).inflate(getLayoutResId(), null)
+    open fun getContentView(layoutResId: Int? = getLayoutResId()): View {
+        return (getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater).inflate(layoutResId ?: 0, null)
     }
 
     var compositeSubscription = CompositeDisposable()
@@ -92,18 +92,20 @@ abstract class BaseActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         habiticaApplication
         injectActivity(HabiticaBaseApplication.userComponent)
-        setContentView(getContentView())
+        getLayoutResId()?.let {
+            setContentView(getContentView(it))
+        }
         compositeSubscription = CompositeDisposable()
-        compositeSubscription.add(
-            notificationsManager.displayNotificationEvents.subscribe(
-                {
-                    if (ShowNotificationInteractor(this, lifecycleScope).handleNotification(it)) {
-                        compositeSubscription.add(userRepository.retrieveUser(false, true).subscribeWithErrorHandler {})
+        compositeSubscription.add(notificationsManager.displayNotificationEvents.subscribe(
+            {
+                if (ShowNotificationInteractor(this, lifecycleScope).handleNotification(it)) {
+                    lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                        userRepository.retrieveUser(false, true)
                     }
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+                }
+            },
+            ExceptionHandler.rx()
+        ))
     }
 
     override fun onRestart() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt
index db6cffa9b..9e56e29c7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt
@@ -23,8 +23,8 @@ import com.habitrpg.android.habitica.data.ChallengeRepository
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.databinding.ActivityCreateChallengeBinding
 import com.habitrpg.android.habitica.extensions.addCloseButton
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.social.Challenge
 import com.habitrpg.android.habitica.models.social.Group
 import com.habitrpg.android.habitica.models.tasks.Task
@@ -41,6 +41,7 @@ import com.habitrpg.shared.habitica.models.tasks.TaskType
 import io.reactivex.rxjava3.core.Flowable
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.launch
 import java.util.UUID
 import javax.inject.Inject
@@ -77,7 +78,7 @@ class ChallengeFormActivity : BaseActivity() {
 
     private var savingInProgress = false
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivityCreateChallengeBinding.inflate(layoutInflater)
         return binding.root
     }
@@ -156,7 +157,7 @@ class ChallengeFormActivity : BaseActivity() {
                         { throwable ->
                             dialog?.dismiss()
                             savingInProgress = false
-                            RxErrorHandler.reportError(throwable)
+                            ExceptionHandler.reportError(throwable)
                         }
                     )
             )
@@ -337,36 +338,26 @@ class ChallengeFormActivity : BaseActivity() {
         }
 
         locationAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-        compositeSubscription.add(
-            socialRepository.getUserGroups("guild").zipWith(
-                userRepository.getUserFlowable()
-                    .map { it.party?.id ?: "" }
-                    .distinctUntilChanged()
-                    .flatMap {
-                        if (it.isBlank()) {
-                            return@flatMap Flowable.empty<Group>()
-                        }
-                        socialRepository.retrieveGroup(it)
-                    }
-            ) { user, groups -> Pair(user, groups) }
-                .subscribe(
-                    { groups ->
-                        val mutableGroups = groups.first.toMutableList()
-                        if (groups.first.firstOrNull { it.id == "00000000-0000-4000-A000-000000000000" } == null) {
-                            val tavern = Group()
-                            tavern.id = "00000000-0000-4000-A000-000000000000"
-                            tavern.name = getString(R.string.public_challenge)
-                            mutableGroups.add(0, tavern)
-                        }
-                        if (groups.second != null) {
-                            mutableGroups.add(groups.second)
-                        }
-                        locationAdapter.clear()
-                        locationAdapter.addAll(mutableGroups)
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            val groups = socialRepository.getUserGroups("guild").firstOrNull()?.toMutableList() ?: return@launch
+            val partyID = userRepository.getUser().firstOrNull()?.party?.id
+            val party = if (partyID?.isNotBlank() == true) {
+                socialRepository.retrieveGroup(partyID)
+            } else {
+                null
+            }
+            if (groups.firstOrNull { it.id == "00000000-0000-4000-A000-000000000000" } == null) {
+                val tavern = Group()
+                tavern.id = "00000000-0000-4000-A000-000000000000"
+                tavern.name = getString(R.string.public_challenge)
+                groups.add(0, tavern)
+            }
+            if (party != null) {
+                groups.add(party)
+            }
+            locationAdapter.clear()
+            locationAdapter.addAll(groups)
+        }
 
         binding.challengeLocationSpinner.adapter = locationAdapter
         binding.challengeLocationSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
@@ -399,7 +390,7 @@ class ChallengeFormActivity : BaseActivity() {
                         addReward.text -> openNewTaskActivity(TaskType.REWARD, null)
                     }
                 },
-                RxErrorHandler.handleEmptyError()
+                ExceptionHandler.rx()
             )
         )
 
@@ -438,7 +429,7 @@ class ChallengeFormActivity : BaseActivity() {
                     }
                     checkPrizeAndMinimumForTavern()
                 },
-                RxErrorHandler.handleEmptyError()
+                ExceptionHandler.rx()
             )
             challengeRepository.getChallengeTasks(it).subscribe(
                 { tasks ->
@@ -446,7 +437,7 @@ class ChallengeFormActivity : BaseActivity() {
                         addOrUpdateTaskInList(task, true)
                     }
                 },
-                RxErrorHandler.handleEmptyError()
+                ExceptionHandler.rx()
             )
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
index b84ef5c54..5011641e4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
@@ -8,24 +8,25 @@ import android.view.MenuItem
 import android.view.View
 import android.widget.TextView
 import androidx.core.content.ContextCompat
+import androidx.lifecycle.lifecycleScope
 import androidx.navigation.navArgs
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.databinding.ActivityClassSelectionBinding
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.user.Gear
 import com.habitrpg.android.habitica.models.user.Items
 import com.habitrpg.android.habitica.models.user.Outfit
 import com.habitrpg.android.habitica.models.user.Preferences
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaProgressDialog
-import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import io.reactivex.rxjava3.functions.Consumer
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
-class ClassSelectionActivity : BaseActivity(), Consumer<User> {
+class ClassSelectionActivity : BaseActivity() {
 
     @Inject
     lateinit var userViewModel: MainUserViewModel
@@ -59,7 +60,7 @@ class ClassSelectionActivity : BaseActivity(), Consumer<User> {
         return R.layout.activity_class_selection
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivityClassSelectionBinding.inflate(layoutInflater)
         return binding.root
     }
@@ -85,10 +86,10 @@ class ClassSelectionActivity : BaseActivity(), Consumer<User> {
         }
 
         if (!isInitialSelection) {
-            compositeSubscription.add(
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
                 userRepository.changeClass()
-                    .subscribe({ classWasUnset = true }, RxErrorHandler.handleEmptyError())
-            )
+                classWasUnset
+            }
         }
 
         binding.healerWrapper.setOnClickListener { newClass = "healer" }
@@ -254,20 +255,26 @@ class ClassSelectionActivity : BaseActivity(), Consumer<User> {
     private fun optOutOfClasses() {
         shouldFinish = true
         this.displayProgressDialog(getString(R.string.opting_out_progress))
-        compositeSubscription.add(userRepository.disableClasses().subscribe(this, RxErrorHandler.handleEmptyError()))
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.disableClasses()
+            dismiss()
+        }
     }
 
     private fun selectClass(selectedClass: String) {
         shouldFinish = true
         this.displayProgressDialog(getString(R.string.changing_class_progress))
-        compositeSubscription.add(userRepository.changeClass(selectedClass).subscribe(this, RxErrorHandler.handleEmptyError()))
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.changeClass(selectedClass)
+            dismiss()
+        }
     }
 
     private fun displayProgressDialog(progressText: String) {
         HabiticaProgressDialog.show(this, progressText)
     }
 
-    override fun accept(user: User) {
+    private fun dismiss() {
         if (shouldFinish == true) {
             progressDialog?.dismiss()
             finish()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/DeathActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/DeathActivity.kt
index ae13256f3..4e035a944 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/DeathActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/DeathActivity.kt
@@ -15,12 +15,13 @@ import com.habitrpg.android.habitica.extensions.observeOnce
 import com.habitrpg.android.habitica.helpers.AdHandler
 import com.habitrpg.android.habitica.helpers.AdType
 import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.ads.AdButton
 import com.habitrpg.common.habitica.helpers.Animations
 import com.plattysoft.leonids.ParticleSystem
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class DeathActivity: BaseActivity() {
@@ -39,7 +40,7 @@ class DeathActivity: BaseActivity() {
         component?.inject(this)
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivityDeathBinding.inflate(layoutInflater)
         return binding.root
     }
@@ -59,7 +60,7 @@ class DeathActivity: BaseActivity() {
                 compositeSubscription.add(
                         userRepository.updateUser("stats.hp", 1).subscribe({
                                                                            finish()
-                        }, RxErrorHandler.handleEmptyError())
+                        }, ExceptionHandler.rx())
                 )
             }
             handler.prepare {
@@ -80,9 +81,10 @@ class DeathActivity: BaseActivity() {
 
         binding.restartButton.setOnClickListener {
             binding.restartButton.isEnabled = false
-            userRepository.revive().subscribe({
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                userRepository.revive()
                 finish()
-            }, RxErrorHandler.handleEmptyError())
+            }
         }
         startAnimating()
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FixCharacterValuesActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FixCharacterValuesActivity.kt
index ba36246ca..7a1286c8c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FixCharacterValuesActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FixCharacterValuesActivity.kt
@@ -27,7 +27,7 @@ class FixCharacterValuesActivity : BaseActivity() {
 
     override fun getLayoutResId(): Int = R.layout.activity_fixcharacter
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivityFixcharacterBinding.inflate(layoutInflater)
         return binding.root
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt
index 5b7855516..4b598252a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt
@@ -13,6 +13,7 @@ import android.widget.TableRow
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.core.os.bundleOf
+import androidx.lifecycle.lifecycleScope
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.ApiClient
@@ -20,8 +21,8 @@ import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.databinding.ActivityFullProfileBinding
 import com.habitrpg.android.habitica.extensions.addCancelButton
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.helpers.UserStatComputer
 import com.habitrpg.android.habitica.models.Achievement
 import com.habitrpg.android.habitica.models.inventory.Equipment
@@ -82,7 +83,12 @@ class FullProfileActivity : BaseActivity() {
 
         setTitle(R.string.profile_loading_data)
 
-        compositeSubscription.add(socialRepository.getMember(this.userID).subscribe({ this.updateView(it) }, RxErrorHandler.handleEmptyError()))
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            val member = socialRepository.retrieveMember(userID)
+            if (member != null) {
+                updateView(member)
+            }
+        }
         avatarWithBars = AvatarWithBarsViewModel(this, binding.avatarWithBars)
 
         binding.avatarWithBars.root.setBackgroundColor(ContextCompat.getColor(this, R.color.transparent))
@@ -96,15 +102,13 @@ class FullProfileActivity : BaseActivity() {
         binding.sendMessageButton.setOnClickListener { showSendMessageToUserDialog() }
         binding.giftGemsButton.setOnClickListener { MainNavigationController.navigate(R.id.giftGemsActivity, bundleOf(Pair("userID", userID), Pair("username", null))) }
         binding.giftSubscriptionButton.setOnClickListener { MainNavigationController.navigate(R.id.giftSubscriptionActivity, bundleOf(Pair("userID", userID), Pair("username", null))) }
-        compositeSubscription.add(
-            userRepository.getUserFlowable().subscribe(
-                {
-                    blocks = it.inbox?.blocks ?: listOf()
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.getUser()
+                .collect {
+                    blocks = it?.inbox?.blocks ?: listOf()
                     binding.blockedDisclaimerView.visibility = if (isUserBlocked()) View.VISIBLE else View.GONE
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+                }
+        }
     }
 
     override fun onDestroy() {
@@ -168,13 +172,14 @@ class FullProfileActivity : BaseActivity() {
 
     private fun useBlock() {
         compositeSubscription.add(
-            socialRepository.blockMember(userID).flatMap {
-                userRepository.retrieveUser()
-            }.subscribe(
+            socialRepository.blockMember(userID).subscribe(
                 {
-                    invalidateOptionsMenu()
+                    lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                        userRepository.retrieveUser()
+                        invalidateOptionsMenu()
+                    }
                 },
-                RxErrorHandler.handleEmptyError()
+                ExceptionHandler.rx()
             )
         )
     }
@@ -227,16 +232,16 @@ class FullProfileActivity : BaseActivity() {
 
         avatarWithBars?.updateData(user)
 
-        compositeSubscription.add(loadItemDataByOutfit(user.equipped).subscribe({ gear -> this.gotGear(gear, user) }, RxErrorHandler.handleEmptyError()))
+        compositeSubscription.add(loadItemDataByOutfit(user.equipped).subscribe({ gear -> this.gotGear(gear, user) }, ExceptionHandler.rx()))
 
         if (user.preferences?.costume == true) {
-            compositeSubscription.add(loadItemDataByOutfit(user.costume).subscribe({ this.gotCostume(it) }, RxErrorHandler.handleEmptyError()))
+            compositeSubscription.add(loadItemDataByOutfit(user.costume).subscribe({ this.gotCostume(it) }, ExceptionHandler.rx()))
         } else {
             binding.costumeCard.visibility = View.GONE
         }
 
         // Load the members achievements now
-        compositeSubscription.add(socialRepository.getMemberAchievements(this.userID).subscribe({ this.fillAchievements(it) }, RxErrorHandler.handleEmptyError()))
+        compositeSubscription.add(socialRepository.getMemberAchievements(this.userID).subscribe({ this.fillAchievements(it) }, ExceptionHandler.rx()))
     }
 
     private fun updatePetsMountsView(user: Member) {
@@ -491,7 +496,7 @@ class FullProfileActivity : BaseActivity() {
         return R.layout.activity_full_profile
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivityFullProfileBinding.inflate(layoutInflater)
         return binding.root
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftGemsActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftGemsActivity.kt
index 873598e5e..a894a2d8c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftGemsActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftGemsActivity.kt
@@ -3,6 +3,7 @@ package com.habitrpg.android.habitica.ui.activities
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
 import androidx.navigation.navArgs
 import androidx.viewpager2.adapter.FragmentStateAdapter
 import com.google.android.material.tabs.TabLayoutMediator
@@ -11,12 +12,14 @@ import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.databinding.ActivityGiftGemsBinding
 import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.PurchaseHandler
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.ui.fragments.purchases.GiftBalanceGemsFragment
 import com.habitrpg.android.habitica.ui.fragments.purchases.GiftPurchaseGemsFragment
 import com.habitrpg.android.habitica.ui.views.CurrencyView
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class GiftGemsActivity : PurchaseActivity() {
@@ -46,7 +49,7 @@ class GiftGemsActivity : PurchaseActivity() {
         return R.layout.activity_gift_gems
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivityGiftGemsBinding.inflate(layoutInflater)
         return binding.root
     }
@@ -74,27 +77,17 @@ class GiftGemsActivity : PurchaseActivity() {
 
         setViewPagerAdapter()
 
-        compositeSubscription.add(
-            socialRepository.getMember(giftedUsername ?: giftedUserID).firstElement().subscribe(
-                {
-                    giftedMember = it
-                    giftedUserID = it.id
-                    giftedUsername = it.username
-                    purchaseFragment?.giftedMember = it
-                    balanceFragment?.giftedMember = it
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            val member = socialRepository.retrieveMember(giftedUsername ?: giftedUserID) ?: return@launch
+            giftedMember = member
+            giftedUserID = member.id
+            giftedUsername = member.username
+            purchaseFragment?.giftedMember = member
+            balanceFragment?.giftedMember = member
 
-        compositeSubscription.add(
-            userRepository.getUserFlowable().subscribe(
-                {
-                    currencyView.value = it.gemCount.toDouble()
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+            val user = userRepository.getUser().firstOrNull()
+            currencyView.value = user?.gemCount?.toDouble() ?: 0.0
+        }
     }
 
     private fun setViewPagerAdapter() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftSubscriptionActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftSubscriptionActivity.kt
index 365bbfd12..fc755c822 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftSubscriptionActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftSubscriptionActivity.kt
@@ -3,6 +3,7 @@ package com.habitrpg.android.habitica.ui.activities
 import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.View
+import androidx.lifecycle.lifecycleScope
 import androidx.navigation.navArgs
 import com.android.billingclient.api.SkuDetails
 import com.habitrpg.android.habitica.R
@@ -10,15 +11,15 @@ import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.databinding.ActivityGiftSubscriptionBinding
 import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.PurchaseHandler
 import com.habitrpg.android.habitica.helpers.PurchaseTypes
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
-import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import javax.inject.Inject
 
 class GiftSubscriptionActivity : PurchaseActivity() {
 
@@ -45,7 +46,7 @@ class GiftSubscriptionActivity : PurchaseActivity() {
         component?.inject(this)
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivityGiftSubscriptionBinding.inflate(layoutInflater)
         return binding.root
     }
@@ -70,20 +71,15 @@ class GiftSubscriptionActivity : PurchaseActivity() {
         binding.subscriptionButton.setOnClickListener {
             selectedSubscriptionSku?.let { sku -> purchaseSubscription(sku) }
         }
-
-        compositeSubscription.add(
-            socialRepository.getMember(giftedUsername ?: giftedUserID).subscribe(
-                {
-                    binding.avatarView.setAvatar(it)
-                    binding.displayNameTextView.username = it.profile?.name
-                    binding.displayNameTextView.tier = it.contributor?.level ?: 0
-                    binding.usernameTextView.text = "@${it.username}"
-                    giftedUserID = it.id
-                    giftedUsername = it.username
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            val member = socialRepository.retrieveMember(giftedUsername ?: giftedUserID) ?: return@launch
+            binding.avatarView.setAvatar(member)
+            binding.displayNameTextView.username = member.profile?.name
+            binding.displayNameTextView.tier = member.contributor?.level ?: 0
+            binding.usernameTextView.text = "@${member.username}"
+            giftedUserID = member.id
+            giftedUsername = member.username
+        }
 
         if (appConfigManager.activePromo()?.identifier == "g1g1") {
             binding.giftSubscriptionContainer.visibility = View.VISIBLE
@@ -94,7 +90,7 @@ class GiftSubscriptionActivity : PurchaseActivity() {
 
     override fun onStart() {
         super.onStart()
-        CoroutineScope(Dispatchers.IO).launch {
+        CoroutineScope(Dispatchers.IO).launch(ExceptionHandler.coroutine()) {
             val subscriptions = purchaseHandler.getAllGiftSubscriptionProducts()
             skus = subscriptions
             withContext(Dispatchers.Main) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.kt
index 726cc1a50..3ebc9adc9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.kt
@@ -28,7 +28,7 @@ class GroupFormActivity : BaseActivity() {
         return R.layout.activity_group_form
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivityGroupFormBinding.inflate(layoutInflater)
         return binding.root
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupInviteActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupInviteActivity.kt
index b75dedd99..8ad8fbf1e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupInviteActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupInviteActivity.kt
@@ -38,7 +38,7 @@ class GroupInviteActivity : BaseActivity() {
         return R.layout.activity_party_invite
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivityPartyInviteBinding.inflate(layoutInflater)
         return binding.root
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GuidelinesActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GuidelinesActivity.kt
index 0dd141463..99e4c2e17 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GuidelinesActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GuidelinesActivity.kt
@@ -5,7 +5,7 @@ import android.view.MenuItem
 import android.widget.TextView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.common.habitica.helpers.setMarkdown
 import okhttp3.Call
 import okhttp3.Callback
@@ -31,7 +31,7 @@ class GuidelinesActivity : BaseActivity() {
         val request = Request.Builder().url("https://s3.amazonaws.com/habitica-assets/mobileApp/endpoint/community-guidelines.md").build()
         client.newCall(request).enqueue(object : Callback {
             override fun onFailure(call: Call, e: IOException) {
-                RxErrorHandler.reportError(e)
+                ExceptionHandler.reportError(e)
             }
 
             @Throws(IOException::class)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/HabitButtonWidgetActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/HabitButtonWidgetActivity.kt
index 269cef412..1b7c805a8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/HabitButtonWidgetActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/HabitButtonWidgetActivity.kt
@@ -12,7 +12,7 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.databinding.WidgetConfigureHabitButtonBinding
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.modules.AppModule
 import com.habitrpg.android.habitica.ui.adapter.SkillTasksRecyclerViewAdapter
 import com.habitrpg.android.habitica.widget.HabitButtonWidgetProvider
@@ -42,7 +42,7 @@ class HabitButtonWidgetActivity : BaseActivity() {
         return R.layout.widget_configure_habit_button
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = WidgetConfigureHabitButtonBinding.inflate(layoutInflater)
         return binding.root
     }
@@ -77,11 +77,11 @@ class HabitButtonWidgetActivity : BaseActivity() {
         adapter = SkillTasksRecyclerViewAdapter()
         adapter?.getTaskSelectionEvents()?.subscribe(
             { task -> taskSelected(task.id) },
-            RxErrorHandler.handleEmptyError()
+            ExceptionHandler.rx()
         )?.let { compositeSubscription.add(it) }
         binding.recyclerView.adapter = adapter
 
-        CoroutineScope(Dispatchers.Main + job).launch {
+        CoroutineScope(Dispatchers.Main + job).launch(ExceptionHandler.coroutine()) {
             adapter?.data = taskRepository.getTasks(TaskType.HABIT, userId, emptyArray()).firstOrNull() ?: listOf()
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.kt
index 8f242f2ed..1d1786216 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.kt
@@ -10,14 +10,16 @@ import androidx.core.content.res.ResourcesCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentStatePagerAdapter
+import androidx.lifecycle.lifecycleScope
 import androidx.viewpager.widget.ViewPager
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.ContentRepository
 import com.habitrpg.android.habitica.databinding.ActivityIntroBinding
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.ui.fragments.setup.IntroFragment
 import com.viewpagerindicator.IconPagerAdapter
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class IntroActivity : BaseActivity(), View.OnClickListener, ViewPager.OnPageChangeListener {
@@ -30,7 +32,7 @@ class IntroActivity : BaseActivity(), View.OnClickListener, ViewPager.OnPageChan
         return R.layout.activity_intro
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivityIntroBinding.inflate(layoutInflater)
         return binding.root
     }
@@ -44,7 +46,9 @@ class IntroActivity : BaseActivity(), View.OnClickListener, ViewPager.OnPageChan
         binding.skipButton.setOnClickListener(this)
         binding.finishButton.setOnClickListener(this)
 
-        compositeSubscription.add(contentRepository.retrieveContent().subscribe({ }, RxErrorHandler.handleEmptyError()))
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            contentRepository.retrieveContent()
+        }
 
         window.statusBarColor = ContextCompat.getColor(this, R.color.black_20_alpha)
         window.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt
index 813f1ba2d..e2ec696a9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt
@@ -41,7 +41,7 @@ import com.habitrpg.android.habitica.extensions.addOkButton
 import com.habitrpg.android.habitica.extensions.updateStatusBarColor
 import com.habitrpg.android.habitica.helpers.AmplitudeManager
 import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
 import com.habitrpg.android.habitica.ui.viewmodels.AuthenticationViewModel
@@ -86,7 +86,7 @@ class LoginActivity : BaseActivity() {
                     { handleAuthResponse(it) },
                     {
                         hideProgress()
-                        RxErrorHandler.reportError(it)
+                        ExceptionHandler.reportError(it)
                     }
                 )
         } else {
@@ -101,7 +101,7 @@ class LoginActivity : BaseActivity() {
                 { handleAuthResponse(it) },
                 {
                     hideProgress()
-                    RxErrorHandler.reportError(it)
+                    ExceptionHandler.reportError(it)
                     Log.d("LoginActivity", ": ${it.message}", it)
                 }
             )
@@ -113,7 +113,7 @@ class LoginActivity : BaseActivity() {
         return R.layout.activity_login
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivityLoginBinding.inflate(layoutInflater)
         return binding.root
     }
@@ -261,12 +261,12 @@ class LoginActivity : BaseActivity() {
         } catch (e: Exception) {
             // Wearable API is not available on this device.
         }
-        compositeSubscription.add(
-            userRepository.retrieveUser(true)
-                .subscribe({
-                    handleAuthResponse(it, response.newUser)
-                }, RxErrorHandler.handleEmptyError())
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            val user = userRepository.retrieveUser(true)
+            if (user != null) {
+                handleAuthResponse(user, response.newUser)
+            }
+        }
     }
 
     private fun handleAuthResponse(user: User, isNew: Boolean) {
@@ -276,20 +276,15 @@ class LoginActivity : BaseActivity() {
         if (isRegistering) {
             FirebaseAnalytics.getInstance(this).logEvent("user_registered", null)
         }
-        compositeSubscription.add(
-            userRepository.retrieveUser(withTasks = true, forced = true)
-                .subscribe(
-                    {
-                        if (isNew) {
-                            this.startSetupActivity()
-                        } else {
-                            this.startMainActivity()
-                            AmplitudeManager.sendEvent("login", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT)
-                        }
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.retrieveUser(true, true)
+            if (isNew) {
+                startSetupActivity()
+            } else {
+                startMainActivity()
+                AmplitudeManager.sendEvent("login", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT)
+            }
+        }
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -455,7 +450,7 @@ class LoginActivity : BaseActivity() {
         alertDialog.setMessage(R.string.forgot_password_description)
         alertDialog.setAdditionalContentView(input)
         alertDialog.addButton(R.string.send, true) { _, _ ->
-            userRepository.sendPasswordResetEmail(input.text.toString()).subscribe({ showPasswordEmailConfirmation() }, RxErrorHandler.handleEmptyError())
+            userRepository.sendPasswordResetEmail(input.text.toString()).subscribe({ showPasswordEmailConfirmation() }, ExceptionHandler.rx())
         }
         alertDialog.addCancelButton()
         alertDialog.show()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
index 30f23bcde..64dcf69f2 100755
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
@@ -22,6 +22,7 @@ import androidx.navigation.NavDestination
 import androidx.navigation.findNavController
 import androidx.navigation.fragment.NavHostFragment
 import com.google.android.gms.wearable.Wearable
+import com.google.android.material.composethemeadapter.MdcTheme
 import com.google.firebase.perf.FirebasePerformance
 import com.habitrpg.android.habitica.BuildConfig
 import com.habitrpg.android.habitica.R
@@ -29,7 +30,6 @@ import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.data.TaskRepository
-import com.habitrpg.android.habitica.models.user.UserQuestStatus
 import com.habitrpg.android.habitica.databinding.ActivityMainBinding
 import com.habitrpg.android.habitica.extensions.hideKeyboard
 import com.habitrpg.android.habitica.extensions.observeOnce
@@ -37,20 +37,22 @@ import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
 import com.habitrpg.android.habitica.extensions.updateStatusBarColor
 import com.habitrpg.android.habitica.helpers.AmplitudeManager
 import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.NotificationOpenHandler
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.helpers.SoundManager
 import com.habitrpg.android.habitica.interactors.CheckClassSelectionUseCase
 import com.habitrpg.android.habitica.interactors.DisplayItemDropUseCase
 import com.habitrpg.android.habitica.interactors.NotifyUserUseCase
 import com.habitrpg.android.habitica.models.TutorialStep
 import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.AvatarWithBarsViewModel
+import com.habitrpg.android.habitica.models.user.UserQuestStatus
 import com.habitrpg.android.habitica.ui.TutorialView
 import com.habitrpg.android.habitica.ui.fragments.NavigationDrawerFragment
+import com.habitrpg.android.habitica.ui.theme.HabiticaTheme
 import com.habitrpg.android.habitica.ui.viewmodels.MainActivityViewModel
 import com.habitrpg.android.habitica.ui.viewmodels.NotificationsViewModel
+import com.habitrpg.android.habitica.ui.views.AppHeaderView
 import com.habitrpg.android.habitica.ui.views.SnackbarActivity
 import com.habitrpg.android.habitica.ui.views.dialogs.QuestCompletedDialog
 import com.habitrpg.android.habitica.ui.views.yesterdailies.YesterdailyDialog
@@ -61,12 +63,13 @@ import com.habitrpg.android.habitica.widget.TodoListWidgetProvider
 import com.habitrpg.common.habitica.extensions.dpToPx
 import com.habitrpg.common.habitica.extensions.getThemeColor
 import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
+import com.habitrpg.common.habitica.views.AvatarView
 import com.habitrpg.shared.habitica.models.responses.MaintenanceResponse
 import com.habitrpg.shared.habitica.models.responses.TaskScoringResult
-import com.habitrpg.common.habitica.views.AvatarView
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.launch
 import java.util.Date
 import javax.inject.Inject
@@ -100,7 +103,6 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
     val snackbarContainer: ViewGroup
         get() = binding.content.snackbarContainer
 
-    private var avatarInHeader: AvatarWithBarsViewModel? = null
     val notificationsViewModel: NotificationsViewModel by viewModels()
     val viewModel: MainActivityViewModel by viewModels()
     private var sideAvatarView: AvatarView? = null
@@ -117,7 +119,7 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
         return R.layout.activity_main
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivityMainBinding.inflate(layoutInflater)
         return binding.root
     }
@@ -130,8 +132,8 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
         }
         try {
             launchTrace = FirebasePerformance.getInstance().newTrace("MainActivityLaunch")
-        } catch (e: Exception) {
-            // pass
+        } catch (e: IllegalStateException) {
+            ExceptionHandler.reportError(e)
         }
         launchTrace?.start()
         super.onCreate(savedInstanceState)
@@ -147,7 +149,6 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
 
         setupToolbar(binding.content.toolbar)
 
-        avatarInHeader = AvatarWithBarsViewModel(this, binding.content.avatarWithBars, viewModel.userViewModel)
         sideAvatarView = AvatarView(this, showBackground = true, showMount = false, showPet = false)
 
         viewModel.user.observe(this) {
@@ -210,6 +211,12 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
         supportActionBar?.setHomeButtonEnabled(true)
         setupNotifications()
         setupBottomnavigationLayoutListener()
+        
+        binding.content.headerView.setContent {
+            HabiticaTheme {
+                AppHeaderView(viewModel.userViewModel)
+            }
+        }
 
         viewModel.onCreate()
     }
@@ -275,7 +282,11 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
         return if (binding.root.parent is DrawerLayout && drawerToggle?.onOptionsItemSelected(item) == true) {
             true
         } else if (item.itemId == android.R.id.home) {
-            drawerFragment?.toggleDrawer()
+            if (drawerToggle?.isDrawerIndicatorEnabled == true) {
+                drawerFragment?.toggleDrawer()
+            } else {
+                MainNavigationController.navigateBack()
+            }
             true
         } else super.onOptionsItemSelected(item)
     }
@@ -388,16 +399,13 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
 
             val quest = user.party?.quest
             if (quest?.completed?.isNotBlank() == true) {
-                compositeSubscription.add(
-                    inventoryRepository.getQuestContent(user.party?.quest?.completed ?: "").firstElement().subscribe(
-                        {
-                            QuestCompletedDialog.showWithQuest(this, it)
-
-                            viewModel.updateUser("party.quest.completed", "")
-                        },
-                        RxErrorHandler.handleEmptyError()
-                    )
-                )
+                lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                    val questContent = inventoryRepository.getQuestContent(user.party?.quest?.completed ?: "").firstOrNull()
+                    if (questContent != null) {
+                        QuestCompletedDialog.showWithQuest(this@MainActivity, questContent)
+                    }
+                    viewModel.updateUser("party.quest.completed", "")
+                }
             }
 
             if (user.flags?.welcomed == false) {
@@ -446,14 +454,14 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
                         viewModel.user.value, data.experienceDelta, data.healthDelta, data.goldDelta, data.manaDelta, damageValue, data.hasLeveledUp, data.level
                     )
                 )
-                    .subscribe({ }, RxErrorHandler.handleEmptyError())
+                    .subscribe({ }, ExceptionHandler.rx())
             )
         }
 
         val showItemsFound = userQuestStatus == UserQuestStatus.QUEST_COLLECT
         compositeSubscription.add(
             displayItemDropUseCase.observable(DisplayItemDropUseCase.RequestValues(data, this, snackbarContainer, showItemsFound))
-                .subscribe({ }, RxErrorHandler.handleEmptyError())
+                .subscribe({ }, ExceptionHandler.rx())
         )
     }
 
@@ -512,7 +520,7 @@ open class MainActivity : BaseActivity(), SnackbarActivity {
                             startActivity(intent)
                         }
                     } catch (e: PackageManager.NameNotFoundException) {
-                        RxErrorHandler.reportError(e)
+                        ExceptionHandler.reportError(e)
                     }
                 }
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.kt
index 7bef8b85f..386d8cd5f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.kt
@@ -10,7 +10,7 @@ import com.habitrpg.android.habitica.api.MaintenanceApiService
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.databinding.ActivityMaintenanceBinding
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.common.habitica.helpers.setMarkdown
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.schedulers.Schedulers
@@ -32,7 +32,7 @@ class MaintenanceActivity : BaseActivity() {
         return R.layout.activity_maintenance
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivityMaintenanceBinding.inflate(layoutInflater)
         return binding.root
     }
@@ -76,7 +76,7 @@ class MaintenanceActivity : BaseActivity() {
                                 finish()
                             }
                         },
-                        RxErrorHandler.handleEmptyError()
+                        ExceptionHandler.rx()
                     )
             )
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt
index 95a444322..6ccfc37ea 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt
@@ -13,15 +13,17 @@ import android.widget.RatingBar
 import android.widget.TextView
 import androidx.activity.viewModels
 import androidx.core.content.ContextCompat
+import androidx.lifecycle.lifecycleScope
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.databinding.ActivityNotificationsBinding
 import com.habitrpg.android.habitica.extensions.fromHtml
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import com.habitrpg.common.habitica.models.Notification
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.inventory.QuestContent
+import com.habitrpg.android.habitica.ui.viewmodels.NotificationsViewModel
+import com.habitrpg.common.habitica.models.Notification
 import com.habitrpg.common.habitica.models.notifications.GroupTaskApprovedData
 import com.habitrpg.common.habitica.models.notifications.GroupTaskNeedsWorkData
 import com.habitrpg.common.habitica.models.notifications.GroupTaskRequiresApprovalData
@@ -31,7 +33,8 @@ import com.habitrpg.common.habitica.models.notifications.NewStuffData
 import com.habitrpg.common.habitica.models.notifications.PartyInvitationData
 import com.habitrpg.common.habitica.models.notifications.QuestInvitationData
 import com.habitrpg.common.habitica.models.notifications.UnallocatedPointsData
-import com.habitrpg.android.habitica.ui.viewmodels.NotificationsViewModel
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener {
@@ -48,7 +51,7 @@ class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget
 
     override fun getLayoutResId(): Int = R.layout.activity_notifications
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivityNotificationsBinding.inflate(layoutInflater)
         return binding.root
     }
@@ -68,7 +71,7 @@ class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget
                     this.setNotifications(it)
                     viewModel.markNotificationsAsSeen(it)
                 },
-                RxErrorHandler.handleEmptyError()
+                ExceptionHandler.rx()
             )
         )
 
@@ -90,14 +93,10 @@ class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget
     override fun onRefresh() {
         binding.notificationsRefreshLayout.isRefreshing = true
 
-        compositeSubscription.add(
-            viewModel.refreshNotifications().subscribe(
-                {
-                    binding.notificationsRefreshLayout.isRefreshing = false
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            viewModel.refreshNotifications()
+            binding.notificationsRefreshLayout.isRefreshing = false
+        }
     }
 
     private fun setNotifications(notifications: List<Notification>) {
@@ -314,16 +313,12 @@ class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget
         // hide view until we have loaded quest data and populated the values
         view?.visibility = View.GONE
 
-        compositeSubscription.add(
-            inventoryRepository.getQuestContent(data?.questKey ?: "")
-                .firstElement()
-                .subscribe(
-                    {
-                        updateQuestInvitationView(view, it)
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            val questContent = inventoryRepository.getQuestContent(data?.questKey ?: "").firstOrNull()
+            if (questContent != null) {
+                updateQuestInvitationView(view, questContent)
+            }
+        }
 
         return view
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ReportMessageActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ReportMessageActivity.kt
index dcffeef5a..b08d214da 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ReportMessageActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ReportMessageActivity.kt
@@ -15,7 +15,7 @@ import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.databinding.ActivityReportMessageBinding
 import com.habitrpg.common.habitica.extensions.getThemeColor
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
 import com.habitrpg.common.habitica.helpers.setMarkdown
 import javax.inject.Inject
@@ -41,7 +41,7 @@ class ReportMessageActivity : BaseActivity() {
         component?.inject(this)
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivityReportMessageBinding.inflate(layoutInflater)
         return binding.root
     }
@@ -98,7 +98,7 @@ class ReportMessageActivity : BaseActivity() {
                 .doOnError { isReporting = false }
                 .subscribe(
                     { finish() },
-                    RxErrorHandler.handleEmptyError()
+                    ExceptionHandler.rx()
                 )
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt
index c692bb219..7f078676c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt
@@ -14,23 +14,25 @@ import androidx.core.content.edit
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentPagerAdapter
+import androidx.lifecycle.lifecycleScope
 import androidx.preference.PreferenceManager
 import androidx.viewpager.widget.ViewPager
 import com.habitrpg.android.habitica.R
-import com.habitrpg.common.habitica.api.HostConfig
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.databinding.ActivitySetupBinding
 import com.habitrpg.android.habitica.helpers.AmplitudeManager
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.fragments.setup.AvatarSetupFragment
 import com.habitrpg.android.habitica.ui.fragments.setup.TaskSetupFragment
 import com.habitrpg.android.habitica.ui.fragments.setup.WelcomeFragment
+import com.habitrpg.common.habitica.api.HostConfig
 import com.viewpagerindicator.IconPagerAdapter
 import io.reactivex.rxjava3.core.BackpressureStrategy
+import kotlinx.coroutines.launch
 import java.util.Calendar
 import java.util.Locale
 import javax.inject.Inject
@@ -62,15 +64,19 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
         return R.layout.activity_setup
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivitySetupBinding.inflate(layoutInflater)
         return binding.root
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        compositeSubscription.add(userRepository.getUserFlowable().subscribe({ this.onUserReceived(it) }, RxErrorHandler.handleEmptyError()))
-        compositeSubscription.add(userRepository.retrieveUser().subscribe({}, RxErrorHandler.handleEmptyError()))
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.getUser().collect { onUserReceived(it) }
+        }
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.retrieveUser(true, true)
+        }
         val additionalData = HashMap<String, Any>()
         additionalData["status"] = "displayed"
         AmplitudeManager.sendEvent("setup", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData)
@@ -80,7 +86,7 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
             if (language == currentDeviceLanguage) {
                 compositeSubscription.add(
                     apiClient.registrationLanguage(currentDeviceLanguage)
-                        .subscribe({ }, RxErrorHandler.handleEmptyError())
+                        .subscribe({ }, ExceptionHandler.rx())
                 )
             }
         }
@@ -135,7 +141,7 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
             this.completedSetup = true
             createdTasks = true
             newTasks?.let {
-                this.taskRepository.createTasks(it).subscribe({ onUserReceived(user) }, RxErrorHandler.handleEmptyError())
+                this.taskRepository.createTasks(it).subscribe({ onUserReceived(user) }, ExceptionHandler.rx())
             }
         } else if (binding.viewPager.currentItem == 0) {
 
@@ -211,7 +217,7 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
                         }
                         startMainActivity()
                     },
-                    RxErrorHandler.handleEmptyError()
+                    ExceptionHandler.rx()
                 )
             )
             return
@@ -235,7 +241,7 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
         compositeSubscription.add(
             userRepository.updateUser("profile.name", displayName)
                 .flatMap { userRepository.updateLoginName(username).toFlowable() }
-                .subscribe({ }, RxErrorHandler.handleEmptyError())
+                .subscribe({ }, ExceptionHandler.rx())
         )
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillMemberActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillMemberActivity.kt
index 83dc310d1..dc4a75519 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillMemberActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillMemberActivity.kt
@@ -10,9 +10,12 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.databinding.ActivitySkillMembersBinding
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.ui.adapter.social.PartyMemberRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -33,7 +36,7 @@ class SkillMemberActivity : BaseActivity() {
         component?.inject(this)
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivitySkillMembersBinding.inflate(layoutInflater)
         return binding.root
     }
@@ -54,16 +57,16 @@ class SkillMemberActivity : BaseActivity() {
                 setResult(Activity.RESULT_OK, resultIntent)
                 finish()
             },
-            RxErrorHandler.handleEmptyError()
+            ExceptionHandler.rx()
         )?.let { compositeSubscription.add(it) }
         binding.recyclerView.adapter = viewAdapter
 
-        val user = userViewModel.user.value
-        lifecycleScope.launch {
-            socialRepository.getGroupMembers(user?.party?.id ?: "")
-                .collect {
-                    viewAdapter?.data = it
-                }
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.getUser()
+                .map { it?.party?.id }
+                .filterNotNull()
+                .flatMapLatest { socialRepository.getPartyMembers(it) }
+                .collect { viewAdapter?.data = it }
         }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.kt
index 013153777..10c8a9062 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.kt
@@ -13,7 +13,7 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.databinding.ActivitySkillTasksBinding
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.shared.habitica.models.tasks.TaskType
 import com.habitrpg.android.habitica.modules.AppModule
@@ -41,7 +41,7 @@ class SkillTasksActivity : BaseActivity() {
         loadTaskLists()
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivitySkillTasksBinding.inflate(layoutInflater)
         return binding.root
     }
@@ -60,7 +60,7 @@ class SkillTasksActivity : BaseActivity() {
                     1 -> TaskType.DAILY
                     else -> TaskType.TODO
                 }
-                compositeSubscription.add(fragment.getTaskSelectionEvents().subscribe({ task -> taskSelected(task) }, RxErrorHandler.handleEmptyError()))
+                compositeSubscription.add(fragment.getTaskSelectionEvents().subscribe({ task -> taskSelected(task) }, ExceptionHandler.rx()))
                 viewFragmentsDictionary.put(position, fragment)
                 return fragment
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
index 42e13b8b6..a00a30eeb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
@@ -22,6 +22,7 @@ import androidx.core.os.bundleOf
 import androidx.core.view.children
 import androidx.core.view.forEachIndexed
 import androidx.core.widget.NestedScrollView
+import androidx.lifecycle.lifecycleScope
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.ChallengeRepository
@@ -30,7 +31,7 @@ import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.databinding.ActivityTaskFormBinding
 import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher
 import com.habitrpg.android.habitica.extensions.addCancelButton
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.TaskAlarmManager
 import com.habitrpg.android.habitica.models.Tag
 import com.habitrpg.android.habitica.models.social.Challenge
@@ -45,6 +46,8 @@ import com.habitrpg.shared.habitica.models.tasks.Frequency
 import com.habitrpg.shared.habitica.models.tasks.HabitResetOption
 import com.habitrpg.shared.habitica.models.tasks.TaskType
 import io.realm.RealmList
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.launch
 import java.util.Date
 import javax.inject.Inject
 
@@ -100,7 +103,7 @@ class TaskFormActivity : BaseActivity() {
         return R.layout.activity_task_form
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivityTaskFormBinding.inflate(layoutInflater)
         return binding.root
     }
@@ -160,7 +163,7 @@ class TaskFormActivity : BaseActivity() {
                         tags = it
                         setTagViews()
                     },
-                    RxErrorHandler.handleEmptyError()
+                    ExceptionHandler.rx()
                 )
         )
         userViewModel.user.observe(this) {
@@ -198,36 +201,32 @@ class TaskFormActivity : BaseActivity() {
         when {
             taskId != null -> {
                 isCreating = false
-                compositeSubscription.add(
-                    taskRepository.getUnmanagedTask(taskId).firstElement().subscribe(
-                        {
-                            if (!it.isValid) return@subscribe
-                            task = it
-                            initialTaskInstance = it
-                            // tintColor = ContextCompat.getColor(this, it.mediumTaskColor)
-                            fillForm(it)
-                            it.challengeID?.let { challengeID ->
-                                compositeSubscription.add(
-                                    challengeRepository.retrieveChallenge(challengeID)
-                                        .subscribe(
-                                            { challenge ->
-                                                this.challenge = challenge
-                                                binding.challengeNameView.text = getString(R.string.challenge_task_name, challenge.name)
-                                                binding.challengeNameView.visibility = View.VISIBLE
-                                                disableEditingForUneditableFieldsInChallengeTask()
-                                            },
-                                            RxErrorHandler.handleEmptyError()
-                                        )
+                lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                    val task = taskRepository.getUnmanagedTask(taskId).firstOrNull() ?: return@launch
+                    if (!task.isValid) return@launch
+                    this@TaskFormActivity.task = task
+                    initialTaskInstance = task
+                    // tintColor = ContextCompat.getColor(this, it.mediumTaskColor)
+                    fillForm(task)
+                    task.challengeID?.let { challengeID ->
+                        compositeSubscription.add(
+                            challengeRepository.retrieveChallenge(challengeID)
+                                .subscribe(
+                                    { challenge ->
+                                        this@TaskFormActivity.challenge = challenge
+                                        binding.challengeNameView.text = getString(R.string.challenge_task_name, challenge.name)
+                                        binding.challengeNameView.visibility = View.VISIBLE
+                                        disableEditingForUneditableFieldsInChallengeTask()
+                                    },
+                                    ExceptionHandler.rx()
                                 )
-                            }
-                        },
-                        RxErrorHandler.handleEmptyError()
-                    )
-                )
+                        )
+                    }
+                }
             }
             bundle.containsKey(PARCELABLE_TASK) -> {
                 isCreating = false
-                task = bundle.getParcelable(PARCELABLE_TASK)
+                task = bundle.getParcelable(PARCELABLE_TASK, Task::class.java)
                 task?.let { fillForm(it) }
             }
             else -> {
@@ -542,16 +541,13 @@ class TaskFormActivity : BaseActivity() {
         resultIntent.putExtra(TASK_TYPE_KEY, taskType.value)
         if (!isChallengeTask) {
             if (isCreating) {
-                if (isDiscardCancelled) {
-                    analyticsManager.logEvent("back_to_task", bundleOf(Pair("is_creating", isCreating)))
-                }
                 taskRepository.createTaskInBackground(thisTask)
             } else {
-                if (isDiscardCancelled) {
-                    analyticsManager.logEvent("back_to_task", bundleOf(Pair("is_creating", isCreating)))
-                }
                 taskRepository.updateTaskInBackground(thisTask)
             }
+            if (isDiscardCancelled) {
+                analyticsManager.logEvent("back_to_task", bundleOf(Pair("is_creating", isCreating)))
+            }
 
             if (thisTask.type == TaskType.DAILY || thisTask.type == TaskType.TODO) {
                 taskAlarmManager.scheduleAlarmsForTask(thisTask)
@@ -582,7 +578,7 @@ class TaskFormActivity : BaseActivity() {
         alert.setTitle(R.string.are_you_sure)
         alert.addButton(R.string.delete_task, true) { _, _ ->
             if (task?.isValid != true) return@addButton
-            task?.id?.let { taskRepository.deleteTask(it).subscribe({ }, RxErrorHandler.handleEmptyError()) }
+            task?.id?.let { taskRepository.deleteTask(it).subscribe({ }, ExceptionHandler.rx()) }
             finish()
         }
         alert.addCancelButton()
@@ -602,12 +598,14 @@ class TaskFormActivity : BaseActivity() {
                             compositeSubscription.add(
                                 challengeRepository.leaveChallenge(it, "keep-all")
                                     .flatMap { taskRepository.deleteTask(task?.id ?: "") }
-                                    .flatMap { userRepository.retrieveUser(true, true) }
                                     .subscribe(
                                         {
+                                            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                                                userRepository.retrieveUser(true, true)
+                                            }
                                             finish()
                                         },
-                                        RxErrorHandler.handleEmptyError()
+                                        ExceptionHandler.rx()
                                     )
                             )
                         }
@@ -616,12 +614,14 @@ class TaskFormActivity : BaseActivity() {
                         challenge?.let {
                             compositeSubscription.add(
                                 challengeRepository.leaveChallenge(it, "remove-all")
-                                    .flatMap { userRepository.retrieveUser(true, true) }
                                     .subscribe(
                                         {
+                                            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                                                userRepository.retrieveUser(true, true)
+                                            }
                                             finish()
                                         },
-                                        RxErrorHandler.handleEmptyError()
+                                        ExceptionHandler.rx()
                                     )
                             )
                         }
@@ -629,7 +629,7 @@ class TaskFormActivity : BaseActivity() {
                     alert.setExtraCloseButtonVisibility(View.VISIBLE)
                     alert.show()
                 },
-                RxErrorHandler.handleEmptyError()
+                ExceptionHandler.rx()
             )
         )
     }
@@ -648,28 +648,32 @@ class TaskFormActivity : BaseActivity() {
                     dialog.setMessage(this.getString(R.string.broken_challenge_description, taskCount))
                     dialog.addButton(this.getString(R.string.keep_x_tasks, taskCount), true) { _, _ ->
                         taskRepository.unlinkAllTasks(task.challengeID, "keep-all")
-                            .flatMap { userRepository.retrieveUser(true, true) }
                             .subscribe(
-                                {
-                                    finish()
-                                },
-                                RxErrorHandler.handleEmptyError()
-                            )
+                            {
+                                lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                                    userRepository.retrieveUser(true, true)
+                                }
+                                finish()
+                            },
+                            ExceptionHandler.rx()
+                        )
                     }
                     dialog.addButton(this.getString(R.string.delete_x_tasks, taskCount), false, true) { _, _ ->
                         taskRepository.unlinkAllTasks(task.challengeID, "remove-all")
-                            .flatMap { userRepository.retrieveUser(true, true) }
                             .subscribe(
-                                {
-                                    finish()
-                                },
-                                RxErrorHandler.handleEmptyError()
-                            )
+                            {
+                                lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                                    userRepository.retrieveUser(true, true)
+                                }
+                                finish()
+                            },
+                            ExceptionHandler.rx()
+                        )
                     }
                     dialog.setExtraCloseButtonVisibility(View.VISIBLE)
                     dialog.show()
                 },
-                RxErrorHandler.handleEmptyError()
+                ExceptionHandler.rx()
             )
         )
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskSummaryActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskSummaryActivity.kt
new file mode 100644
index 000000000..0e53ac81f
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskSummaryActivity.kt
@@ -0,0 +1,58 @@
+package com.habitrpg.android.habitica.ui.activities
+
+import android.os.Bundle
+import androidx.activity.compose.setContent
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.lifecycle.asLiveData
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.components.UserComponent
+import com.habitrpg.android.habitica.data.TaskRepository
+import com.habitrpg.android.habitica.ui.viewmodels.BaseViewModel
+import javax.inject.Inject
+
+class TaskSummaryViewModel(val taskId: String) : BaseViewModel() {
+    @Inject
+    lateinit var taskRespository: TaskRepository
+    val task = taskRespository.getTask(taskId).asLiveData()
+
+    override fun inject(component: UserComponent) {
+        component.inject(this)
+    }
+}
+
+class TaskSummaryActivity: BaseActivity() {
+    override fun getLayoutResId(): Int? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContent {
+
+        }
+    }
+
+    override fun injectActivity(component: UserComponent?) {
+        component?.inject(this)
+    }
+}
+
+@Composable
+fun TaskSummaryView(viewModel: TaskSummaryViewModel) {
+    val task by viewModel.task.observeAsState()
+    Column {
+        Text(stringResource(R.string.task_summary), Modifier)
+    }
+}
+
+@Preview
+@Composable
+private fun TaskSummaryViewPreview() {
+    TaskSummaryView(TaskSummaryViewModel(""))
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/VerifyUsernameActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/VerifyUsernameActivity.kt
index 1e9845793..fde4b03c7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/VerifyUsernameActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/VerifyUsernameActivity.kt
@@ -6,17 +6,20 @@ import android.os.Bundle
 import android.text.method.LinkMovementMethod
 import android.view.View
 import androidx.core.content.ContextCompat
+import androidx.lifecycle.lifecycleScope
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.databinding.ActivityVerifyUsernameBinding
 import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher
 import com.habitrpg.android.habitica.extensions.runDelayed
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import io.reactivex.rxjava3.core.BackpressureStrategy
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.subjects.PublishSubject
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.launch
 import java.util.concurrent.TimeUnit
 
 class VerifyUsernameActivity : BaseActivity() {
@@ -36,7 +39,7 @@ class VerifyUsernameActivity : BaseActivity() {
         return R.layout.activity_verify_username
     }
 
-    override fun getContentView(): View {
+    override fun getContentView(layoutResId: Int?): View {
         binding = ActivityVerifyUsernameBinding.inflate(layoutInflater)
         return binding.root
     }
@@ -90,25 +93,23 @@ class VerifyUsernameActivity : BaseActivity() {
                             binding.issuesTextView.visibility = View.VISIBLE
                             binding.issuesTextView.text = it.issues.joinToString("\n")
                         }
-                    },
-                { displayNameUsable, usernameUsable -> displayNameUsable && usernameUsable.isUsable }
-            )
+                    }
+            ) { displayNameUsable, usernameUsable -> displayNameUsable && usernameUsable.isUsable }
                 .subscribe(
                     {
                         binding.confirmUsernameButton.isEnabled = it
                     },
-                    RxErrorHandler.handleEmptyError()
+                    ExceptionHandler.rx()
                 )
         )
 
-        compositeSubscription.add(
-            userRepository.getUserFlowable().firstElement().subscribe {
-                binding.displayNameEditText.setText(it.profile?.name)
-                displayNameVerificationEvents.onNext(it.profile?.name ?: "")
-                binding.usernameEditText.setText(it.authentication?.localAuthentication?.username)
-                usernameVerificationEvents.onNext(it.username ?: "")
-            }
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            val user = userRepository.getUser().firstOrNull()
+            binding.displayNameEditText.setText(user?.profile?.name)
+            displayNameVerificationEvents.onNext(user?.profile?.name ?: "")
+            binding.usernameEditText.setText(user?.authentication?.localAuthentication?.username)
+            usernameVerificationEvents.onNext(user?.username ?: "")
+        }
     }
 
     private fun confirmNames() {
@@ -118,7 +119,7 @@ class VerifyUsernameActivity : BaseActivity() {
                 .flatMap { userRepository.updateLoginName(binding.usernameEditText.text.toString()).toFlowable() }
                 .doOnComplete { showConfirmationAndFinish() }
                 .doOnEach { binding.confirmUsernameButton.isClickable = true }
-                .subscribe({ }, RxErrorHandler.handleEmptyError())
+                .subscribe({ }, ExceptionHandler.rx())
         )
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/NavigationDrawerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/NavigationDrawerAdapter.kt
index f961d9f07..23e19efff 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/NavigationDrawerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/NavigationDrawerAdapter.kt
@@ -4,19 +4,16 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.core.content.ContextCompat
-import androidx.core.os.bundleOf
 import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.R
-import com.habitrpg.common.habitica.extensions.dpToPx
 import com.habitrpg.android.habitica.extensions.inflate
-import com.habitrpg.android.habitica.models.TeamPlan
 import com.habitrpg.android.habitica.models.promotions.HabiticaPromotion
-import com.habitrpg.android.habitica.ui.fragments.NavigationDrawerFragment
 import com.habitrpg.android.habitica.ui.menu.HabiticaDrawerItem
 import com.habitrpg.android.habitica.ui.views.promo.PromoMenuView
 import com.habitrpg.android.habitica.ui.views.promo.PromoMenuViewHolder
 import com.habitrpg.android.habitica.ui.views.promo.SubscriptionBuyGemsPromoView
 import com.habitrpg.android.habitica.ui.views.promo.SubscriptionBuyGemsPromoViewHolder
+import com.habitrpg.common.habitica.extensions.dpToPx
 import io.reactivex.rxjava3.core.BackpressureStrategy
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.subjects.PublishSubject
@@ -77,32 +74,6 @@ class NavigationDrawerAdapter(tintColor: Int, backgroundTintColor: Int) : Recycl
         notifyDataSetChanged()
     }
 
-    fun setTeams(teams: List<TeamPlan>) {
-        var teamHeaderIndex = -1
-        var nextHeaderIndex = -1
-        for ((index, item) in items.withIndex()) {
-            if (teamHeaderIndex != -1 && item.isHeader) {
-                nextHeaderIndex = index
-                break
-            } else if (item.identifier == NavigationDrawerFragment.SIDEBAR_TEAMS) {
-                teamHeaderIndex = index
-            }
-        }
-        if (teamHeaderIndex != -1 && nextHeaderIndex != -1) {
-            for (x in nextHeaderIndex - 1 downTo teamHeaderIndex + 1) {
-                items.removeAt(x)
-                notifyItemRemoved(x)
-            }
-            for ((index, team) in teams.withIndex()) {
-                val item = HabiticaDrawerItem(R.id.tasksFragment, team.id, team.summary)
-                item.bundle = bundleOf(Pair("ownerID", team.id))
-                val newIndex = teamHeaderIndex + index + 1
-                items.add(newIndex, item)
-                notifyItemInserted(newIndex)
-            }
-        }
-    }
-
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
         val drawerItem = getItem(position)
         when {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/InboxAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/InboxAdapter.kt
index bfa0fe6f5..f9db46083 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/InboxAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/InboxAdapter.kt
@@ -15,7 +15,7 @@ import io.reactivex.rxjava3.core.BackpressureStrategy
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.subjects.PublishSubject
 
-class InboxAdapter(private var user: User?, private var replyToUser: Member) : PagedListAdapter<ChatMessage, ChatRecyclerViewHolder>(DIFF_CALLBACK) {
+class InboxAdapter(private var user: User?, private var replyToUser: Member?) : PagedListAdapter<ChatMessage, ChatRecyclerViewHolder>(DIFF_CALLBACK) {
     private val FIRST_MESSAGE = 0
     private val NORMAL_MESSAGE = 1
 
@@ -43,7 +43,7 @@ class InboxAdapter(private var user: User?, private var replyToUser: Member) : P
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ChatRecyclerViewHolder {
-        return if (viewType == FIRST_MESSAGE) ChatRecyclerIntroViewHolder(parent.inflate(R.layout.tavern_chat_intro_item), replyToUser.id!!)
+        return if (viewType == FIRST_MESSAGE) ChatRecyclerIntroViewHolder(parent.inflate(R.layout.tavern_chat_intro_item), replyToUser?.id ?: "")
         else ChatRecyclerMessageViewHolder(parent.inflate(R.layout.chat_item), user?.id ?: "", false)
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengeTasksRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengeTasksRecyclerViewAdapter.kt
index 9e5a8dca9..b399fd74e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengeTasksRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengeTasksRecyclerViewAdapter.kt
@@ -8,7 +8,6 @@ import android.widget.TextView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.models.tasks.Task
-import com.habitrpg.shared.habitica.models.tasks.TaskType
 import com.habitrpg.android.habitica.ui.adapter.tasks.BaseTasksRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.viewHolders.BindableViewHolder
 import com.habitrpg.android.habitica.ui.viewHolders.tasks.BaseTaskViewHolder
@@ -17,6 +16,7 @@ import com.habitrpg.android.habitica.ui.viewHolders.tasks.HabitViewHolder
 import com.habitrpg.android.habitica.ui.viewHolders.tasks.RewardViewHolder
 import com.habitrpg.android.habitica.ui.viewHolders.tasks.TodoViewHolder
 import com.habitrpg.android.habitica.ui.viewmodels.TasksViewModel
+import com.habitrpg.shared.habitica.models.tasks.TaskType
 import io.reactivex.rxjava3.core.BackpressureStrategy
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.subjects.PublishSubject
@@ -69,18 +69,18 @@ class ChallengeTasksRecyclerViewAdapter(
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BindableViewHolder<Task> {
         val viewHolder: BindableViewHolder<Task> = when (viewType) {
-            TYPE_HABIT -> HabitViewHolder(getContentView(parent, R.layout.habit_item_card), { _, _ -> }, { }) { task ->
+            TYPE_HABIT -> HabitViewHolder(getContentView(parent, R.layout.habit_item_card), { _, _ -> }, { }, { task ->
                 taskOpenEventsSubject.onNext(task)
-            }
-            TYPE_DAILY -> DailyViewHolder(getContentView(parent, R.layout.daily_item_card), { _, _ -> }, { _, _ -> }, { }) { task ->
+            }, null)
+            TYPE_DAILY -> DailyViewHolder(getContentView(parent, R.layout.daily_item_card), { _, _ -> }, { _, _ -> }, { }, { task ->
                 taskOpenEventsSubject.onNext(task)
-            }
-            TYPE_TODO -> TodoViewHolder(getContentView(parent, R.layout.todo_item_card), { _, _ -> }, { _, _ -> }, { }) { task ->
+            }, null)
+            TYPE_TODO -> TodoViewHolder(getContentView(parent, R.layout.todo_item_card), { _, _ -> }, { _, _ -> }, { }, { task ->
                 taskOpenEventsSubject.onNext(task)
-            }
-            TYPE_REWARD -> RewardViewHolder(getContentView(parent, R.layout.reward_item_card), { _, _ -> }, { }) { task ->
+            }, null)
+            TYPE_REWARD -> RewardViewHolder(getContentView(parent, R.layout.reward_item_card), { _, _ -> }, { }, { task ->
                 taskOpenEventsSubject.onNext(task)
-            }
+            }, null)
             TYPE_ADD_ITEM -> AddItemViewHolder(getContentView(parent, R.layout.challenge_add_task_item), addItemSubject)
             else -> DividerViewHolder(getContentView(parent, R.layout.challenge_task_divider))
         }
@@ -124,7 +124,11 @@ class ChallengeTasksRecyclerViewAdapter(
             addBtn.setOnClickListener { newTask?.let { callback.onNext(it) } }
         }
 
-        override fun bind(data: Task, position: Int, displayMode: String) {
+        override fun bind(
+            data: Task,
+            position: Int,
+            displayMode: String
+        ) {
             this.newTask = data
             addBtn.text = data.text
         }
@@ -134,7 +138,11 @@ class ChallengeTasksRecyclerViewAdapter(
 
         private val dividerName: TextView = itemView.findViewById(R.id.divider_name)
 
-        override fun bind(data: Task, position: Int, displayMode: String) {
+        override fun bind(
+            data: Task,
+            position: Int,
+            displayMode: String
+        ) {
             dividerName.text = data.text
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/DailiesRecyclerViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/DailiesRecyclerViewHolder.kt
index b645979aa..4dde8bfa9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/DailiesRecyclerViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/DailiesRecyclerViewHolder.kt
@@ -15,11 +15,10 @@ class DailiesRecyclerViewHolder(layoutResource: Int, viewModel: TasksViewModel)
                 {
                         task ->
                     taskOpenEventsSubject.onNext(task)
-                }
-            ) {
+                }, {
                     task ->
                 brokenTaskEventsSubject.onNext(task)
-            }
+            }, viewModel)
         } else {
             super.onCreateViewHolder(parent, viewType)
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/HabitsRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/HabitsRecyclerViewAdapter.kt
index f207c107e..f61beed69 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/HabitsRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/HabitsRecyclerViewAdapter.kt
@@ -14,11 +14,10 @@ class HabitsRecyclerViewAdapter(layoutResource: Int, viewModel: TasksViewModel)
                 {
                         task ->
                     taskOpenEventsSubject.onNext(task)
-                }
-            ) {
-                    task ->
-                brokenTaskEventsSubject.onNext(task)
-            }
+                }, {
+                        task ->
+                    brokenTaskEventsSubject.onNext(task)
+                }, viewModel)
         } else {
             super.onCreateViewHolder(parent, viewType)
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt
index 014c7ec48..801e10a1c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt
@@ -27,9 +27,8 @@ import io.realm.OrderedRealmCollection
 
 abstract class RealmBaseTasksRecyclerViewAdapter(
     private val layoutResource: Int,
-    private val viewModel: TasksViewModel
+    val viewModel: TasksViewModel
 ) : BaseRecyclerViewAdapter<Task, RecyclerView.ViewHolder>(), TaskRecyclerViewAdapter {
-    override var canScoreTasks = true
     private var unfilteredData: List<Task>? = null
     override var showAdventureGuide = false
         set(value) {
@@ -80,8 +79,9 @@ abstract class RealmBaseTasksRecyclerViewAdapter(
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
         val item = getItem(position)
         if (item != null && holder is BaseTaskViewHolder) {
-            holder.isLocked = !canScoreTasks
-            holder.bind(item, position, taskDisplayMode)
+            holder.userID = user?.id
+            holder.isLocked = !viewModel.canScoreTask(item)
+            holder.bind(item, position, taskDisplayMode, viewModel.ownerID.value)
             holder.errorButtonClicked = Action {
                 errorButtonEventsSubject.onNext("")
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.kt
index 222d0a0a0..cdd5ee55f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.kt
@@ -5,7 +5,6 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.R
-import com.habitrpg.shared.habitica.models.responses.TaskDirection
 import com.habitrpg.android.habitica.models.shops.ShopItem
 import com.habitrpg.android.habitica.models.tasks.ChecklistItem
 import com.habitrpg.android.habitica.models.tasks.Task
@@ -13,13 +12,16 @@ import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.viewHolders.ShopItemViewHolder
 import com.habitrpg.android.habitica.ui.viewHolders.tasks.RewardViewHolder
+import com.habitrpg.android.habitica.ui.viewmodels.TasksViewModel
+import com.habitrpg.shared.habitica.models.responses.TaskDirection
 import io.reactivex.rxjava3.core.BackpressureStrategy
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.subjects.PublishSubject
 
 class RewardsRecyclerViewAdapter(
     private var customRewards: List<Task>?,
-    private val layoutResource: Int
+    private val layoutResource: Int,
+    val viewModel: TasksViewModel
 ) : BaseRecyclerViewAdapter<Task, RecyclerView.ViewHolder>(), TaskRecyclerViewAdapter {
     override var user: User? = null
         set(value) {
@@ -30,7 +32,6 @@ class RewardsRecyclerViewAdapter(
             notifyDataSetChanged()
         }
     override var showAdventureGuide: Boolean = false
-    override var canScoreTasks = true
     private var inAppRewards: List<ShopItem>? = null
 
     private val errorButtonEventsSubject: PublishSubject<String> = PublishSubject.create()
@@ -80,8 +81,10 @@ class RewardsRecyclerViewAdapter(
                         taskScoreEventsSubject.onNext(Pair(task, direction))
                     }
                 },
-                { task -> taskOpenEventsSubject.onNext(task) }
-            ) { task -> brokenTaskEventsSubject.onNext(task) }
+                { task -> taskOpenEventsSubject.onNext(task) }, {
+                        task ->
+                    brokenTaskEventsSubject.onNext(task)
+                }, viewModel)
         } else {
             val viewHolder = ShopItemViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.row_shopitem, parent, false))
             viewHolder.purchaseCardAction = { purchaseCardSubject.onNext(it) }
@@ -93,8 +96,8 @@ class RewardsRecyclerViewAdapter(
         if (customRewards != null && position < customRewardCount) {
             val reward = customRewards?.get(position) ?: return
             val gold = user?.stats?.gp ?: 0.0
-            (holder as? RewardViewHolder)?.isLocked = !canScoreTasks
-            (holder as? RewardViewHolder)?.bind(reward, position, reward.value <= gold, taskDisplayMode)
+            (holder as? RewardViewHolder)?.isLocked = !viewModel.canScoreTask(reward)
+            (holder as? RewardViewHolder)?.bind(reward, position, reward.value <= gold, taskDisplayMode, viewModel.ownerID.value)
         } else if (inAppRewards != null) {
             val item = inAppRewards?.get(position - customRewardCount) ?: return
             if (holder is ShopItemViewHolder) {
@@ -119,7 +122,9 @@ class RewardsRecyclerViewAdapter(
 
     override fun getItemCount(): Int {
         var rewardCount = customRewardCount
-        rewardCount += inAppRewardCount
+        if (viewModel.isPersonalBoard) {
+            rewardCount += inAppRewardCount
+        }
         return rewardCount
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/TaskRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/TaskRecyclerViewAdapter.kt
index 2f38295b6..73e650fa3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/TaskRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/TaskRecyclerViewAdapter.kt
@@ -1,16 +1,15 @@
 package com.habitrpg.android.habitica.ui.adapter.tasks
 
 import android.view.View
-import com.habitrpg.shared.habitica.models.responses.TaskDirection
 import com.habitrpg.android.habitica.models.tasks.ChecklistItem
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.shared.habitica.models.responses.TaskDirection
 import io.reactivex.rxjava3.core.Flowable
 
 interface TaskRecyclerViewAdapter {
     var user: User?
     var showAdventureGuide: Boolean
-    var canScoreTasks: Boolean
     var data: List<Task>
 
     val errorButtonEvents: Flowable<String>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/TodosRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/TodosRecyclerViewAdapter.kt
index dbebdd259..5be12d9b6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/TodosRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/TodosRecyclerViewAdapter.kt
@@ -15,11 +15,10 @@ class TodosRecyclerViewAdapter(layoutResource: Int, viewModel: TasksViewModel) :
                 {
                         task ->
                     taskOpenEventsSubject.onNext(task)
-                }
-            ) {
-                    task ->
-                brokenTaskEventsSubject.onNext(task)
-            }
+                }, {
+                        task ->
+                    brokenTaskEventsSubject.onNext(task)
+                }, viewModel)
         } else {
             super.onCreateViewHolder(parent, viewType)
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AchievementsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AchievementsFragment.kt
index c74df6041..215f9ebfe 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AchievementsFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AchievementsFragment.kt
@@ -16,7 +16,7 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.ui.adapter.AchievementsAdapter
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import kotlinx.coroutines.flow.combine
@@ -93,7 +93,7 @@ class AchievementsFragment : BaseMainFragment<FragmentRefreshRecyclerviewBinding
 
         binding?.refreshLayout?.setOnRefreshListener(this)
 
-        lifecycleScope.launch {
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
             userRepository.getAchievements().combine(userRepository.getQuestAchievements()) { achievements, questAchievements ->
                 return@combine Pair(achievements, questAchievements)
             }.combine(userRepository.getQuestAchievements()
@@ -171,7 +171,7 @@ class AchievementsFragment : BaseMainFragment<FragmentRefreshRecyclerviewBinding
             userRepository.retrieveAchievements().subscribe(
                 {
                 },
-                RxErrorHandler.handleEmptyError(), { binding?.refreshLayout?.isRefreshing = false }
+                ExceptionHandler.rx(), { binding?.refreshLayout?.isRefreshing = false }
             )
         )
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseDialogFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseDialogFragment.kt
index 451d9bc88..ea999af44 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseDialogFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseDialogFragment.kt
@@ -10,7 +10,7 @@ import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.TutorialRepository
 import com.habitrpg.android.habitica.helpers.AmplitudeManager
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.ui.activities.MainActivity
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.disposables.CompositeDisposable
@@ -80,7 +80,7 @@ abstract class BaseDialogFragment<VB : ViewBinding> : BottomSheetDialogFragment(
                                     mainActivity.displayTutorialStep(step, tutorialTexts, tutorialCanBeDeferred)
                                 }
                             },
-                            RxErrorHandler.handleEmptyError()
+                            ExceptionHandler.rx()
                         )
                 )
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.kt
index cdf345a05..5a39ddbb4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.kt
@@ -9,7 +9,7 @@ import androidx.viewbinding.ViewBinding
 import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.TutorialRepository
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.proxy.AnalyticsManager
 import com.habitrpg.android.habitica.ui.activities.MainActivity
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
@@ -84,7 +84,7 @@ abstract class BaseFragment<VB : ViewBinding> : Fragment() {
                                 mainActivity.displayTutorialStep(step, tutorialTexts, tutorialCanBeDeferred)
                             }
                         },
-                        RxErrorHandler.handleEmptyError()
+                        ExceptionHandler.rx()
                     )
             )
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.kt
index 18a67721d..9ee6475fb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.kt
@@ -118,11 +118,11 @@ abstract class BaseMainFragment<VB : ViewBinding> : BaseFragment<VB>() {
     }
 
     private fun hideToolbar() {
-        activity?.binding?.content?.avatarWithBars?.root?.visibility = View.GONE
+        activity?.binding?.content?.headerView?.visibility = View.GONE
     }
 
     private fun showToolbar() {
-        activity?.binding?.content?.avatarWithBars?.root?.visibility = View.VISIBLE
+        activity?.binding?.content?.headerView?.visibility = View.VISIBLE
     }
 
     private fun disableToolbarScrolling() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt
index 1660fe34f..8759207e8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt
@@ -31,8 +31,8 @@ import com.habitrpg.android.habitica.extensions.getRemainingString
 import com.habitrpg.android.habitica.extensions.getShortRemainingString
 import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
 import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.WorldStateEvent
 import com.habitrpg.android.habitica.models.inventory.Item
 import com.habitrpg.android.habitica.models.promotions.HabiticaPromotion
@@ -52,7 +52,6 @@ import io.reactivex.rxjava3.disposables.CompositeDisposable
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.launch
 import java.util.Calendar
 import java.util.Date
@@ -140,7 +139,7 @@ class NavigationDrawerFragment : DialogFragment() {
                 {
                     setSelection(it.transitionId, it.bundle, true)
                 },
-                RxErrorHandler.handleEmptyError()
+                ExceptionHandler.rx()
             )
         )
         subscriptions?.add(
@@ -151,7 +150,7 @@ class NavigationDrawerFragment : DialogFragment() {
                     }
                     updatePromo()
                 },
-                RxErrorHandler.handleEmptyError()
+                ExceptionHandler.rx()
             )
         )
 
@@ -172,23 +171,10 @@ class NavigationDrawerFragment : DialogFragment() {
                         updateSeasonalMenuEntries(gearEvent, pair.second)
                     }
                 },
-                RxErrorHandler.handleEmptyError()
+                ExceptionHandler.rx()
             )
         )
 
-        if (configManager.enableTeamBoards()) {
-            lifecycleScope.launch {
-                userRepository.getTeamPlans()
-                    .distinctUntilChanged()
-                    .collect {
-                        getItemWithIdentifier(SIDEBAR_TEAMS)?.isVisible = it.isNotEmpty()
-                        adapter.setTeams(it)
-                    }
-            }
-        } else {
-            getItemWithIdentifier(SIDEBAR_TEAMS)?.isVisible = false
-        }
-
         userViewModel.user.observe(viewLifecycleOwner) {
             if (it != null) {
                 updateUser(it)
@@ -356,9 +342,7 @@ class NavigationDrawerFragment : DialogFragment() {
             items.add(HabiticaDrawerItem(R.id.statsFragment, SIDEBAR_STATS, context.getString(R.string.sidebar_stats)))
             items.add(HabiticaDrawerItem(R.id.achievementsFragment, SIDEBAR_ACHIEVEMENTS, context.getString(R.string.sidebar_achievements)))
 
-            items.add(HabiticaDrawerItem(0, SIDEBAR_TEAMS, context.getString(R.string.sidebar_teams), true))
-
-            items.add(HabiticaDrawerItem(0, SIDEBAR_INVENTORY, context.getString(R.string.sidebar_shops), true))
+            items.add(HabiticaDrawerItem(0, SIDEBAR_INVENTORY, context.getString(R.string.sidebar_shops), isHeader = true))
             items.add(HabiticaDrawerItem(R.id.marketFragment, SIDEBAR_SHOPS_MARKET, context.getString(R.string.market)))
             items.add(HabiticaDrawerItem(R.id.questShopFragment, SIDEBAR_SHOPS_QUEST, context.getString(R.string.questShop)))
             val seasonalShopEntry = HabiticaDrawerItem(R.id.seasonalShopFragment, SIDEBAR_SHOPS_SEASONAL, context.getString(R.string.seasonalShop))
@@ -366,21 +350,20 @@ class NavigationDrawerFragment : DialogFragment() {
             items.add(seasonalShopEntry)
             items.add(HabiticaDrawerItem(R.id.timeTravelersShopFragment, SIDEBAR_SHOPS_TIMETRAVEL, context.getString(R.string.timeTravelers)))
 
-            items.add(HabiticaDrawerItem(0, SIDEBAR_INVENTORY, context.getString(R.string.sidebar_section_inventory), true))
+            items.add(HabiticaDrawerItem(0, SIDEBAR_INVENTORY, context.getString(R.string.sidebar_section_inventory), isHeader = true))
+            items.add(HabiticaDrawerItem(R.id.avatarOverviewFragment, SIDEBAR_AVATAR, context.getString(R.string.sidebar_avatar_equipment)))
             items.add(HabiticaDrawerItem(R.id.itemsFragment, SIDEBAR_ITEMS, context.getString(R.string.sidebar_items)))
-            items.add(HabiticaDrawerItem(R.id.equipmentOverviewFragment, SIDEBAR_EQUIPMENT, context.getString(R.string.sidebar_equipment)))
             items.add(HabiticaDrawerItem(R.id.stableFragment, SIDEBAR_STABLE, context.getString(R.string.sidebar_stable)))
-            items.add(HabiticaDrawerItem(R.id.avatarOverviewFragment, SIDEBAR_AVATAR, context.getString(R.string.sidebar_avatar)))
             items.add(HabiticaDrawerItem(R.id.gemPurchaseActivity, SIDEBAR_GEMS, context.getString(R.string.sidebar_gems)))
             items.add(HabiticaDrawerItem(R.id.subscriptionPurchaseActivity, SIDEBAR_SUBSCRIPTION, context.getString(R.string.sidebar_subscription)))
 
-            items.add(HabiticaDrawerItem(0, SIDEBAR_SOCIAL, context.getString(R.string.sidebar_section_social), true))
+            items.add(HabiticaDrawerItem(0, SIDEBAR_SOCIAL, context.getString(R.string.sidebar_section_social), isHeader = true))
             items.add(HabiticaDrawerItem(R.id.partyFragment, SIDEBAR_PARTY, context.getString(R.string.sidebar_party)))
             items.add(HabiticaDrawerItem(R.id.tavernFragment, SIDEBAR_TAVERN, context.getString(R.string.sidebar_tavern)))
             items.add(HabiticaDrawerItem(R.id.guildOverviewFragment, SIDEBAR_GUILDS, context.getString(R.string.sidebar_guilds)))
             items.add(HabiticaDrawerItem(R.id.challengesOverviewFragment, SIDEBAR_CHALLENGES, context.getString(R.string.sidebar_challenges)))
 
-            items.add(HabiticaDrawerItem(0, SIDEBAR_ABOUT_HEADER, context.getString(R.string.sidebar_about), true))
+            items.add(HabiticaDrawerItem(0, SIDEBAR_ABOUT_HEADER, context.getString(R.string.sidebar_about), isHeader = true))
             items.add(HabiticaDrawerItem(R.id.newsFragment, SIDEBAR_NEWS, context.getString(R.string.sidebar_news)))
             items.add(HabiticaDrawerItem(R.id.supportMainFragment, SIDEBAR_HELP, context.getString(R.string.sidebar_help)))
             items.add(HabiticaDrawerItem(R.id.aboutFragment, SIDEBAR_ABOUT, context.getString(R.string.sidebar_about)))
@@ -635,7 +618,6 @@ class NavigationDrawerFragment : DialogFragment() {
         const val SIDEBAR_SKILLS = "skills"
         const val SIDEBAR_STATS = "stats"
         const val SIDEBAR_ACHIEVEMENTS = "achievements"
-        const val SIDEBAR_TEAMS = "teams"
         const val SIDEBAR_SOCIAL = "social"
         const val SIDEBAR_TAVERN = "tavern"
         const val SIDEBAR_PARTY = "party"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NewsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NewsFragment.kt
index 71d6db932..748d9c160 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NewsFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NewsFragment.kt
@@ -6,11 +6,14 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.webkit.WebChromeClient
-import com.habitrpg.android.habitica.BuildConfig
+import android.webkit.WebResourceRequest
+import android.webkit.WebView
+import android.webkit.WebViewClient
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.databinding.FragmentNewsBinding
 import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
+import com.habitrpg.android.habitica.helpers.MainNavigationController
 
 class NewsFragment : BaseMainFragment<FragmentNewsBinding>() {
 
@@ -29,13 +32,38 @@ class NewsFragment : BaseMainFragment<FragmentNewsBinding>() {
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 
+    private val webviewClient = object : WebViewClient() {
+
+        override fun shouldOverrideUrlLoading(view: WebView?, url: String?): Boolean {
+            if (url?.contains("/static/new-stuff") == true) {
+                view?.loadUrl(url)
+            } else if (url != null) {
+                    MainNavigationController.navigate(url)
+            }
+            return true
+        }
+
+        override fun shouldOverrideUrlLoading(
+            view: WebView?,
+            request: WebResourceRequest?
+        ): Boolean {
+            if (request?.url?.path == "/static/new-stuff") {
+                view?.loadUrl(request.url.toString())
+            } else {
+                request?.url?.let { MainNavigationController.navigate(it) }
+            }
+            return true
+        }
+    }
+
     @SuppressLint("SetJavaScriptEnabled")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        val address = if (BuildConfig.DEBUG) BuildConfig.BASE_URL else context?.getString(R.string.base_url)
+        val address = context?.getString(R.string.base_url)
         val webSettings = binding?.newsWebview?.settings
         webSettings?.javaScriptEnabled = true
         webSettings?.domStorageEnabled = true
+        binding?.newsWebview?.webViewClient = webviewClient
         binding?.newsWebview?.webChromeClient = object : WebChromeClient() {
         }
         binding?.newsWebview?.loadUrl("$address/static/new-stuff")
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt
index 045c5218a..237fbc1b8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt
@@ -13,7 +13,7 @@ import com.habitrpg.android.habitica.databinding.FragmentStatsBinding
 import com.habitrpg.android.habitica.extensions.addOkButton
 import com.habitrpg.common.habitica.extensions.getThemeColor
 import com.habitrpg.android.habitica.extensions.setScaledPadding
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.UserStatComputer
 import com.habitrpg.shared.habitica.models.tasks.Attribute
 import com.habitrpg.android.habitica.models.user.Stats
@@ -132,7 +132,7 @@ class StatsFragment : BaseMainFragment<FragmentStatsBinding>() {
 
         binding?.automaticAllocationSwitch?.setOnCheckedChangeListener { _, isChecked ->
             userRepository.updateUser("preferences.automaticAllocation", isChecked)
-                .subscribe({}, RxErrorHandler.handleEmptyError())
+                .subscribe({}, ExceptionHandler.rx())
         }
 
         binding?.strengthStatsView?.allocateAction = { allocatePoint(Attribute.STRENGTH) }
@@ -163,7 +163,7 @@ class StatsFragment : BaseMainFragment<FragmentStatsBinding>() {
             userRepository.updateUser(
                 "preferences.allocationMode",
                 allocationMode
-            ).subscribe({}, RxErrorHandler.handleEmptyError())
+            ).subscribe({}, ExceptionHandler.rx())
         )
         binding?.distributeEvenlyButton?.isChecked = allocationMode == Stats.AUTO_ALLOCATE_FLAT
         binding?.distributeClassButton?.isChecked = allocationMode == Stats.AUTO_ALLOCATE_CLASSBASED
@@ -179,7 +179,7 @@ class StatsFragment : BaseMainFragment<FragmentStatsBinding>() {
 
     private fun allocatePoint(stat: Attribute) {
         compositeSubscription.add(
-            userRepository.allocatePoint(stat).subscribe({ }, RxErrorHandler.handleEmptyError())
+            userRepository.allocatePoint(stat).subscribe({ }, ExceptionHandler.rx())
         )
     }
 
@@ -326,7 +326,7 @@ class StatsFragment : BaseMainFragment<FragmentStatsBinding>() {
                         binding?.constitutionStatsView?.equipmentValue = constitution
                         binding?.perceptionStatsView?.equipmentValue = perception
                     },
-                    RxErrorHandler.handleEmptyError()
+                    ExceptionHandler.rx()
                 )
         )
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt
index 36f2569ce..46aeedfca 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt
@@ -12,6 +12,7 @@ import android.view.ViewGroup
 import android.widget.CheckBox
 import androidx.core.content.ContextCompat
 import androidx.core.view.doOnLayout
+import androidx.lifecycle.lifecycleScope
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.google.android.flexbox.AlignItems
 import com.google.android.flexbox.FlexDirection.ROW
@@ -24,7 +25,7 @@ import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.databinding.BottomSheetBackgroundsFilterBinding
 import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding
 import com.habitrpg.android.habitica.extensions.setTintWith
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.CustomizationFilter
 import com.habitrpg.android.habitica.models.inventory.Customization
 import com.habitrpg.android.habitica.models.user.OwnedCustomization
@@ -41,6 +42,7 @@ import io.reactivex.rxjava3.core.BackpressureStrategy
 import io.reactivex.rxjava3.kotlin.combineLatest
 import io.reactivex.rxjava3.subjects.BehaviorSubject
 import io.reactivex.rxjava3.subjects.PublishSubject
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class AvatarCustomizationFragment :
@@ -81,22 +83,19 @@ class AvatarCustomizationFragment :
             adapter.getSelectCustomizationEvents()
                 .flatMap { customization ->
                     if (customization.type == "background") {
-                        val using = if (customization.identifier?.isBlank() != false) {
-                            customization.unlockPath + activeCustomization
-                        } else customization.unlockPath
-                        userRepository.unlockPath(using, 0)
-                            .flatMap { userRepository.retrieveUser(false, true, true) }
+                        userRepository.unlockPath(customization)
+                            //TODO: .flatMap { userRepository.retrieveUser(false, true, true) }
                     } else {
                         userRepository.useCustomization(customization.type ?: "", customization.category, customization.identifier ?: "")
                     }
                 }
-                .subscribe({ }, RxErrorHandler.handleEmptyError())
+                .subscribe({ }, ExceptionHandler.rx())
         )
 
         compositeSubscription.add(
             this.inventoryRepository.getInAppRewards()
                 .map { rewards -> rewards.map { it.key } }
-                .subscribe({ adapter.setPinnedItemKeys(it) }, RxErrorHandler.handleEmptyError())
+                .subscribe({ adapter.setPinnedItemKeys(it) }, ExceptionHandler.rx())
         )
 
         return super.onCreateView(inflater, container, savedInstanceState)
@@ -212,12 +211,12 @@ class AvatarCustomizationFragment :
                             )
                         }
                     },
-                    RxErrorHandler.handleEmptyError()
+                    ExceptionHandler.rx()
                 )
         )
         if (type == "hair" && (category == "beard" || category == "mustache")) {
             val otherCategory = if (category == "mustache") "beard" else "mustache"
-            compositeSubscription.add(customizationRepository.getCustomizations(type, otherCategory, true).subscribe({ adapter.additionalSetItems = it }, RxErrorHandler.handleEmptyError()))
+            compositeSubscription.add(customizationRepository.getCustomizations(type, otherCategory, true).subscribe({ adapter.additionalSetItems = it }, ExceptionHandler.rx()))
         }
     }
 
@@ -228,7 +227,7 @@ class AvatarCustomizationFragment :
     ): Boolean {
         return if (filter.onlyPurchased && ownedCustomizations.find { it.key == customization.identifier } == null) {
             true
-        } else filter.months.isNotEmpty() && !filter.months.contains(customization.customizationSetName?.substringAfter('.'))
+        } else filter.months.isNotEmpty() && !filter.months.contains(customization.customizationSet?.substringAfter('.'))
     }
 
     fun updateUser(user: User?) {
@@ -270,14 +269,10 @@ class AvatarCustomizationFragment :
     }
 
     override fun onRefresh() {
-        compositeSubscription.add(
-            userRepository.retrieveUser(withTasks = false, forced = true).subscribe(
-                {
-                    binding?.refreshLayout?.isRefreshing = false
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.retrieveUser(true, true)
+            binding?.refreshLayout?.isRefreshing = false
+        }
     }
 
     fun showFilterDialog() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarEquipmentFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarEquipmentFragment.kt
deleted file mode 100644
index b1ced47f0..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarEquipmentFragment.kt
+++ /dev/null
@@ -1,160 +0,0 @@
-package com.habitrpg.android.habitica.ui.fragments.inventory.customization
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.components.UserComponent
-import com.habitrpg.android.habitica.data.InventoryRepository
-import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import com.habitrpg.android.habitica.models.responses.UnlockResponse
-import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.ui.adapter.CustomizationEquipmentRecyclerViewAdapter
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import com.habitrpg.android.habitica.ui.helpers.MarginDecoration
-import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
-import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
-import io.reactivex.rxjava3.core.Flowable
-import javax.inject.Inject
-
-class AvatarEquipmentFragment :
-    BaseMainFragment<FragmentRefreshRecyclerviewBinding>(),
-    SwipeRefreshLayout.OnRefreshListener {
-
-    @Inject
-    lateinit var inventoryRepository: InventoryRepository
-    @Inject
-    lateinit var userViewModel: MainUserViewModel
-
-    override var binding: FragmentRefreshRecyclerviewBinding? = null
-
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentRefreshRecyclerviewBinding {
-        return FragmentRefreshRecyclerviewBinding.inflate(inflater, container, false)
-    }
-
-    var type: String? = null
-    var category: String? = null
-    private var activeEquipment: String? = null
-
-    internal var adapter: CustomizationEquipmentRecyclerViewAdapter = CustomizationEquipmentRecyclerViewAdapter()
-    internal var layoutManager: GridLayoutManager = GridLayoutManager(activity, 2)
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        showsBackButton = true
-        compositeSubscription.add(
-            adapter.getSelectCustomizationEvents()
-                .flatMap { equipment ->
-                    val key = (if (equipment.key?.isNotBlank() != true) activeEquipment else equipment.key) ?: ""
-                    inventoryRepository.equip(if (userViewModel.user.value?.preferences?.costume == true) "costume" else "equipped", key)
-                }
-                .subscribe({ }, RxErrorHandler.handleEmptyError())
-        )
-        compositeSubscription.add(
-            adapter.getUnlockCustomizationEvents()
-                .flatMap<UnlockResponse> {
-                    Flowable.empty()
-                }
-                .subscribe({ }, RxErrorHandler.handleEmptyError())
-        )
-        return super.onCreateView(inflater, container, savedInstanceState)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        showsBackButton = true
-        super.onViewCreated(view, savedInstanceState)
-        arguments?.let {
-            val args = AvatarEquipmentFragmentArgs.fromBundle(it)
-            type = args.type
-            if (args.category.isNotEmpty()) {
-                category = args.category
-            }
-        }
-        binding?.refreshLayout?.setOnRefreshListener(this)
-        setGridSpanCount(view.width)
-        val layoutManager = GridLayoutManager(activity, 4)
-        layoutManager.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
-            override fun getSpanSize(position: Int): Int {
-                return if (adapter.getItemViewType(position) == 0) {
-                    layoutManager.spanCount
-                } else {
-                    1
-                }
-            }
-        }
-        binding?.recyclerView?.layoutManager = layoutManager
-        binding?.recyclerView?.addItemDecoration(MarginDecoration(context))
-
-        binding?.recyclerView?.adapter = adapter
-        binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
-        this.loadEquipment()
-
-        userViewModel.user.observe(viewLifecycleOwner) { updateUser(it) }
-    }
-
-    override fun injectFragment(component: UserComponent) {
-        component.inject(this)
-    }
-
-    private fun loadEquipment() {
-        val type = this.type ?: return
-        compositeSubscription.add(
-            inventoryRepository.getEquipmentType(type, category ?: "").subscribe(
-                {
-                    adapter.setEquipment(it)
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
-    }
-
-    private fun setGridSpanCount(width: Int) {
-        val itemWidth = context?.resources?.getDimension(R.dimen.customization_width) ?: 0F
-        var spanCount = (width / itemWidth).toInt()
-        if (spanCount == 0) {
-            spanCount = 1
-        }
-        layoutManager.spanCount = spanCount
-    }
-
-    fun updateUser(user: User?) {
-        this.updateActiveCustomization(user)
-        this.adapter.gemBalance = user?.gemCount ?: 0
-        adapter.notifyDataSetChanged()
-    }
-
-    private fun updateActiveCustomization(user: User?) {
-        if (this.type == null || user?.preferences == null) {
-            return
-        }
-        val outfit = if (user.preferences?.costume == true) user.items?.gear?.costume else user.items?.gear?.equipped
-        val activeEquipment = when (this.type) {
-            "headAccessory" -> outfit?.headAccessory
-            "back" -> outfit?.back
-            "eyewear" -> outfit?.eyeWear
-            else -> ""
-        }
-        if (activeEquipment != null) {
-            this.activeEquipment = activeEquipment
-            this.adapter.activeEquipment = activeEquipment
-        }
-    }
-
-    override fun onRefresh() {
-        compositeSubscription.add(
-            userRepository.retrieveUser(false, true).subscribe(
-                {
-                    binding?.refreshLayout?.isRefreshing = false
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt
index bd88ff5fe..0b0e62358 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt
@@ -5,46 +5,68 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.AdapterView
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.Switch
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.ViewCompositionStrategy
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
-import com.habitrpg.android.habitica.databinding.FragmentAvatarOverviewBinding
+import com.habitrpg.android.habitica.databinding.FragmentComposeScrollingBinding
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
+import com.habitrpg.android.habitica.ui.theme.HabiticaTheme
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
+import com.habitrpg.android.habitica.ui.views.AvatarCustomizationOverviewView
+import com.habitrpg.android.habitica.ui.views.EquipmentOverviewView
+import com.habitrpg.android.habitica.ui.views.SegmentedControl
 import javax.inject.Inject
 
-class AvatarOverviewFragment : BaseMainFragment<FragmentAvatarOverviewBinding>(), AdapterView.OnItemSelectedListener {
+class AvatarOverviewFragment : BaseMainFragment<FragmentComposeScrollingBinding>(),
+    AdapterView.OnItemSelectedListener {
 
     @Inject
     lateinit var userViewModel: MainUserViewModel
 
-    override var binding: FragmentAvatarOverviewBinding? = null
+    override var binding: FragmentComposeScrollingBinding? = null
 
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentAvatarOverviewBinding {
-        return FragmentAvatarOverviewBinding.inflate(inflater, container, false)
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?
+    ): FragmentComposeScrollingBinding {
+        return FragmentComposeScrollingBinding.inflate(inflater, container, false)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding?.avatarSizeSpinner?.onItemSelectedListener = this
-
-        binding?.avatarShirtView?.setOnClickListener { displayCustomizationFragment("shirt", null) }
-        binding?.avatarSkinView?.setOnClickListener { displayCustomizationFragment("skin", null) }
-        binding?.avatarChairView?.setOnClickListener { displayCustomizationFragment("chair", null) }
-        binding?.avatarGlassesView?.setOnClickListener { displayEquipmentFragment("eyewear", "glasses") }
-        binding?.avatarAnimalEarsView?.setOnClickListener { displayEquipmentFragment("headAccessory", "animal") }
-        binding?.avatarAnimalTailView?.setOnClickListener { displayEquipmentFragment("back", "animal") }
-        binding?.avatarHeadbandView?.setOnClickListener { displayEquipmentFragment("headAccessory", "headband") }
-        binding?.avatarHairColorView?.setOnClickListener { displayCustomizationFragment("hair", "color") }
-        binding?.avatarHairBangsView?.setOnClickListener { displayCustomizationFragment("hair", "bangs") }
-        binding?.avatarHairBaseView?.setOnClickListener { displayCustomizationFragment("hair", "base") }
-        binding?.avatarAccentView?.setOnClickListener { displayCustomizationFragment("hair", "flower") }
-        binding?.avatarHairBeardView?.setOnClickListener { displayCustomizationFragment("hair", "beard") }
-        binding?.avatarHairMustacheView?.setOnClickListener { displayCustomizationFragment("hair", "mustache") }
-        binding?.avatarBackgroundView?.setOnClickListener { displayCustomizationFragment("background", null) }
-
-        userViewModel.user.observe(viewLifecycleOwner) { updateUser(it) }
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        val view = super.onCreateView(inflater, container, savedInstanceState)
+        binding?.composeView?.apply {
+            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
+            setContent {
+                HabiticaTheme {
+                    AvatarOverviewView(userViewModel, { type, category ->
+                        displayCustomizationFragment(type, category)
+                    }, { type, equipped, isCostume ->
+                        displayEquipmentFragment(type, equipped, isCostume)
+                    })
+                }
+            }
+        }
+        return view
     }
 
     override fun injectFragment(component: UserComponent) {
@@ -52,46 +74,16 @@ class AvatarOverviewFragment : BaseMainFragment<FragmentAvatarOverviewBinding>()
     }
 
     private fun displayCustomizationFragment(type: String, category: String?) {
-        MainNavigationController.navigate(AvatarOverviewFragmentDirections.openAvatarDetail(type, category ?: ""))
+        MainNavigationController.navigate(
+            AvatarOverviewFragmentDirections.openAvatarDetail(
+                type,
+                category ?: ""
+            )
+        )
     }
 
-    private fun displayEquipmentFragment(type: String, category: String?) {
-        MainNavigationController.navigate(AvatarOverviewFragmentDirections.openAvatarEquipment(type, category ?: ""))
-    }
-
-    fun updateUser(user: User?) {
-        this.setSize(user?.preferences?.size)
-        setCustomizations(user)
-    }
-
-    private fun setCustomizations(user: User?) {
-        if (user == null) return
-        binding?.avatarShirtView?.customizationIdentifier = user.preferences?.size + "_shirt_" + user.preferences?.shirt
-        binding?.avatarSkinView?.customizationIdentifier = "skin_" + user.preferences?.skin
-        val chair = user.preferences?.chair
-        binding?.avatarChairView?.customizationIdentifier = if (chair?.startsWith("handleless") == true) "chair_$chair" else chair
-        binding?.avatarGlassesView?.equipmentIdentifier = user.equipped?.eyeWear
-        binding?.avatarAnimalEarsView?.equipmentIdentifier = user.equipped?.headAccessory
-        binding?.avatarHeadbandView?.equipmentIdentifier = user.equipped?.headAccessory
-        binding?.avatarAnimalTailView?.equipmentIdentifier = user.equipped?.back
-        binding?.avatarHairColorView?.customizationIdentifier = if (user.preferences?.hair?.color != null && user.preferences?.hair?.color != "") "hair_bangs_1_" + user.preferences?.hair?.color else ""
-        binding?.avatarHairBangsView?.customizationIdentifier = if (user.preferences?.hair?.bangs != null && user.preferences?.hair?.bangs != 0) "hair_bangs_" + user.preferences?.hair?.bangs + "_" + user.preferences?.hair?.color else ""
-        binding?.avatarHairBaseView?.customizationIdentifier = if (user.preferences?.hair?.base != null && user.preferences?.hair?.base != 0) "hair_base_" + user.preferences?.hair?.base + "_" + user.preferences?.hair?.color else ""
-        binding?.avatarAccentView?.customizationIdentifier = if (user.preferences?.hair?.flower != null && user.preferences?.hair?.flower != 0) "hair_flower_" + user.preferences?.hair?.flower else ""
-        binding?.avatarHairBeardView?.customizationIdentifier = if (user.preferences?.hair?.beard != null && user.preferences?.hair?.beard != 0) "hair_beard_" + user.preferences?.hair?.beard + "_" + user.preferences?.hair?.color else ""
-        binding?.avatarHairMustacheView?.customizationIdentifier = if (user.preferences?.hair?.mustache != null && user.preferences?.hair?.mustache != 0) "hair_mustache_" + user.preferences?.hair?.mustache + "_" + user.preferences?.hair?.color else ""
-        binding?.avatarBackgroundView?.customizationIdentifier = "background_" + user.preferences?.background
-    }
-
-    private fun setSize(size: String?) {
-        if (size == null) {
-            return
-        }
-        if (size == "slim") {
-            binding?.avatarSizeSpinner?.setSelection(0, false)
-        } else {
-            binding?.avatarSizeSpinner?.setSelection(1, false)
-        }
+    private fun displayEquipmentFragment(type: String, equipped: String?, isCostume: Boolean = false) {
+        MainNavigationController.navigate(AvatarOverviewFragmentDirections.openEquipmentDetail(type, isCostume, equipped ?: ""))
     }
 
     override fun onItemSelected(parent: AdapterView<*>, view: View?, position: Int, id: Long) {
@@ -99,9 +91,78 @@ class AvatarOverviewFragment : BaseMainFragment<FragmentAvatarOverviewBinding>()
 
         compositeSubscription.add(
             userRepository.updateUser("preferences.size", newSize)
-                .subscribe({ }, RxErrorHandler.handleEmptyError())
+                .subscribe({ }, ExceptionHandler.rx())
         )
     }
 
-    override fun onNothingSelected(parent: AdapterView<*>) { /* no-on */ }
+    override fun onNothingSelected(parent: AdapterView<*>) { /* no-on */
+    }
 }
+
+@Composable
+fun AvatarOverviewView(userViewModel: MainUserViewModel,
+    onCustomizationTap: (String, String?) -> Unit,
+    onEquipmentTap: (String, String?, Boolean) -> Unit
+    ) {
+    val user by userViewModel.user.observeAsState()
+    Column(
+        Modifier
+            .padding(horizontal = 8.dp)
+            .padding(bottom = 16.dp)) {
+        Row(Modifier.padding(horizontal = 12.dp, vertical = 15.dp),
+            verticalAlignment = Alignment.CenterVertically) {
+            Text(
+                stringResource(R.string.avatar_size),
+                style = HabiticaTheme.typography.subtitle2
+            )
+            Spacer(modifier = Modifier.weight(1f))
+            SegmentedControl(items = listOf(stringResource(R.string.avatar_size_slim), stringResource(R.string.avatar_size_broad
+            )), defaultSelectedItemIndex = if (user?.preferences?.size == "slim") 0 else 1, onItemSelection = {
+                userViewModel.updateUser("preferences.size", if (it == 0) "slim" else "broad")
+            })
+        }
+        AvatarCustomizationOverviewView(user?.preferences, onCustomizationTap)
+        Row(
+            Modifier
+                .padding(horizontal = 12.dp)
+                .padding(top = 15.dp),
+            verticalAlignment = Alignment.CenterVertically) {
+            Text(stringResource(R.string.equipped), style = HabiticaTheme.typography.subtitle2)
+            Spacer(modifier = Modifier.weight(1f))
+            Text(
+                stringResource(R.string.equip_automatically),
+                style = HabiticaTheme.typography.body2
+            )
+            Switch(checked = user?.preferences?.autoEquip == true, onCheckedChange = {
+                userViewModel.updateUser("preferences.autoEquip", it)
+            })
+        }
+        EquipmentOverviewView(user?.items?.gear?.equipped, { type, equipped ->
+            onEquipmentTap(type, equipped, false)
+        })
+        Row(
+            Modifier
+                .padding(horizontal = 12.dp)
+                .padding(top = 15.dp),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Text(
+                stringResource(R.string.costume),
+                style = HabiticaTheme.typography.subtitle2
+            )
+            Spacer(modifier = Modifier.weight(1f))
+            Text(
+                stringResource(R.string.wear_costume),
+                style = HabiticaTheme.typography.body2
+            )
+            Switch(checked = user?.preferences?.costume == true, onCheckedChange = {
+                userViewModel.updateUser("preferences.costume", it)
+            })
+        }
+        AnimatedVisibility(visible = user?.preferences?.costume == true) {
+            EquipmentOverviewView(user?.items?.gear?.costume, { type, equipped ->
+                onEquipmentTap(type, equipped, true)
+            })
+        }
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.kt
index 68275bca6..6dc48579f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@@ -12,11 +13,12 @@ import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.ui.adapter.inventory.EquipmentRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.common.habitica.helpers.EmptyItem
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class EquipmentDetailFragment :
@@ -45,7 +47,7 @@ class EquipmentDetailFragment :
     ): View? {
         compositeSubscription.add(
             this.adapter.equipEvents.flatMapMaybe { key -> inventoryRepository.equipGear(key, isCostume ?: false).firstElement() }
-                .subscribe({ }, RxErrorHandler.handleEmptyError())
+                .subscribe({ }, ExceptionHandler.rx())
         )
         return super.onCreateView(inflater, container, savedInstanceState)
     }
@@ -80,7 +82,7 @@ class EquipmentDetailFragment :
         binding?.recyclerView?.addItemDecoration(DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL))
         binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
 
-        type?.let { type -> inventoryRepository.getOwnedEquipment(type).subscribe({ this.adapter.data = it }, RxErrorHandler.handleEmptyError()) }
+        type?.let { type -> inventoryRepository.getOwnedEquipment(type).subscribe({ this.adapter.data = it }, ExceptionHandler.rx()) }
     }
 
     override fun onDestroy() {
@@ -93,13 +95,9 @@ class EquipmentDetailFragment :
     }
 
     override fun onRefresh() {
-        compositeSubscription.add(
-            userRepository.retrieveUser(false, true).subscribe(
-                {
-                    binding?.refreshLayout?.isRefreshing = false
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.retrieveUser(true, true)
+            binding?.refreshLayout?.isRefreshing = false
+        }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.kt
deleted file mode 100644
index 7925ca84e..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.kt
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.habitrpg.android.habitica.ui.fragments.inventory.equipment
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.viewModels
-import com.habitrpg.android.habitica.components.UserComponent
-import com.habitrpg.android.habitica.databinding.FragmentEquipmentOverviewBinding
-import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.models.user.Gear
-import com.habitrpg.android.habitica.models.user.Outfit
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import com.habitrpg.android.habitica.ui.viewmodels.inventory.equipment.EquipmentOverviewViewModel
-import com.habitrpg.android.habitica.ui.views.equipment.EquipmentOverviewView
-
-class EquipmentOverviewFragment : BaseMainFragment<FragmentEquipmentOverviewBinding>() {
-
-    private val viewModel: EquipmentOverviewViewModel by viewModels()
-
-    override var binding: FragmentEquipmentOverviewBinding? = null
-
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentEquipmentOverviewBinding {
-        return FragmentEquipmentOverviewBinding.inflate(inflater, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding?.battlegearView?.onNavigate = { type, equipped ->
-            displayEquipmentDetailList(type, equipped, false)
-        }
-        binding?.costumeView?.onNavigate = { type, equipped ->
-            displayEquipmentDetailList(type, equipped, true)
-        }
-
-        binding?.autoEquipSwitch?.setOnCheckedChangeListener { _, isChecked ->
-            if (isChecked == viewModel.user.value?.preferences?.autoEquip) return@setOnCheckedChangeListener
-            viewModel.updateUser("preferences.autoEquip", isChecked)
-        }
-        binding?.costumeSwitch?.setOnCheckedChangeListener { _, isChecked ->
-            if (isChecked == viewModel.user.value?.preferences?.costume) return@setOnCheckedChangeListener
-            viewModel.updateUser("preferences.costume", isChecked)
-        }
-
-        viewModel.user.observe(viewLifecycleOwner) {
-            it?.items?.gear?.let {
-                updateGearData(it)
-            }
-            binding?.autoEquipSwitch?.isChecked = viewModel.usesAutoEquip
-            binding?.costumeSwitch?.isChecked = viewModel.usesCostume
-
-            binding?.costumeView?.isEnabled = viewModel.usesCostume
-        }
-    }
-
-    override fun injectFragment(component: UserComponent) {
-        component.inject(this)
-    }
-
-    private fun displayEquipmentDetailList(type: String, equipped: String?, isCostume: Boolean?) {
-        MainNavigationController.navigate(EquipmentOverviewFragmentDirections.openEquipmentDetail(type, isCostume ?: false, equipped ?: ""))
-    }
-
-    private fun updateGearData(gear: Gear) {
-        updateOutfit(binding?.battlegearView, gear.equipped)
-        updateOutfit(binding?.costumeView, gear.costume)
-    }
-
-    private fun updateOutfit(view: EquipmentOverviewView?, outfit: Outfit?) {
-        if (outfit?.weapon?.isNotEmpty() == true) {
-            viewModel.getGear(outfit.weapon) {
-                if (it.isValid) {
-                    view?.updateData(outfit, it.twoHanded)
-                }
-            }
-        } else {
-            view?.updateData(outfit)
-        }
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemDialogFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemDialogFragment.kt
index 60b908cfa..b8a24cb9d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemDialogFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemDialogFragment.kt
@@ -15,8 +15,8 @@ import com.habitrpg.android.habitica.databinding.FragmentItemsDialogBinding
 import com.habitrpg.android.habitica.extensions.addCloseButton
 import com.habitrpg.android.habitica.extensions.observeOnce
 import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.interactors.FeedPetUseCase
 import com.habitrpg.android.habitica.interactors.HatchPetUseCase
 import com.habitrpg.android.habitica.models.inventory.Egg
@@ -31,11 +31,11 @@ import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.activities.MainActivity
 import com.habitrpg.android.habitica.ui.adapter.inventory.ItemRecyclerAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseDialogFragment
-import com.habitrpg.common.habitica.helpers.EmptyItem
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
-import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.dialogs.OpenedMysteryitemDialog
+import com.habitrpg.common.habitica.extensions.loadImage
+import com.habitrpg.common.habitica.helpers.EmptyItem
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.map
@@ -188,22 +188,24 @@ class ItemDialogFragment : BaseDialogFragment<FragmentItemsDialogBinding>() {
                 compositeSubscription.add(
                     adapter.getSellItemFlowable()
                         .flatMap { item -> inventoryRepository.sellItem(item) }
-                        .subscribe({ }, RxErrorHandler.handleEmptyError())
+                        .subscribe({ }, ExceptionHandler.rx())
                 )
 
                 compositeSubscription.add(
                     adapter.getQuestInvitationFlowable()
                         .flatMap { quest -> inventoryRepository.inviteToQuest(quest) }
-                        .flatMap { socialRepository.retrieveGroup("party") }
                         .subscribe(
                             {
-                                if (isModal) {
-                                    dismiss()
-                                } else {
-                                    MainNavigationController.navigate(R.id.partyFragment)
+                                lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                                    socialRepository.retrieveGroup("party")
+                                    if (isModal) {
+                                        dismiss()
+                                    } else {
+                                        MainNavigationController.navigate(R.id.partyFragment)
+                                    }
                                 }
                             },
-                            RxErrorHandler.handleEmptyError()
+                            ExceptionHandler.rx()
                         )
                 )
                 compositeSubscription.add(
@@ -219,13 +221,13 @@ class ItemDialogFragment : BaseDialogFragment<FragmentItemsDialogBinding>() {
                                 dialog.binding.titleView.text = it.text
                                 dialog.binding.descriptionView.text = it.notes
                                 dialog.addButton(R.string.equip, true) { _, _ ->
-                                    inventoryRepository.equip("equipped", it.key ?: "").subscribe({}, RxErrorHandler.handleEmptyError())
+                                    inventoryRepository.equip("equipped", it.key ?: "").subscribe({}, ExceptionHandler.rx())
                                 }
                                 dialog.addCloseButton()
                                 dialog.enqueue()
                             }
                         }
-                        .subscribe({ }, RxErrorHandler.handleEmptyError())
+                        .subscribe({ }, ExceptionHandler.rx())
                 )
                 compositeSubscription.add(adapter.hatchPetEvents.subscribeWithErrorHandler { hatchPet(it.first, it.second) })
                 compositeSubscription.add(adapter.feedPetEvents.subscribeWithErrorHandler { feedPet(it) })
@@ -285,7 +287,7 @@ class ItemDialogFragment : BaseDialogFragment<FragmentItemsDialogBinding>() {
             else -> Egg::class.java
         }
         itemType?.let { type ->
-                lifecycleScope.launch {
+                lifecycleScope.launch(ExceptionHandler.coroutine()) {
                     inventoryRepository.getOwnedItems(type)
                         .onEach { items ->
                             val filteredItems = if (isFeeding) {
@@ -296,7 +298,7 @@ class ItemDialogFragment : BaseDialogFragment<FragmentItemsDialogBinding>() {
                             adapter?.data = filteredItems
                         }
                         .map { items -> items.mapNotNull { it.key } }
-                        .map { inventoryRepository.getItemsFlowable(itemClass, it.toTypedArray()).firstOrNull() }
+                        .map { inventoryRepository.getItems(itemClass, it.toTypedArray()).firstOrNull() }
                         .collect {
                             val itemMap = mutableMapOf<String, Item>()
                             for (item in it ?: emptyList()) {
@@ -306,10 +308,10 @@ class ItemDialogFragment : BaseDialogFragment<FragmentItemsDialogBinding>() {
                         }
 
                 }
-                lifecycleScope.launch {
+                lifecycleScope.launch(ExceptionHandler.coroutine()) {
                     inventoryRepository.getPets().collect { adapter?.setExistingPets(it) }
                 }
-                lifecycleScope.launch {
+                lifecycleScope.launch(ExceptionHandler.coroutine()) {
                     inventoryRepository.getOwnedPets().map { ownedPets ->
                         val petMap = mutableMapOf<String, OwnedPet>()
                         ownedPets.forEach { petMap[it.key ?: ""] = it }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt
index 863bb60a1..fca4bbc7d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt
@@ -20,7 +20,7 @@ import com.habitrpg.android.habitica.extensions.addCloseButton
 import com.habitrpg.android.habitica.extensions.observeOnce
 import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.interactors.HatchPetUseCase
 import com.habitrpg.android.habitica.models.inventory.Egg
 import com.habitrpg.android.habitica.models.inventory.Food
@@ -37,13 +37,13 @@ import com.habitrpg.android.habitica.ui.activities.MainActivity
 import com.habitrpg.android.habitica.ui.activities.SkillMemberActivity
 import com.habitrpg.android.habitica.ui.adapter.inventory.ItemRecyclerAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
-import com.habitrpg.common.habitica.helpers.EmptyItem
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
-import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.dialogs.OpenedMysteryitemDialog
+import com.habitrpg.common.habitica.extensions.loadImage
+import com.habitrpg.common.habitica.helpers.EmptyItem
 import io.reactivex.rxjava3.core.Flowable
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.map
@@ -147,18 +147,18 @@ class ItemRecyclerFragment : BaseFragment<FragmentItemsBinding>(), SwipeRefreshL
                 compositeSubscription.add(
                     adapter.getSellItemFlowable()
                         .flatMap { item -> inventoryRepository.sellItem(item) }
-                        .subscribe({ }, RxErrorHandler.handleEmptyError())
+                        .subscribe({ }, ExceptionHandler.rx())
                 )
 
                 compositeSubscription.add(
                     adapter.getQuestInvitationFlowable()
                         .flatMap { quest -> inventoryRepository.inviteToQuest(quest) }
-                        .flatMap { socialRepository.retrieveGroup("party") }
+                        //.flatMap { socialRepository.retrieveGroup("party") }
                         .subscribe(
                             {
                                 MainNavigationController.navigate(R.id.partyFragment)
                             },
-                            RxErrorHandler.handleEmptyError()
+                            ExceptionHandler.rx()
                         )
                 )
                 compositeSubscription.add(
@@ -174,13 +174,13 @@ class ItemRecyclerFragment : BaseFragment<FragmentItemsBinding>(), SwipeRefreshL
                                 dialog.binding.titleView.text = it.text
                                 dialog.binding.descriptionView.text = it.notes
                                 dialog.addButton(R.string.equip, true) { _, _ ->
-                                    inventoryRepository.equip("equipped", it.key ?: "").subscribe({}, RxErrorHandler.handleEmptyError())
+                                    inventoryRepository.equip("equipped", it.key ?: "").subscribe({}, ExceptionHandler.rx())
                                 }
                                 dialog.addCloseButton()
                                 dialog.enqueue()
                             }
                         }
-                        .subscribe({ }, RxErrorHandler.handleEmptyError())
+                        .subscribe({ }, ExceptionHandler.rx())
                 )
                 compositeSubscription.add(adapter.startHatchingEvents.subscribeWithErrorHandler { showHatchingDialog(it) })
                 compositeSubscription.add(adapter.hatchPetEvents.subscribeWithErrorHandler { hatchPet(it.first, it.second) })
@@ -211,12 +211,10 @@ class ItemRecyclerFragment : BaseFragment<FragmentItemsBinding>(), SwipeRefreshL
 
     override fun onRefresh() {
         binding?.refreshLayout?.isRefreshing = true
-        compositeSubscription.add(
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
             userRepository.retrieveUser(true, true)
-                .doOnTerminate {
-                    binding?.refreshLayout?.isRefreshing = false
-                }.subscribe({ }, RxErrorHandler.handleEmptyError())
-        )
+            binding?.refreshLayout?.isRefreshing = false
+        }
     }
 
     private fun hatchPet(potion: HatchingPotion, egg: Egg) {
@@ -237,34 +235,25 @@ class ItemRecyclerFragment : BaseFragment<FragmentItemsBinding>(), SwipeRefreshL
         alert?.setTitle(R.string.quest_party_required_title)
         alert?.setMessage(R.string.quest_party_required_description)
         alert?.addButton(R.string.create_new_party, true, false) { _, _ ->
-            socialRepository.createGroup(
-                getString(R.string.usernames_party, user?.profile?.name),
-                "",
-                user?.id,
-                "party",
-                "",
-                false
-            )
-                .flatMap {
-                    userRepository.retrieveUser(false, true)
-                        .filter { it.hasParty }
-                        .flatMap { socialRepository.retrieveGroup("party") }
-                        .flatMap { group1 ->
-                            socialRepository.retrieveGroupMembers(
-                                group1.id,
-                                true
-                            )
-                        }
-                }
-                .subscribe(
-                    {
-                        MainNavigationController.navigate(
-                            R.id.partyFragment,
-                            bundleOf(Pair("partyID", user?.party?.id))
-                        )
-                    },
-                    RxErrorHandler.handleEmptyError()
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                val group = socialRepository.createGroup(
+                    getString(R.string.usernames_party, user?.profile?.name),
+                    "",
+                    user?.id,
+                    "party",
+                    "",
+                    false
                 )
+                val user = userRepository.retrieveUser(false, true)
+                if (user?.hasParty == true) {
+                    val party = socialRepository.retrieveGroup("party")
+                    socialRepository.retrievePartyMembers(party?.id ?: "", true)
+                    MainNavigationController.navigate(
+                        R.id.partyFragment,
+                        bundleOf(Pair("partyID", user.party?.id))
+                    )
+                }
+            }
         }
         alert?.addButton(R.string.close, false) { _, _ ->
             alert.dismiss()
@@ -282,14 +271,14 @@ class ItemRecyclerFragment : BaseFragment<FragmentItemsBinding>(), SwipeRefreshL
             else -> Egg::class.java
         }
         itemType?.let { type ->
-            lifecycleScope.launch {
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
                 inventoryRepository.getOwnedItems(type)
                     .onEach { items ->
                         adapter?.data = items
                     }
                     .map { items -> items.mapNotNull { it.key } }
                     .map {
-                        inventoryRepository.getItemsFlowable(itemClass, it.toTypedArray()).firstOrNull()
+                        inventoryRepository.getItems(itemClass, it.toTypedArray()).firstOrNull()
                     }
                     .collect {
                         val itemMap = mutableMapOf<String, Item>()
@@ -299,10 +288,10 @@ class ItemRecyclerFragment : BaseFragment<FragmentItemsBinding>(), SwipeRefreshL
                         adapter?.items = itemMap
                     }
             }
-            lifecycleScope.launch {
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
                 inventoryRepository.getPets().collect { adapter?.setExistingPets(it) }
             }
-            lifecycleScope.launch {
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
                 inventoryRepository.getOwnedPets().map { ownedPets ->
                     val petMap = mutableMapOf<String, OwnedPet>()
                     ownedPets.forEach { petMap[it.key ?: ""] = it }
@@ -340,7 +329,7 @@ class ItemRecyclerFragment : BaseFragment<FragmentItemsBinding>(), SwipeRefreshL
         compositeSubscription.add(
             observable.subscribe(
                 { this.displaySpecialItemResult(specialItem) },
-                RxErrorHandler.handleEmptyError()
+                ExceptionHandler.rx()
             )
         )
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt
index 898acb9f9..26adcc2f4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt
@@ -12,9 +12,8 @@ import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding
-import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
 import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.shops.Shop
 import com.habitrpg.android.habitica.models.shops.ShopCategory
 import com.habitrpg.android.habitica.models.shops.ShopItem
@@ -27,6 +26,7 @@ import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.CurrencyViews
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.common.habitica.helpers.RecyclerViewState
+import io.reactivex.rxjava3.kotlin.combineLatest
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.launch
 import javax.inject.Inject
@@ -136,16 +136,11 @@ open class ShopFragment : BaseMainFragment<FragmentRefreshRecyclerviewBinding>()
             updateCurrencyView(it)
         }
 
-        lifecycleScope.launch {
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
             socialRepository.getGroup(Group.TAVERN_ID)
                 .filter { it?.hasActiveQuest == true }
-                .filter { group ->
-                    group?.quest?.rageStrikes?.any { it.key == shopIdentifier } ?: false
-                }
-                .filter { group ->
-                    group?.quest?.rageStrikes?.filter { it.key == shopIdentifier }
-                        ?.get(0)?.wasHit == true
-                }
+                .filter { group -> group?.quest?.rageStrikes?.any { it.key == shopIdentifier } ?: false }
+                .filter { group -> group?.quest?.rageStrikes?.filter { it.key == shopIdentifier }?.get(0)?.wasHit == true }
                 .collect {
                     adapter?.shopSpriteSuffix = "_" + it?.quest?.key
                 }
@@ -163,7 +158,8 @@ open class ShopFragment : BaseMainFragment<FragmentRefreshRecyclerviewBinding>()
             val alert = HabiticaAlertDialog(context)
             alert.setTitle(getString(R.string.class_confirmation_price, classIdentifier, 3))
             alert.addButton(R.string.choose_class, true) { _, _ ->
-                userRepository.changeClass(classIdentifier).subscribeWithErrorHandler {
+                lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                    userRepository.changeClass(classIdentifier)
                 }
             }
             alert.addButton(R.string.dialog_go_back, false)
@@ -223,7 +219,7 @@ open class ShopFragment : BaseMainFragment<FragmentRefreshRecyclerviewBinding>()
                     },
                     {
                         binding?.recyclerView?.state = RecyclerViewState.FAILED
-                        RxErrorHandler.reportError(it)
+                        ExceptionHandler.reportError(it)
                     },
                     {
                         binding?.refreshLayout?.isRefreshing = false
@@ -233,12 +229,12 @@ open class ShopFragment : BaseMainFragment<FragmentRefreshRecyclerviewBinding>()
 
         compositeSubscription.add(
             this.inventoryRepository.getOwnedItems()
-                .subscribe({ adapter?.setOwnedItems(it) }, RxErrorHandler.handleEmptyError())
+                .subscribe({ adapter?.setOwnedItems(it) }, ExceptionHandler.rx())
         )
         compositeSubscription.add(
             this.inventoryRepository.getInAppRewards()
                 .map { rewards -> rewards.map { it.key } }
-                .subscribe({ adapter?.setPinnedItemKeys(it) }, RxErrorHandler.handleEmptyError())
+                .subscribe({ adapter?.setPinnedItemKeys(it) }, ExceptionHandler.rx())
         )
     }
 
@@ -270,25 +266,25 @@ open class ShopFragment : BaseMainFragment<FragmentRefreshRecyclerviewBinding>()
     private fun loadMarketGear() {
         compositeSubscription.add(
             inventoryRepository.retrieveMarketGear()
-                .zipWith(
-                    inventoryRepository.getOwnedEquipment().map { equipment -> equipment.map { it.key } },
-                    { shop, equipment ->
-                        for (category in shop.categories) {
-                            val items = category.items.asSequence().filter {
-                                !equipment.contains(it.key)
-                            }.sortedBy { it.locked }.toList()
-                            category.items.clear()
-                            category.items.addAll(items)
-                        }
-                        shop
-                    }
+                .combineLatest(
+                    inventoryRepository.getOwnedEquipment().map { equipment -> equipment.map { it.key } }
                 )
+                .map { (shop, equipment) ->
+                    for (category in shop.categories) {
+                        val items = category.items.asSequence().filter {
+                            !equipment.contains(it.key)
+                        }.sortedBy { it.locked }.toList()
+                        category.items.clear()
+                        category.items.addAll(items)
+                    }
+                    shop
+                }
                 .subscribe(
                     {
                         this.gearCategories = it.categories
                         adapter?.gearCategories = it.categories
                     },
-                    RxErrorHandler.handleEmptyError()
+                    ExceptionHandler.rx()
                 )
         )
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.kt
index 8d5188882..2d108d89a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.kt
@@ -11,7 +11,7 @@ import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding
 import com.habitrpg.android.habitica.extensions.getTranslatedType
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.inventory.Mount
 import com.habitrpg.android.habitica.models.inventory.StableSection
 import com.habitrpg.android.habitica.models.user.OwnedMount
@@ -102,7 +102,7 @@ class MountDetailRecyclerFragment :
                     {
                         adapter?.currentMount = it.currentMount
                     },
-                    RxErrorHandler.handleEmptyError()
+                    ExceptionHandler.rx()
                 )?.let { compositeSubscription.add(it) }
         }
         userViewModel.user.observe(viewLifecycleOwner) { adapter?.currentMount = it?.currentMount }
@@ -136,7 +136,7 @@ class MountDetailRecyclerFragment :
 
     private fun loadItems() {
         if (animalType != null || animalGroup != null) {
-            lifecycleScope.launch {
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
                 val mounts = inventoryRepository.getMounts(animalType, animalGroup, animalColor).firstOrNull() ?: emptyList()
                 inventoryRepository.getOwnedMounts().map {  ownedMounts ->
                     val mountMap = mutableMapOf<String, OwnedMount>()
@@ -173,13 +173,9 @@ class MountDetailRecyclerFragment :
     }
 
     override fun onRefresh() {
-        compositeSubscription.add(
-            userRepository.retrieveUser(false, true).subscribe(
-                {
-                    binding?.refreshLayout?.isRefreshing = false
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.retrieveUser(false, true)
+            binding?.refreshLayout?.isRefreshing = false
+        }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.kt
index dd234a2e3..3ec178450 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.kt
@@ -12,7 +12,7 @@ import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding
 import com.habitrpg.android.habitica.extensions.getTranslatedType
 import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.interactors.FeedPetUseCase
 import com.habitrpg.android.habitica.models.inventory.Egg
 import com.habitrpg.android.habitica.models.inventory.Food
@@ -111,11 +111,11 @@ class PetDetailRecyclerFragment :
             }
         binding?.recyclerView?.layoutManager = layoutManager
         adapter.animalIngredientsRetriever = { animal, callback ->
-            lifecycleScope.launch {
-                val egg = inventoryRepository.getItemsFlowable(Egg::class.java, arrayOf(animal.animal))
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                val egg = inventoryRepository.getItems(Egg::class.java, arrayOf(animal.animal))
                     .firstOrNull()?.firstOrNull() as? Egg
                 val potion =
-                    inventoryRepository.getItemsFlowable(HatchingPotion::class.java, arrayOf(animal.color))
+                    inventoryRepository.getItems(HatchingPotion::class.java, arrayOf(animal.color))
                         .firstOrNull()?.firstOrNull() as? HatchingPotion
                 callback(Pair(egg, potion))
             }
@@ -131,7 +131,7 @@ class PetDetailRecyclerFragment :
                     {
                         adapter.currentPet = it.currentPet
                     },
-                    RxErrorHandler.handleEmptyError()
+                    ExceptionHandler.rx()
                 )
         )
         userViewModel.user.observe(viewLifecycleOwner) { adapter.currentPet = it?.currentPet }
@@ -140,7 +140,7 @@ class PetDetailRecyclerFragment :
                 it.first,
                 it.second
             )
-        }, RxErrorHandler.handleEmptyError()))
+        }, ExceptionHandler.rx()))
 
         view.post { setGridSpanCount(view.width) }
     }
@@ -171,7 +171,7 @@ class PetDetailRecyclerFragment :
 
     private fun loadItems() {
         if (animalType?.isNotEmpty() == true || animalGroup?.isNotEmpty() == true) {
-            lifecycleScope.launch {
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
                 inventoryRepository.getOwnedMounts()
                     .map { ownedMounts ->
                         val mountMap = mutableMapOf<String, OwnedMount>()
@@ -181,9 +181,9 @@ class PetDetailRecyclerFragment :
             }
             compositeSubscription.add(
                 inventoryRepository.getOwnedItems(true)
-                    .subscribe({ adapter.setOwnedItems(it) }, RxErrorHandler.handleEmptyError())
+                    .subscribe({ adapter.setOwnedItems(it) }, ExceptionHandler.rx())
             )
-            lifecycleScope.launch {
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
                 val mounts = inventoryRepository.getMounts(
                     animalType,
                     animalGroup,
@@ -256,13 +256,9 @@ class PetDetailRecyclerFragment :
     }
 
     override fun onRefresh() {
-        compositeSubscription.add(
-            userRepository.retrieveUser(false, true).subscribe(
-                {
-                    binding?.refreshLayout?.isRefreshing = false
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.retrieveUser(false, true)
+            binding?.refreshLayout?.isRefreshing = false
+        }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt
index 34df1d531..ac4ae7502 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt
@@ -14,7 +14,7 @@ import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding
 import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.inventory.Egg
 import com.habitrpg.android.habitica.models.inventory.HatchingPotion
 import com.habitrpg.android.habitica.ui.adapter.inventory.StableRecyclerAdapter
@@ -106,9 +106,9 @@ class StableRecyclerFragment :
         if (adapter == null) {
             adapter = StableRecyclerAdapter()
             adapter?.animalIngredientsRetriever = { animal, callback ->
-                lifecycleScope.launch {
-                    val egg = inventoryRepository.getItemsFlowable(Egg::class.java, arrayOf(animal.animal)).firstOrNull()?.firstOrNull() as? Egg
-                    val potion = inventoryRepository.getItemsFlowable(HatchingPotion::class.java, arrayOf(animal.color)).firstOrNull()?.firstOrNull() as? HatchingPotion
+                lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                    val egg = inventoryRepository.getItems(Egg::class.java, arrayOf(animal.animal)).firstOrNull()?.firstOrNull() as? Egg
+                    val potion = inventoryRepository.getItems(HatchingPotion::class.java, arrayOf(animal.color)).firstOrNull()?.firstOrNull() as? HatchingPotion
                     callback(Pair(egg, potion))
                 }
             }
@@ -121,7 +121,7 @@ class StableRecyclerFragment :
                 compositeSubscription.add(
                     it.getEquipFlowable()
                         .flatMap { key -> inventoryRepository.equip(if (itemType == "pets") "pet" else "mount", key) }
-                        .subscribe({ }, RxErrorHandler.handleEmptyError())
+                        .subscribe({ }, ExceptionHandler.rx())
                 )
             }
         }
@@ -179,13 +179,9 @@ class StableRecyclerFragment :
     }
 
     override fun onRefresh() {
-        compositeSubscription.add(
-            userRepository.retrieveUser(false, true).subscribe(
-                {
-                    binding?.refreshLayout?.isRefreshing = false
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.retrieveUser(true, true)
+            binding?.refreshLayout?.isRefreshing = false
+        }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountPreferenceFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountPreferenceFragment.kt
index 0fb50d6ac..d76d6d85f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountPreferenceFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountPreferenceFragment.kt
@@ -14,6 +14,7 @@ import androidx.core.content.ContextCompat
 import androidx.core.content.ContextCompat.getSystemService
 import androidx.core.util.PatternsCompat
 import androidx.core.view.isVisible
+import androidx.lifecycle.lifecycleScope
 import androidx.preference.EditTextPreference
 import androidx.preference.Preference
 import com.google.android.material.textfield.TextInputLayout
@@ -22,8 +23,10 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.extensions.addCancelButton
 import com.habitrpg.android.habitica.extensions.addCloseButton
+import com.habitrpg.common.habitica.extensions.dpToPx
+import com.habitrpg.common.habitica.extensions.layoutInflater
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.activities.FixCharacterValuesActivity
 import com.habitrpg.android.habitica.ui.fragments.preferences.HabiticaAccountDialog.AccountUpdateConfirmed
@@ -36,8 +39,7 @@ import com.habitrpg.android.habitica.ui.views.ValidatingEditText
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaProgressDialog
 import com.habitrpg.common.habitica.api.HostConfig
-import com.habitrpg.common.habitica.extensions.dpToPx
-import com.habitrpg.common.habitica.extensions.layoutInflater
+import kotlinx.coroutines.launch
 import retrofit2.HttpException
 import javax.inject.Inject
 
@@ -203,8 +205,11 @@ class AccountPreferenceFragment :
             dialog.setTitle(R.string.are_you_sure)
             dialog.addButton(R.string.disconnect, true) { _, _ ->
                 apiClient.disconnectSocial(network)
-                    .flatMap { userRepository.retrieveUser(true, true) }
-                    .subscribe({ displayDisconnectSuccess(networkName) }, RxErrorHandler.handleEmptyError())
+                    .subscribe({
+                        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                            userRepository.retrieveUser(true, true)
+                        }
+                        displayDisconnectSuccess(networkName) }, ExceptionHandler.rx())
             }
             dialog.addCancelButton()
             dialog.show()
@@ -252,7 +257,7 @@ class AccountPreferenceFragment :
         showSingleEntryDialog(value, title) {
             if (value != it) {
                 userRepository.updateUser(path, it ?: "")
-                    .subscribe({}, RxErrorHandler.handleEmptyError())
+                    .subscribe({}, ExceptionHandler.rx())
             }
         }
     }
@@ -278,9 +283,7 @@ class AccountPreferenceFragment :
                 userRepository.updatePassword(
                     oldPasswordEditText?.text ?: "",
                     passwordEditText.text ?: "",
-                    passwordRepeatEditText.text ?: ""
-                )
-                    .flatMap { userRepository.retrieveUser(true, true) }
+                    passwordRepeatEditText.text ?: "")
                     .subscribe(
                         {
                             (activity as? SnackbarActivity)?.showSnackbar(
@@ -288,7 +291,7 @@ class AccountPreferenceFragment :
                                 displayType = HabiticaSnackbar.SnackbarDisplayType.SUCCESS
                             )
                         },
-                        RxErrorHandler.handleEmptyError()
+                        ExceptionHandler.rx()
                     )
                 dialog.dismiss()
             }
@@ -327,7 +330,6 @@ class AccountPreferenceFragment :
                 if ((showEmail && emailEditText?.isValid != true) || passwordEditText?.isValid != true || passwordRepeatEditText?.isValid != true) return@addButton
                 val email = if (showEmail) emailEditText?.text else user?.authentication?.findFirstSocialEmail()
                 apiClient.registerUser(user?.username ?: "", email ?: "", passwordEditText.text ?: "", passwordRepeatEditText?.text ?: "")
-                    .flatMap { userRepository.retrieveUser(true, true) }
                     .subscribe(
                         {
                             (activity as? SnackbarActivity)?.showSnackbar(
@@ -335,7 +337,7 @@ class AccountPreferenceFragment :
                                 displayType = HabiticaSnackbar.SnackbarDisplayType.SUCCESS
                             )
                         },
-                        RxErrorHandler.handleEmptyError()
+                        ExceptionHandler.rx()
                     )
                 dialog.dismiss()
             }
@@ -366,12 +368,14 @@ class AccountPreferenceFragment :
                 emailEditText?.showErrorIfNecessary()
                 if (emailEditText?.isValid != true) return@addButton
                 userRepository.updateEmail(emailEditText.text.toString(), passwordEditText?.text.toString())
-                    .flatMap { userRepository.retrieveUser(true, true) }
                     .subscribe(
                         {
+                            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                                userRepository.retrieveUser(true, true)
+                            }
                             configurePreference(findPreference("email"), emailEditText.text.toString())
                         },
-                        RxErrorHandler.handleEmptyError()
+                        ExceptionHandler.rx()
                     )
                 dialog.dismiss()
             }
@@ -385,7 +389,7 @@ class AccountPreferenceFragment :
     private fun showLoginNameDialog() {
         showSingleEntryDialog(user?.username, getString(R.string.username)) {
             userRepository.updateLoginName(it ?: "")
-                .subscribe({}, RxErrorHandler.handleEmptyError())
+                .subscribe({}, ExceptionHandler.rx())
         }
     }
 
@@ -450,7 +454,7 @@ class AccountPreferenceFragment :
                     errorDialog?.addCloseButton()
                     errorDialog?.show()
                 }
-                RxErrorHandler.reportError(throwable)
+                ExceptionHandler.reportError(throwable)
             }
         )
     }
@@ -475,7 +479,7 @@ class AccountPreferenceFragment :
         dialog.setMessage(R.string.confirm_username_description)
         dialog.addButton(R.string.confirm, true) { _, _ ->
             userRepository.updateLoginName(user?.authentication?.localAuthentication?.username ?: "")
-                .subscribe({ }, RxErrorHandler.handleEmptyError())
+                .subscribe({ }, ExceptionHandler.rx())
         }
         dialog.addCancelButton()
         dialog.show()
@@ -483,19 +487,10 @@ class AccountPreferenceFragment :
 
     private fun resetAccount() {
         val dialog = HabiticaProgressDialog.show(context, R.string.resetting_account)
-        compositeSubscription.add(
-            userRepository.resetAccount().subscribe({
-                dialog?.dismiss()
-                accountDialog.dismiss()
-                (activity as? SnackbarActivity)?.showSnackbar(
-                    content = context?.getString(R.string.account_reset),
-                    displayType = HabiticaSnackbar.SnackbarDisplayType.SUCCESS
-                )
-            }) { throwable ->
-                dialog?.dismiss()
-                RxErrorHandler.reportError(throwable)
-            }
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.resetAccount()
+            dialog?.dismiss()
+        }
     }
 
     private fun copyValue(name: String, value: CharSequence?) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/EmailNotificationsPreferencesFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/EmailNotificationsPreferencesFragment.kt
index 0e1910c6c..8a8ed8b59 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/EmailNotificationsPreferencesFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/EmailNotificationsPreferencesFragment.kt
@@ -4,7 +4,7 @@ import android.content.SharedPreferences
 import android.os.Bundle
 import androidx.preference.CheckBoxPreference
 import com.habitrpg.android.habitica.HabiticaBaseApplication
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.user.User
 
 class EmailNotificationsPreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnSharedPreferenceChangeListener {
@@ -73,7 +73,7 @@ class EmailNotificationsPreferencesFragment : BasePreferencesFragment(), SharedP
             else -> null
         }
         if (pathKey != null) {
-            compositeSubscription.add(userRepository.updateUser("preferences.emailNotifications.$pathKey", sharedPreferences.getBoolean(key, false)).subscribe({ }, RxErrorHandler.handleEmptyError()))
+            compositeSubscription.add(userRepository.updateUser("preferences.emailNotifications.$pathKey", sharedPreferences.getBoolean(key, false)).subscribe({ }, ExceptionHandler.rx()))
         }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt
index 2ef49786e..035b054f5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt
@@ -20,7 +20,7 @@ import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.data.ContentRepository
 import com.habitrpg.android.habitica.extensions.addCancelButton
 import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.SoundManager
 import com.habitrpg.android.habitica.helpers.TaskAlarmManager
 import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager
@@ -69,7 +69,7 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
         super.onViewCreated(view, savedInstanceState)
         listView.itemAnimator = null
 
-        userRepository.retrieveTeamPlans().subscribe({}, RxErrorHandler.handleEmptyError())
+        userRepository.retrieveTeamPlans().subscribe({}, ExceptionHandler.rx())
     }
 
     override fun setupPreferences() {
@@ -152,20 +152,24 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
                 (activity as? SnackbarActivity)?.showSnackbar(
                     content = context?.getString(R.string.reloading_content)
                 )
-                contentRepository.retrieveContent(true).subscribe(
-                    {
-                        (activity as? SnackbarActivity)?.showSnackbar(
-                            content = context?.getString(R.string.reloaded_content),
-                            displayType = HabiticaSnackbar.SnackbarDisplayType.SUCCESS
-                        )
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
+                reloadContent(true)
             }
         }
         return super.onPreferenceTreeClick(preference)
     }
 
+    private fun reloadContent(withConfirmation: Boolean) {
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            contentRepository.retrieveContent(true)
+            if (withConfirmation) {
+                (activity as? SnackbarActivity)?.showSnackbar(
+                    content = context?.getString(R.string.reloaded_content),
+                    displayType = HabiticaSnackbar.SnackbarDisplayType.SUCCESS
+                )
+            }
+        }
+    }
+
     private fun logout() {
         context?.let { context ->
             val dialog = HabiticaAlertDialog(context)
@@ -180,7 +184,9 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
     }
 
     private val classSelectionResult = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        userRepository.retrieveUser(true, forced = true)
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.retrieveUser(true, true)
+        }
     }
 
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String?) {
@@ -199,24 +205,24 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
                 TaskAlarmManager.scheduleDailyReminder(context)
             }
             "usePushNotifications" -> {
-                val userPushNotifications = sharedPreferences.getBoolean(key, false)
-                pushNotificationsPreference?.isEnabled = userPushNotifications
-                userRepository.updateUser("preferences.pushNotifications.unsubscribeFromAll", userPushNotifications).subscribe()
-                if (userPushNotifications) {
+                val usePushNotifications = sharedPreferences.getBoolean(key, true)
+                pushNotificationsPreference?.isEnabled = usePushNotifications
+                userRepository.updateUser("preferences.pushNotifications.unsubscribeFromAll", !usePushNotifications).subscribe()
+                if (usePushNotifications) {
                     pushNotificationManager.addPushDeviceUsingStoredToken()
                 } else {
                     pushNotificationManager.removePushDeviceUsingStoredToken()
                 }
             }
             "useEmails" -> {
-                val useEmailNotifications = sharedPreferences.getBoolean(key, false)
+                val useEmailNotifications = sharedPreferences.getBoolean(key, true)
                 emailNotificationsPreference?.isEnabled = useEmailNotifications
-                userRepository.updateUser("preferences.emailNotifications.unsubscribeFromAll", useEmailNotifications).subscribe()
+                userRepository.updateUser("preferences.emailNotifications.unsubscribeFromAll", !useEmailNotifications).subscribe()
             }
             "cds_time" -> {
                 val timeval = sharedPreferences.getString("cds_time", "0") ?: "0"
                 val hour = Integer.parseInt(timeval)
-                userRepository.changeCustomDayStart(hour).subscribe({ }, RxErrorHandler.handleEmptyError())
+                userRepository.changeCustomDayStart(hour).subscribe({ }, ExceptionHandler.rx())
                 val preference = findPreference<ListPreference>(key)
                 preference?.summary = preference?.entry
             }
@@ -234,8 +240,7 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
                 }
 
                 userRepository.updateLanguage(languageHelper.languageCode ?: "en")
-                    .flatMap { contentRepository.retrieveContent(true) }
-                    .subscribe({ }, RxErrorHandler.handleEmptyError())
+                    .subscribe({ reloadContent(false) }, ExceptionHandler.rx())
 
                 val intent = Intent(activity, MainActivity::class.java)
                 this.startActivity(intent)
@@ -246,7 +251,7 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
                 if (newAudioTheme != null) {
                     compositeSubscription.add(
                         userRepository.updateUser("preferences.sound", newAudioTheme)
-                            .subscribe({ }, RxErrorHandler.handleEmptyError())
+                            .subscribe({ }, ExceptionHandler.rx())
                     )
                     soundManager.soundTheme = newAudioTheme
                     soundManager.preloadAllFiles()
@@ -261,7 +266,7 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
                 activity.reload()
             }
             "dailyDueDefaultView" -> userRepository.updateUser("preferences.dailyDueDefaultView", sharedPreferences.getBoolean(key, false))
-                .subscribe({ }, RxErrorHandler.handleEmptyError())
+                .subscribe({ }, ExceptionHandler.rx())
             "server_url" -> {
                 apiClient.updateServerUrl(sharedPreferences.getString(key, ""))
                 findPreference<Preference>(key)?.summary = sharedPreferences.getString(key, "")
@@ -279,7 +284,7 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
                 if (user?.inbox?.optOut != isDisabled) {
                     compositeSubscription.add(
                         userRepository.updateUser("inbox.optOut", isDisabled)
-                            .subscribe({ }, RxErrorHandler.handleEmptyError())
+                            .subscribe({ }, ExceptionHandler.rx())
                     )
                 }
             }
@@ -351,13 +356,13 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
 
         val usePushPreference = findPreference("usePushNotifications") as? CheckBoxPreference
         pushNotificationsPreference = findPreference("pushNotifications") as? PreferenceScreen
-        val usePushNotifications = user?.preferences?.pushNotifications?.unsubscribeFromAll ?: false
+        val usePushNotifications = !(user?.preferences?.pushNotifications?.unsubscribeFromAll ?: false)
         pushNotificationsPreference?.isEnabled = usePushNotifications
         usePushPreference?.isChecked = usePushNotifications
 
         val useEmailPreference = findPreference("useEmails") as? CheckBoxPreference
         emailNotificationsPreference = findPreference("emailNotifications") as? PreferenceScreen
-        val useEmailNotifications = user?.preferences?.emailNotifications?.unsubscribeFromAll ?: false
+        val useEmailNotifications = !(user?.preferences?.emailNotifications?.unsubscribeFromAll ?: false)
         emailNotificationsPreference?.isEnabled = useEmailNotifications
         useEmailPreference?.isChecked = useEmailNotifications
 
@@ -385,7 +390,7 @@ class PreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnShare
                         } else if (newValue == false && currentIds.contains(team.id)) {
                             currentIds.remove(team.id)
                         }
-                        userRepository.updateUser("preferences.tasks.mirrorGroupTasks", currentIds).subscribe({}, RxErrorHandler.handleEmptyError())
+                        userRepository.updateUser("preferences.tasks.mirrorGroupTasks", currentIds).subscribe({}, ExceptionHandler.rx())
                         true
                     }
                     groupCategory?.addPreference(newPreference)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PushNotificationsPreferencesFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PushNotificationsPreferencesFragment.kt
index 97a6eb276..07a654ab3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PushNotificationsPreferencesFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PushNotificationsPreferencesFragment.kt
@@ -4,7 +4,7 @@ import android.content.SharedPreferences
 import android.os.Bundle
 import androidx.preference.CheckBoxPreference
 import com.habitrpg.android.habitica.HabiticaBaseApplication
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.user.User
 
 class PushNotificationsPreferencesFragment : BasePreferencesFragment(), SharedPreferences.OnSharedPreferenceChangeListener {
@@ -75,7 +75,7 @@ class PushNotificationsPreferencesFragment : BasePreferencesFragment(), SharedPr
             else -> null
         }
         if (pathKey != null) {
-            compositeSubscription.add(userRepository.updateUser("preferences.pushNotifications.$pathKey", sharedPreferences.getBoolean(key, false)).subscribe({ }, RxErrorHandler.handleEmptyError()))
+            compositeSubscription.add(userRepository.updateUser("preferences.pushNotifications.$pathKey", sharedPreferences.getBoolean(key, false)).subscribe({ }, ExceptionHandler.rx()))
         }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragment.kt
index b6734195e..7bb35bc92 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragment.kt
@@ -13,9 +13,9 @@ import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.databinding.FragmentGemPurchaseBinding
 import com.habitrpg.android.habitica.extensions.addCancelButton
-import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.android.habitica.helpers.AmplitudeManager
 import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.PurchaseHandler
 import com.habitrpg.android.habitica.helpers.PurchaseTypes
 import com.habitrpg.android.habitica.models.promotions.PromoType
@@ -25,11 +25,12 @@ import com.habitrpg.android.habitica.ui.fragments.BaseFragment
 import com.habitrpg.android.habitica.ui.fragments.PromoInfoFragment
 import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
-import javax.inject.Inject
+import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import javax.inject.Inject
 
 class GemsPurchaseFragment : BaseFragment<FragmentGemPurchaseBinding>() {
 
@@ -50,6 +51,8 @@ class GemsPurchaseFragment : BaseFragment<FragmentGemPurchaseBinding>() {
         component.inject(this)
     }
 
+    private var isGemSaleHappening = false
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -67,6 +70,7 @@ class GemsPurchaseFragment : BaseFragment<FragmentGemPurchaseBinding>() {
         val promo = appConfigManager.activePromo()
         if (promo != null) {
             binding?.let {
+                isGemSaleHappening = true
                 promo.configurePurchaseBanner(it)
                 if (promo.promoType != PromoType.SUBSCRIPTION) {
                     promo.configureGemView(it.gems4View.binding, 4)
@@ -96,7 +100,7 @@ class GemsPurchaseFragment : BaseFragment<FragmentGemPurchaseBinding>() {
     }
 
     private fun loadInventory() {
-        CoroutineScope(Dispatchers.IO).launch {
+        CoroutineScope(Dispatchers.IO).launch(ExceptionHandler.coroutine()) {
             val skus = purchaseHandler.getAllGemSKUs()
             withContext(Dispatchers.Main) {
                 for (sku in skus) {
@@ -122,7 +126,7 @@ class GemsPurchaseFragment : BaseFragment<FragmentGemPurchaseBinding>() {
 
     private fun purchaseGems(view: GemPurchaseOptionsView?) {
         val identifier = view?.sku ?: return
-        activity?.let { purchaseHandler.purchase(it, identifier) }
+        activity?.let { purchaseHandler.purchase(it, identifier, null, isGemSaleHappening) }
     }
 
     private fun showGiftGemsDialog() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftBalanceGemsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftBalanceGemsFragment.kt
index 2639c94b4..6e6d6afd0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftBalanceGemsFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftBalanceGemsFragment.kt
@@ -5,13 +5,15 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.lifecycle.lifecycleScope
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.databinding.FragmentGiftGemBalanceBinding
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class GiftBalanceGemsFragment : BaseFragment<FragmentGiftGemBalanceBinding>() {
@@ -64,14 +66,16 @@ class GiftBalanceGemsFragment : BaseFragment<FragmentGiftGemBalanceBinding>() {
             giftedMember?.id?.let {
                 compositeSubscription.add(
                     socialRepository.transferGems(it, amount)
-                        .flatMap { userRepository.retrieveUser(false, true) }
                         .doOnError {
                             isGifting = false
                         }
                         .subscribe(
                             {
-                                activity?.finish()
-                            }, RxErrorHandler.handleEmptyError()
+                                lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                                    userRepository.retrieveUser(false)
+                                }
+                            activity?.finish()
+                            }, ExceptionHandler.rx()
                         )
                 )
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftPurchaseGemsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftPurchaseGemsFragment.kt
index e62ba9fb8..2babff589 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftPurchaseGemsFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GiftPurchaseGemsFragment.kt
@@ -9,16 +9,17 @@ import com.android.billingclient.api.SkuDetails
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.databinding.FragmentGiftGemPurchaseBinding
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.PurchaseHandler
 import com.habitrpg.android.habitica.helpers.PurchaseTypes
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.ui.GemPurchaseOptionsView
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
-import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import javax.inject.Inject
 
 class GiftPurchaseGemsFragment : BaseFragment<FragmentGiftGemPurchaseBinding>() {
 
@@ -54,7 +55,7 @@ class GiftPurchaseGemsFragment : BaseFragment<FragmentGiftGemPurchaseBinding>()
     }
 
     fun setupCheckout() {
-        CoroutineScope(Dispatchers.IO).launch {
+        CoroutineScope(Dispatchers.IO).launch(ExceptionHandler.coroutine()) {
             val skus = purchaseHandler?.getAllGemSKUs()
             withContext(Dispatchers.Main) {
                 for (sku in skus ?: emptyList()) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt
index e330d57ce..330503222 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt
@@ -8,6 +8,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.EditText
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
 import com.android.billingclient.api.SkuDetails
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
@@ -15,20 +16,20 @@ import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.databinding.FragmentSubscriptionBinding
 import com.habitrpg.android.habitica.extensions.addCancelButton
-import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
-import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.helpers.AmplitudeManager
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.PurchaseHandler
 import com.habitrpg.android.habitica.helpers.PurchaseTypes
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.activities.GiftSubscriptionActivity
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
 import com.habitrpg.android.habitica.ui.fragments.PromoInfoFragment
-import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionOptionView
+import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
+import com.habitrpg.common.habitica.extensions.layoutInflater
+import com.habitrpg.common.habitica.extensions.loadImage
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -93,7 +94,7 @@ class SubscriptionFragment : BaseFragment<FragmentSubscriptionBinding>() {
                     binding?.subBenefitsMysteryItemIcon?.loadImage("shop_set_mystery_${it.key?.split("_")?.last()}")
                     binding?.subBenefitsMysteryItemText?.text = context?.getString(R.string.subscribe_listitem3_description_new, it.text)
                 },
-                RxErrorHandler.handleEmptyError()
+                ExceptionHandler.rx()
             )
         )
 
@@ -108,15 +109,11 @@ class SubscriptionFragment : BaseFragment<FragmentSubscriptionBinding>() {
     }
 
     private fun refresh() {
-        compositeSubscription.add(
-            userRepository.retrieveUser(withTasks = false, forced = true).subscribe(
-                {
-                    this.setUser(it)
-                    binding?.refreshLayout?.isRefreshing = false
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            val user = userRepository.retrieveUser(true)
+            user?.let { setUser(it) }
+            binding?.refreshLayout?.isRefreshing = false
+        }
     }
 
     override fun injectFragment(component: UserComponent) {
@@ -124,7 +121,7 @@ class SubscriptionFragment : BaseFragment<FragmentSubscriptionBinding>() {
     }
 
     fun loadInventory() {
-        CoroutineScope(Dispatchers.IO).launch {
+        CoroutineScope(Dispatchers.IO).launch(ExceptionHandler.coroutine()) {
             val subscriptions = purchaseHandler.getAllSubscriptionProducts()
             skus = subscriptions
             withContext(Dispatchers.Main) {
@@ -227,17 +224,16 @@ class SubscriptionFragment : BaseFragment<FragmentSubscriptionBinding>() {
     }
 
     private fun checkIfNeedsCancellation() {
-        CoroutineScope(Dispatchers.IO).launch {
+        CoroutineScope(Dispatchers.IO).launch(ExceptionHandler.coroutine()) {
             val newestSubscription = purchaseHandler.checkForSubscription()
             if (user?.purchased?.plan?.paymentMethod == "Google" &&
                 user?.purchased?.plan?.isActive == true &&
                 user?.purchased?.plan?.dateTerminated == null &&
                 (newestSubscription?.isAutoRenewing != true)
             ) {
-                compositeSubscription.add(
+                lifecycleScope.launch(ExceptionHandler.coroutine()) {
                     purchaseHandler.cancelSubscription()
-                        .subscribe({ }, RxErrorHandler.handleEmptyError())
-                )
+                }
             }
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.kt
index 6d17af42a..8746f1ca1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.kt
@@ -8,16 +8,20 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
+import androidx.lifecycle.lifecycleScope
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.databinding.FragmentWelcomeBinding
 import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher
 import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import io.reactivex.rxjava3.core.BackpressureStrategy
 import io.reactivex.rxjava3.subjects.PublishSubject
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.launch
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
@@ -100,14 +104,13 @@ class WelcomeFragment : BaseFragment<FragmentWelcomeBinding>() {
                 }
         )
 
-        compositeSubscription.add(
-            userRepository.getUserFlowable().firstElement().subscribe {
-                binding?.displayNameEditText?.setText(it.profile?.name)
-                displayNameVerificationEvents.onNext(it.profile?.name ?: "")
-                binding?.usernameEditText?.setText(it.username)
-                usernameVerificationEvents.onNext(it.username ?: "")
-            }
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            val user = userRepository.getUser().firstOrNull()
+            binding?.displayNameEditText?.setText(user?.profile?.name)
+            displayNameVerificationEvents.onNext(user?.profile?.name ?: "")
+            binding?.usernameEditText?.setText(user?.authentication?.localAuthentication?.username)
+            usernameVerificationEvents.onNext(user?.username ?: "")
+        }
     }
 
     override fun injectFragment(component: UserComponent) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.kt
index 70be854dd..e677357d5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.kt
@@ -9,7 +9,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.databinding.FragmentRecyclerviewBinding
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.ui.adapter.SkillTasksRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
@@ -59,7 +59,7 @@ class SkillTasksRecyclerViewFragment : BaseFragment<FragmentRecyclerviewBinding>
                 {
                     taskSelectionEvents.onNext(it)
                 },
-                RxErrorHandler.handleEmptyError()
+                ExceptionHandler.rx()
             )
         )
         binding?.recyclerView?.adapter = adapter
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.kt
index c5d47dd86..428f6ef7c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.kt
@@ -14,7 +14,7 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.databinding.FragmentSkillsBinding
 import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.Skill
 import com.habitrpg.android.habitica.models.responses.SkillResponse
 import com.habitrpg.android.habitica.models.user.User
@@ -91,7 +91,7 @@ class SkillsFragment : BaseMainFragment<FragmentSkillsBinding>() {
                 allEntries.add(item)
             }
             return@combineLatest allEntries
-        }.subscribe({ skills -> adapter?.setSkillList(skills) }, RxErrorHandler.handleEmptyError())
+        }.subscribe({ skills -> adapter?.setSkillList(skills) }, ExceptionHandler.rx())
     }
 
     private fun onSkillSelected(skill: Skill) {
@@ -128,7 +128,7 @@ class SkillsFragment : BaseMainFragment<FragmentSkillsBinding>() {
             }
         }
         if (response.damage > 0) {
-            lifecycleScope.launch {
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
                 delay(2000L)
                 if (!isAdded) return@launch
                 showSnackbar(
@@ -140,7 +140,9 @@ class SkillsFragment : BaseMainFragment<FragmentSkillsBinding>() {
                 )
             }
         }
-        compositeSubscription.add(userRepository.retrieveUser(false).subscribe({ }, RxErrorHandler.handleEmptyError()))
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.retrieveUser(true)
+        }
     }
 
     private val taskSelectionResult = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
@@ -167,7 +169,7 @@ class SkillsFragment : BaseMainFragment<FragmentSkillsBinding>() {
         compositeSubscription.add(
             observable.subscribe(
                 { skillResponse -> this.displaySkillResult(skill, skillResponse) },
-                RxErrorHandler.handleEmptyError()
+                ExceptionHandler.rx()
             )
         )
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatFragment.kt
index 174f229ee..62347b671 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatFragment.kt
@@ -13,8 +13,8 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.databinding.FragmentChatBinding
 import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.social.ChatMessage
 import com.habitrpg.android.habitica.ui.activities.FullProfileActivity
 import com.habitrpg.android.habitica.ui.activities.MainActivity
@@ -72,13 +72,13 @@ class ChatFragment() : BaseFragment<FragmentChatBinding>() {
             compositeSubscription.add(
                 adapter.getUserLabelClickFlowable().subscribe(
                     { userId -> FullProfileActivity.open(userId) },
-                    RxErrorHandler.handleEmptyError()
+                    ExceptionHandler.rx()
                 )
             )
-            compositeSubscription.add(adapter.getDeleteMessageFlowable().subscribe({ this.showDeleteConfirmationDialog(it) }, RxErrorHandler.handleEmptyError()))
-            compositeSubscription.add(adapter.getFlagMessageClickFlowable().subscribe({ this.showFlagConfirmationDialog(it) }, RxErrorHandler.handleEmptyError()))
-            compositeSubscription.add(adapter.getReplyMessageEvents().subscribe({ setReplyTo(it) }, RxErrorHandler.handleEmptyError()))
-            compositeSubscription.add(adapter.getCopyMessageFlowable().subscribe({ this.copyMessageToClipboard(it) }, RxErrorHandler.handleEmptyError()))
+            compositeSubscription.add(adapter.getDeleteMessageFlowable().subscribe({ this.showDeleteConfirmationDialog(it) }, ExceptionHandler.rx()))
+            compositeSubscription.add(adapter.getFlagMessageClickFlowable().subscribe({ this.showFlagConfirmationDialog(it) }, ExceptionHandler.rx()))
+            compositeSubscription.add(adapter.getReplyMessageEvents().subscribe({ setReplyTo(it) }, ExceptionHandler.rx()))
+            compositeSubscription.add(adapter.getCopyMessageFlowable().subscribe({ this.copyMessageToClipboard(it) }, ExceptionHandler.rx()))
             adapter.onMessageLike = { viewModel?.likeMessage(it) }
         }
 
@@ -141,7 +141,7 @@ class ChatFragment() : BaseFragment<FragmentChatBinding>() {
                 {
                     refresh()
                 },
-                RxErrorHandler.handleEmptyError()
+                ExceptionHandler.rx()
             )
         refresh()
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt
index ffc46f7de..9c87e9eaf 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.kt
@@ -12,6 +12,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.viewModels
+import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.MainNavDirections
 import com.habitrpg.android.habitica.R
@@ -20,14 +21,13 @@ import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.databinding.FragmentInboxMessageListBinding
 import com.habitrpg.android.habitica.extensions.addOkButton
 import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.social.ChatMessage
 import com.habitrpg.android.habitica.ui.activities.FullProfileActivity
 import com.habitrpg.android.habitica.ui.activities.MainActivity
 import com.habitrpg.android.habitica.ui.adapter.social.InboxAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import com.habitrpg.android.habitica.ui.helpers.KeyboardUtil
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
 import com.habitrpg.android.habitica.ui.viewmodels.InboxViewModel
 import com.habitrpg.android.habitica.ui.viewmodels.InboxViewModelFactory
@@ -37,8 +37,12 @@ import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.disposables.Disposable
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
+import kotlin.time.DurationUnit
+import kotlin.time.toDuration
 
 class InboxMessageListFragment : BaseMainFragment<FragmentInboxMessageListBinding>() {
 
@@ -84,48 +88,44 @@ class InboxMessageListFragment : BaseMainFragment<FragmentInboxMessageListBindin
         layoutManager.reverseLayout = true
         layoutManager.stackFromEnd = false
         binding?.recyclerView?.layoutManager = layoutManager
-        val observable = if (replyToUserUUID?.isNotBlank() == true) {
-            apiClient.getMember(replyToUserUUID!!)
-        } else {
-            apiClient.getMemberWithUsername(chatRoomUser ?: "")
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            val member = if (replyToUserUUID?.isNotBlank() == true) {
+                apiClient.getMember(replyToUserUUID!!)
+            } else {
+                apiClient.getMemberWithUsername(chatRoomUser ?: "")
+            }
+            setReceivingUser(member?.username, member?.id)
+            activity?.title = member?.displayName
+            chatAdapter = InboxAdapter(viewModel.user.value, member)
+            chatAdapter?.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
+                override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
+                    if (positionStart == 0) {
+                        binding?.recyclerView?.scrollToPosition(0)
+                    }
+                }
+            })
+            binding?.recyclerView?.adapter = chatAdapter
+            binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
+            chatAdapter?.let { adapter ->
+                compositeSubscription.add(
+                    adapter.getUserLabelClickFlowable().subscribe(
+                        {
+                            FullProfileActivity.open(it)
+                        },
+                        ExceptionHandler.rx()
+                    )
+                )
+                compositeSubscription.add(adapter.getDeleteMessageFlowable().subscribe({ showDeleteConfirmationDialog(it) }, ExceptionHandler.rx()))
+                compositeSubscription.add(adapter.getFlagMessageClickFlowable().subscribe({ showFlagConfirmationDialog(it) }, ExceptionHandler.rx()))
+                compositeSubscription.add(adapter.getCopyMessageFlowable().subscribe({ copyMessageToClipboard(it) }, ExceptionHandler.rx()))
+            }
+        }
+
+        viewModel.messages.observe(viewLifecycleOwner) {
+            markMessagesAsRead(it)
+            chatAdapter?.submitList(it)
         }
-        compositeSubscription.add(
-            observable.subscribe(
-                { member ->
-                    setReceivingUser(member.username, member.id)
-                    activity?.title = member.displayName
-                    chatAdapter = InboxAdapter(viewModel.user.value, member)
-                    chatAdapter?.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
-                        override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
-                            if (positionStart == 0) {
-                                binding?.recyclerView?.scrollToPosition(0)
-                            }
-                        }
-                    })
-                    viewModel.messages.observe(this.viewLifecycleOwner) {
-                        markMessagesAsRead(it)
-                        chatAdapter?.submitList(it)
-                    }
 
-                    binding?.recyclerView?.adapter = chatAdapter
-                    binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
-                    chatAdapter?.let { adapter ->
-                        compositeSubscription.add(
-                            adapter.getUserLabelClickFlowable().subscribe(
-                                {
-                                    FullProfileActivity.open(it)
-                                },
-                                RxErrorHandler.handleEmptyError()
-                            )
-                        )
-                        compositeSubscription.add(adapter.getDeleteMessageFlowable().subscribe({ this.showDeleteConfirmationDialog(it) }, RxErrorHandler.handleEmptyError()))
-                        compositeSubscription.add(adapter.getFlagMessageClickFlowable().subscribe({ this.showFlagConfirmationDialog(it) }, RxErrorHandler.handleEmptyError()))
-                        compositeSubscription.add(adapter.getCopyMessageFlowable().subscribe({ this.copyMessageToClipboard(it) }, RxErrorHandler.handleEmptyError()))
-                    }
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
 
         binding?.chatBarView?.sendAction = { sendMessage(it) }
         binding?.chatBarView?.maxChatLength = configManager.maxChatLength()
@@ -196,7 +196,7 @@ class InboxMessageListFragment : BaseMainFragment<FragmentInboxMessageListBindin
                 {
                     refreshConversation()
                 },
-                RxErrorHandler.handleEmptyError()
+                ExceptionHandler.rx()
             )
         refreshConversation()
     }
@@ -210,39 +210,29 @@ class InboxMessageListFragment : BaseMainFragment<FragmentInboxMessageListBindin
 
     private fun refreshConversation() {
         if (viewModel.memberID?.isNotBlank() != true) { return }
-        compositeSubscription.add(
-            this.socialRepository.retrieveInboxMessages(replyToUserUUID ?: "", 0)
-                .subscribe(
-                    {}, RxErrorHandler.handleEmptyError(),
-                    {
-                        viewModel.invalidateDataSource()
-                    }
-                )
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            socialRepository.retrieveInboxMessages(replyToUserUUID ?: "", 0)
+            viewModel.invalidateDataSource()
+        }
     }
 
     private fun sendMessage(chatText: String) {
         viewModel.memberID?.let { userID ->
-            socialRepository.postPrivateMessage(userID, chatText)
-                .delay(200, TimeUnit.MILLISECONDS)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(
-                    {
-                        viewModel.invalidateDataSource()
-                    },
-                    { error ->
-                        RxErrorHandler.reportError(error)
-                        binding?.let {
-                            val alert = HabiticaAlertDialog(it.chatBarView.context)
-                            alert.setTitle("You cannot reply to this conversation")
-                            alert.setMessage("This user is unable to receive your private message")
-                            alert.addOkButton()
-                            alert.show()
-                        }
-                        binding?.chatBarView?.message = chatText
-                    }
-                )
-            KeyboardUtil.dismissKeyboard(getActivity())
+            lifecycleScope.launch(ExceptionHandler.coroutine { error ->
+                ExceptionHandler.reportError(error)
+                binding?.let {
+                    val alert = HabiticaAlertDialog(it.chatBarView.context)
+                    alert.setTitle("You cannot reply to this conversation")
+                    alert.setMessage("This user is unable to receive your private message")
+                    alert.addOkButton()
+                    alert.show()
+                }
+                binding?.chatBarView?.message = chatText
+            }) {
+                socialRepository.postPrivateMessage(userID, chatText)
+                delay(200.toDuration(DurationUnit.MILLISECONDS))
+                viewModel.invalidateDataSource()
+            }
         }
     }
 
@@ -274,7 +264,7 @@ class InboxMessageListFragment : BaseMainFragment<FragmentInboxMessageListBindin
                 .setTitle(R.string.confirm_delete_tag_title)
                 .setMessage(R.string.confirm_delete_tag_message)
                 .setIcon(android.R.drawable.ic_dialog_alert)
-                .setPositiveButton(R.string.yes) { _, _ -> socialRepository.deleteMessage(chatMessage).subscribe({ }, RxErrorHandler.handleEmptyError()) }
+                .setPositiveButton(R.string.yes) { _, _ -> socialRepository.deleteMessage(chatMessage).subscribe({ }, ExceptionHandler.rx()) }
                 .setNegativeButton(R.string.no, null).show()
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt
index e86c4aeef..d0dd57c43 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxOverviewFragment.kt
@@ -9,6 +9,7 @@ import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
+import androidx.lifecycle.lifecycleScope
 import com.habitrpg.android.habitica.BuildConfig
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
@@ -17,15 +18,16 @@ import com.habitrpg.android.habitica.databinding.DialogChooseMessageRecipientBin
 import com.habitrpg.android.habitica.databinding.FragmentInboxBinding
 import com.habitrpg.android.habitica.extensions.getAgoString
 import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.social.InboxConversation
-import com.habitrpg.common.habitica.views.AvatarView
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
-import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.UsernameLabel
+import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
+import com.habitrpg.common.habitica.views.AvatarView
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class InboxOverviewFragment : BaseMainFragment<FragmentInboxBinding>(), androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener, View.OnClickListener {
@@ -49,7 +51,7 @@ class InboxOverviewFragment : BaseMainFragment<FragmentInboxBinding>(), androidx
         savedInstanceState: Bundle?
     ): View? {
         this.hidesToolbar = true
-        compositeSubscription.add(this.socialRepository.markPrivateMessagesRead(null).subscribe({ }, RxErrorHandler.handleEmptyError()))
+        compositeSubscription.add(this.socialRepository.markPrivateMessagesRead(null).subscribe({ }, ExceptionHandler.rx()))
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 
@@ -67,14 +69,11 @@ class InboxOverviewFragment : BaseMainFragment<FragmentInboxBinding>(), androidx
     }
 
     private fun loadMessages() {
-        compositeSubscription.add(
-            socialRepository.getInboxConversations().subscribe(
-                {
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            socialRepository.getInboxConversations().collect {
                     setInboxMessages(it)
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+                }
+        }
     }
 
     override fun onDestroy() {
@@ -116,18 +115,17 @@ class InboxOverviewFragment : BaseMainFragment<FragmentInboxBinding>(), androidx
                 binding.errorTextView.visibility = View.GONE
                 binding.progressCircular.visibility = View.VISIBLE
                 val username = binding.uuidEditText.text?.toString() ?: ""
-                socialRepository.getMemberWithUsername(username)
-                    .subscribe(
-                        {
-                            alert.dismiss()
-                            openInboxMessages("", username)
-                            binding.progressCircular.visibility = View.GONE
-                        },
-                        {
-                            binding.errorTextView.visibility = View.VISIBLE
-                            binding.progressCircular.visibility = View.GONE
-                        }
-                    )
+                lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                    val member = socialRepository.retrieveMemberWithUsername(username)
+                    if (member != null) {
+                        alert.dismiss()
+                        openInboxMessages("", username)
+                        binding.progressCircular.visibility = View.GONE
+                    } else {
+                        binding.errorTextView.visibility = View.VISIBLE
+                        binding.progressCircular.visibility = View.GONE
+                    }
+                }
             }
             alert.addButton(getString(R.string.action_cancel), false) { _, _ ->
                 thisActivity.dismissKeyboard()
@@ -149,7 +147,7 @@ class InboxOverviewFragment : BaseMainFragment<FragmentInboxBinding>(), androidx
                     {
                         binding?.inboxRefreshLayout?.isRefreshing = false
                     },
-                    RxErrorHandler.handleEmptyError()
+                    ExceptionHandler.rx()
                 )
         )
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.kt
index 3043f06e3..165f63010 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.kt
@@ -10,14 +10,15 @@ import android.view.ViewGroup
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.core.text.toHtml
+import androidx.lifecycle.lifecycleScope
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.databinding.FragmentQuestDetailBinding
 import com.habitrpg.android.habitica.extensions.fromHtml
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.HapticFeedbackManager
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.inventory.Quest
 import com.habitrpg.android.habitica.models.inventory.QuestContent
 import com.habitrpg.android.habitica.models.members.Member
@@ -28,6 +29,12 @@ import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.common.habitica.helpers.MarkdownParser
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 import javax.inject.Named
 
@@ -72,30 +79,22 @@ class QuestDetailFragment : BaseMainFragment<FragmentQuestDetailBinding>() {
         binding?.questCancelButton?.setOnClickListener { onQuestCancel() }
         binding?.questLeaveButton?.setOnClickListener { onQuestLeave() }
 
-        compositeSubscription.add(
-            userRepository.getUserFlowable()
-                .map {
-                    it.party?.id ?: ""
-                }
-                .skipWhile { it.isBlank() }
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.getUser()
+                .map { it?.party?.id }
+                .filterNotNull()
                 .distinctUntilChanged()
-                .flatMap { socialRepository.getGroupFlowable(it) }
-                .doOnNext { updateParty(it) }
-                .map {
-                    it.quest?.key ?: ""
-                }
-                .skipWhile {
-                    it.isBlank()
-                }
+                .flatMapLatest { socialRepository.getGroup(it) }
+                .onEach { updateParty(it) }
+                .map { it?.quest?.key }
+                .filterNotNull()
                 .distinctUntilChanged()
-                .flatMap { inventoryRepository.getQuestContent(it) }
-                .subscribe(
-                    {
-                        updateQuestContent(it)
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
-        )
+                .flatMapLatest { inventoryRepository.getQuestContent(it) }
+                .filterNotNull()
+                .collect {
+                    updateQuestContent(it)
+                }
+        }
     }
 
     private fun updateParty(group: Group?) {
@@ -105,16 +104,12 @@ class QuestDetailFragment : BaseMainFragment<FragmentQuestDetailBinding>() {
         party = group
         quest = group.quest
         setQuestParticipants(group.quest?.participants)
-        compositeSubscription.add(
-            socialRepository.getMember(quest?.leader).subscribe(
-                { member ->
-                    if (context != null && binding?.questLeaderView != null) {
-                        binding?.questLeaderView?.text = context?.getString(R.string.quest_leader_header, member.displayName)
-                    }
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            val member = socialRepository.retrieveMember(quest?.leader)
+            if (context != null && binding?.questLeaderView != null) {
+                binding?.questLeaderView?.text = context?.getString(R.string.quest_leader_header, member?.displayName)
+            }
+            }
 
         val user = userViewModel.user.value
         if (binding?.questResponseWrapper != null) {
@@ -223,7 +218,7 @@ class QuestDetailFragment : BaseMainFragment<FragmentQuestDetailBinding>() {
                 val party = party
                 if (party != null) {
                     socialRepository.forceStartQuest(party)
-                        .subscribe({ }, RxErrorHandler.handleEmptyError())
+                        .subscribe({ }, ExceptionHandler.rx())
                 }
             }
             alert.addButton(R.string.no, false)
@@ -239,10 +234,12 @@ class QuestDetailFragment : BaseMainFragment<FragmentQuestDetailBinding>() {
                     .setMessage(R.string.quest_abort_message)
                     .setPositiveButton(R.string.yes) { _, _ ->
                         party?.id?.let { partyID ->
-                            @Suppress("DEPRECATION")
                             socialRepository.abortQuest(partyID)
-                                .flatMap { userRepository.retrieveUser() }
-                                .subscribe({ getActivity()?.supportFragmentManager?.popBackStack() }, RxErrorHandler.handleEmptyError())
+                                .subscribe({
+                                    lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                                        userRepository.retrieveUser(true)
+                                    }
+                                    getActivity()?.supportFragmentManager?.popBackStack() }, ExceptionHandler.rx())
                         }
                     }.setNegativeButton(R.string.no) { _, _ -> }
                 builder.show()
@@ -251,10 +248,13 @@ class QuestDetailFragment : BaseMainFragment<FragmentQuestDetailBinding>() {
                 alert.setMessage(R.string.quest_cancel_message)
                 alert.addButton(R.string.yes, true) { _, _ ->
                     party?.id?.let { partyID ->
-                        @Suppress("DEPRECATION")
                         socialRepository.cancelQuest(partyID)
-                            .flatMap { userRepository.retrieveUser() }
-                            .subscribe({ getActivity()?.supportFragmentManager?.popBackStack() }, RxErrorHandler.handleEmptyError())
+                            .subscribe({
+                                lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                                    userRepository.retrieveUser(true)
+                                }
+                                getActivity()?.supportFragmentManager?.popBackStack()
+                                       }, ExceptionHandler.rx())
                     }
                 }
                 alert.addButton(R.string.no, false)
@@ -269,11 +269,13 @@ class QuestDetailFragment : BaseMainFragment<FragmentQuestDetailBinding>() {
             .setMessage(if (quest?.active == true) R.string.quest_leave_message else R.string.quest_leave_message_nostart)
             .setPositiveButton(R.string.yes) { _, _ ->
                 party?.id?.let { partyID ->
-                    @Suppress("DEPRECATION")
                     socialRepository.leaveQuest(partyID)
-                        .flatMap { userRepository.retrieveUser() }
-                        .flatMap { socialRepository.retrieveGroup(partyID) }
-                        .subscribe({ getActivity()?.supportFragmentManager?.popBackStack() }, RxErrorHandler.handleEmptyError())
+                        .subscribe({
+                            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                                socialRepository.retrieveGroup(partyID)
+                                userRepository.retrieveUser(true)
+                            }
+                            getActivity()?.supportFragmentManager?.popBackStack() }, ExceptionHandler.rx())
                 }
             }.setNegativeButton(R.string.no) { _, _ -> }
         builder.show()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernDetailFragment.kt
index 76697e5fe..a1788d525 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernDetailFragment.kt
@@ -11,6 +11,7 @@ import android.widget.FrameLayout
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
+import androidx.lifecycle.lifecycleScope
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.InventoryRepository
@@ -19,8 +20,8 @@ import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.databinding.FragmentTavernDetailBinding
 import com.habitrpg.android.habitica.extensions.setTintWith
 import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.inventory.QuestContent
 import com.habitrpg.android.habitica.models.social.Group
 import com.habitrpg.android.habitica.models.user.User
@@ -29,6 +30,11 @@ import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.UsernameLabel
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.common.habitica.models.PlayerTier
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class TavernDetailFragment : BaseFragment<FragmentTavernDetailBinding>() {
@@ -73,33 +79,30 @@ class TavernDetailFragment : BaseFragment<FragmentTavernDetailBinding>() {
         addPlayerTiers()
         bindButtons()
 
-        compositeSubscription.add(
-            socialRepository.getGroupFlowable(Group.TAVERN_ID)
-                .doOnNext { if (!it.hasActiveQuest) binding?.worldBossSection?.visibility = View.GONE }
-                .filter { it.hasActiveQuest }
-                .doOnNext {
-                    binding?.questProgressView?.progress = it.quest
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            socialRepository.getGroup(Group.TAVERN_ID)
+                .onEach { if (it?.hasActiveQuest == false) binding?.worldBossSection?.visibility = View.GONE }
+                .filter { it != null && it.hasActiveQuest }
+                .onEach {
+                    binding?.questProgressView?.progress = it?.quest
                     binding?.shopHeader?.descriptionView?.setText(R.string.tavern_description_world_boss)
-                    val filtered = it.quest?.rageStrikes?.filter { strike -> strike.key == "tavern" }
-                    if (filtered?.size ?: 0 > 0 && filtered?.get(0)?.wasHit == true) {
+                    val filtered = it?.quest?.rageStrikes?.filter { strike -> strike.key == "tavern" }
+                    if ((filtered?.size ?: 0) > 0 && filtered?.get(0)?.wasHit == true) {
                         val key = it.quest?.key
                         if (key != null) {
                             shopSpriteSuffix = key
                         }
                     }
                 }
-                .flatMapMaybe { inventoryRepository.getQuestContent(it.quest?.key ?: "").firstElement() }
-                .subscribe(
-                    {
-                        binding?.questProgressView?.quest = it
-                        binding?.worldBossSection?.visibility = View.VISIBLE
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
-        )
-
-        compositeSubscription.add(socialRepository.retrieveGroup(Group.TAVERN_ID).subscribe({ }, RxErrorHandler.handleEmptyError()))
+                .map { inventoryRepository.getQuestContent(it?.quest?.key ?: "").firstOrNull() }
+                .collect {
+                    binding?.questProgressView?.quest = it
+                    binding?.worldBossSection?.visibility = View.VISIBLE
+                }
+        }
 
+        lifecycleScope.launch(ExceptionHandler.coroutine()) { socialRepository.retrieveGroup(Group.TAVERN_ID) }
+        
         user?.let { binding?.questProgressView?.configure(it) }
     }
 
@@ -112,7 +115,9 @@ class TavernDetailFragment : BaseFragment<FragmentTavernDetailBinding>() {
 
     private fun bindButtons() {
         binding?.innButton?.setOnClickListener {
-            user?.let { user -> userRepository.sleep(user).subscribe({ }, RxErrorHandler.handleEmptyError()) }
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                user?.let { user -> userRepository.sleep(user) }
+            }
         }
         binding?.guidelinesButton?.setOnClickListener {
             MainNavigationController.navigate(R.id.guidelinesActivity)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailFragment.kt
index d42a2462c..ca8aeef27 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailFragment.kt
@@ -11,6 +11,7 @@ import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.net.toUri
+import androidx.lifecycle.lifecycleScope
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.ChallengeRepository
@@ -19,8 +20,8 @@ import com.habitrpg.android.habitica.databinding.DialogChallengeDetailTaskGroupB
 import com.habitrpg.android.habitica.databinding.FragmentChallengeDetailBinding
 import com.habitrpg.android.habitica.extensions.addCloseButton
 import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.social.Challenge
 import com.habitrpg.android.habitica.models.tasks.Task
@@ -32,11 +33,12 @@ import com.habitrpg.android.habitica.ui.viewHolders.tasks.HabitViewHolder
 import com.habitrpg.android.habitica.ui.viewHolders.tasks.RewardViewHolder
 import com.habitrpg.android.habitica.ui.viewHolders.tasks.TodoViewHolder
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.common.habitica.helpers.EmojiParser
 import com.habitrpg.common.habitica.helpers.setMarkdown
 import com.habitrpg.shared.habitica.models.tasks.TaskType
-import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import kotlinx.coroutines.launch
 import retrofit2.HttpException
 import javax.inject.Inject
 
@@ -101,10 +103,11 @@ class ChallengeDetailFragment : BaseMainFragment<FragmentChallengeDetailBinding>
                         return@map (it.leaderId ?: "")
                     }
                     .filter { it.isNotEmpty() }
-                    .flatMap { creatorID ->
-                        return@flatMap socialRepository.getMember(creatorID)
-                    }
-                    .subscribe({ set(it) }, RxErrorHandler.handleEmptyError())
+                    .subscribe({
+                        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                            set(socialRepository.retrieveMember(it))
+                        }
+                        }, ExceptionHandler.rx())
             )
             compositeSubscription.add(
                 challengeRepository.getChallengeTasks(id).subscribe(
@@ -142,7 +145,7 @@ class ChallengeDetailFragment : BaseMainFragment<FragmentChallengeDetailBinding>
                             addRewards(rewards)
                         }
                     },
-                    RxErrorHandler.handleEmptyError()
+                    ExceptionHandler.rx()
                 )
             )
 
@@ -151,7 +154,7 @@ class ChallengeDetailFragment : BaseMainFragment<FragmentChallengeDetailBinding>
                     { isMember ->
                         setJoined(isMember)
                     },
-                    RxErrorHandler.handleEmptyError()
+                    ExceptionHandler.rx()
                 )
             )
         }
@@ -159,8 +162,11 @@ class ChallengeDetailFragment : BaseMainFragment<FragmentChallengeDetailBinding>
         binding?.joinButton?.setOnClickListener {
             challenge?.let { challenge ->
                 challengeRepository.joinChallenge(challenge)
-                    .flatMap { userRepository.retrieveUser(true) }
-                    .subscribe({}, RxErrorHandler.handleEmptyError())
+                    .subscribe({
+                               lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                                   userRepository.retrieveUser(true)
+                               }
+                    }, ExceptionHandler.rx())
             }
         }
         binding?.leaveButton?.setOnClickListener { showChallengeLeaveDialog() }
@@ -230,7 +236,7 @@ class ChallengeDetailFragment : BaseMainFragment<FragmentChallengeDetailBinding>
                     if (it is HttpException && it.code() == 404) {
                         MainNavigationController.navigateBack()
                     }
-                    RxErrorHandler.reportError(it)
+                    ExceptionHandler.reportError(it)
                 })
         }
     }
@@ -245,7 +251,8 @@ class ChallengeDetailFragment : BaseMainFragment<FragmentChallengeDetailBinding>
         binding?.participantCount?.text = challenge.memberCount.toString()
     }
 
-    private fun set(creator: Member) {
+    private fun set(creator: Member?) {
+        if (creator == null) return
         binding?.creatorAvatarview?.setAvatar(creator)
         binding?.creatorLabel?.tier = creator.contributor?.level ?: 0
         binding?.creatorLabel?.username = creator.displayName
@@ -267,7 +274,7 @@ class ChallengeDetailFragment : BaseMainFragment<FragmentChallengeDetailBinding>
         for (i in 0 until habits.size) {
             val task = habits[i]
             val entry = groupBinding.tasksLayout.inflate(R.layout.habit_item_card)
-            val viewHolder = HabitViewHolder(entry, { _, _ -> }, {}, {})
+            val viewHolder = HabitViewHolder(entry, { _, _ -> }, {}, {}, null)
             viewHolder.isLocked = true
             viewHolder.bind(task, i, "normal")
             groupBinding.tasksLayout.addView(entry)
@@ -282,7 +289,7 @@ class ChallengeDetailFragment : BaseMainFragment<FragmentChallengeDetailBinding>
         for (i in 0 until dailies.size) {
             val task = dailies[i]
             val entry = groupBinding.tasksLayout.inflate(R.layout.daily_item_card)
-            val viewHolder = DailyViewHolder(entry, { _, _ -> }, { _, _ -> }, {}, {})
+            val viewHolder = DailyViewHolder(entry, { _, _ -> }, { _, _ -> }, {}, {}, null)
             viewHolder.isLocked = true
             viewHolder.bind(task, i, "normal")
             groupBinding.tasksLayout.addView(entry)
@@ -297,7 +304,7 @@ class ChallengeDetailFragment : BaseMainFragment<FragmentChallengeDetailBinding>
         for (i in 0 until todos.size) {
             val task = todos[i]
             val entry = groupBinding.tasksLayout.inflate(R.layout.todo_item_card)
-            val viewHolder = TodoViewHolder(entry, { _, _ -> }, { _, _ -> }, {}, {})
+            val viewHolder = TodoViewHolder(entry, { _, _ -> }, { _, _ -> }, {}, {}, null)
             viewHolder.isLocked = true
             viewHolder.bind(task, i, "normal")
             groupBinding.tasksLayout.addView(entry)
@@ -312,9 +319,9 @@ class ChallengeDetailFragment : BaseMainFragment<FragmentChallengeDetailBinding>
         for (i in 0 until rewards.size) {
             val task = rewards[i]
             val entry = groupBinding.tasksLayout.inflate(R.layout.reward_item_card)
-            val viewHolder = RewardViewHolder(entry, { _, _ -> }, {}, {})
+            val viewHolder = RewardViewHolder(entry, { _, _ -> }, {}, {}, null)
             viewHolder.isLocked = true
-            viewHolder.bind(task, i, true, "normal")
+            viewHolder.bind(task, i, true, "normal", null)
             groupBinding.tasksLayout.addView(entry)
         }
     }
@@ -335,11 +342,11 @@ class ChallengeDetailFragment : BaseMainFragment<FragmentChallengeDetailBinding>
         alert.setMessage(this.getString(R.string.challenge_leave_description))
         alert.addButton(R.string.leave_keep_tasks, true) { _, _ ->
             val challenge = challenge ?: return@addButton
-            challengeRepository.leaveChallenge(challenge, "keep-all").subscribe({}, RxErrorHandler.handleEmptyError())
+            challengeRepository.leaveChallenge(challenge, "keep-all").subscribe({}, ExceptionHandler.rx())
         }
         alert.addButton(R.string.leave_delete_tasks, isPrimary = false, isDestructive = true) { _, _ ->
             val challenge = challenge ?: return@addButton
-            challengeRepository.leaveChallenge(challenge, "remove-all").subscribe({}, RxErrorHandler.handleEmptyError())
+            challengeRepository.leaveChallenge(challenge, "remove-all").subscribe({}, ExceptionHandler.rx())
         }
         alert.setExtraCloseButtonVisibility(View.VISIBLE)
         alert.show()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt
index 7816db106..5587f488d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
@@ -11,8 +12,8 @@ import com.habitrpg.android.habitica.data.ChallengeRepository
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.social.Challenge
 import com.habitrpg.android.habitica.models.social.Group
 import com.habitrpg.android.habitica.modules.AppModule
@@ -21,7 +22,8 @@ import com.habitrpg.android.habitica.ui.fragments.BaseFragment
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
 import com.habitrpg.common.habitica.helpers.EmptyItem
 import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.kotlin.Flowables
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 import javax.inject.Named
 
@@ -66,7 +68,7 @@ class ChallengeListFragment : BaseFragment<FragmentRefreshRecyclerviewBinding>()
         super.onViewCreated(view, savedInstanceState)
 
         challengeAdapter = ChallengesListViewAdapter(viewUserChallengesOnly, userId)
-        challengeAdapter?.getOpenDetailFragmentFlowable()?.subscribe({ openDetailFragment(it) }, RxErrorHandler.handleEmptyError())
+        challengeAdapter?.getOpenDetailFragmentFlowable()?.subscribe({ openDetailFragment(it) }, ExceptionHandler.rx())
             ?.let { compositeSubscription.add(it) }
 
         binding?.refreshLayout?.setOnRefreshListener(this)
@@ -83,16 +85,15 @@ class ChallengeListFragment : BaseFragment<FragmentRefreshRecyclerviewBinding>()
             binding?.recyclerView?.setBackgroundResource(R.color.content_background)
         }
 
-        compositeSubscription.add(
-            Flowables.combineLatest(socialRepository.getGroupFlowable(Group.TAVERN_ID), socialRepository.getUserGroups("guild")).subscribe(
-                {
-                    this.filterGroups = mutableListOf()
-                    filterGroups?.add(it.first)
-                    filterGroups?.addAll(it.second)
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            socialRepository.getGroup(Group.TAVERN_ID).combine(socialRepository.getUserGroups("guild")) { tavern, guilds ->
+                return@combine Pair(tavern, guilds)
+            }.collect {
+                this@ChallengeListFragment.filterGroups = mutableListOf()
+                it.first?.let { tavern -> filterGroups?.add(tavern) }
+                filterGroups?.addAll(it.second)
+            }
+        }
 
         binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
 
@@ -144,7 +145,7 @@ class ChallengeListFragment : BaseFragment<FragmentRefreshRecyclerviewBinding>()
                     this.challenges = challenges
                     challengeAdapter?.updateUnfilteredData(challenges)
                 },
-                RxErrorHandler.handleEmptyError()
+                ExceptionHandler.rx()
             )
         )
     }
@@ -164,7 +165,7 @@ class ChallengeListFragment : BaseFragment<FragmentRefreshRecyclerviewBinding>()
                     }
                     nextPageToLoad += 1
                 },
-                RxErrorHandler.handleEmptyError()
+                ExceptionHandler.rx()
             )
         )
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildListFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildListFragment.kt
index 7b090ab0a..848024aa1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildListFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildListFragment.kt
@@ -5,17 +5,19 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.widget.SearchView
+import androidx.lifecycle.lifecycleScope
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.ui.adapter.social.GuildListAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
-import com.habitrpg.common.habitica.helpers.EmptyItem
 import com.habitrpg.android.habitica.ui.helpers.KeyboardUtil
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
+import com.habitrpg.common.habitica.helpers.EmptyItem
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class GuildListFragment : BaseFragment<FragmentRefreshRecyclerviewBinding>(), SearchView.OnQueryTextListener, SearchView.OnCloseListener, SwipeRefreshLayout.OnRefreshListener {
@@ -52,7 +54,12 @@ class GuildListFragment : BaseFragment<FragmentRefreshRecyclerviewBinding>(), Se
 
         viewAdapter.onlyShowUsersGuilds = onlyShowUsersGuilds
         if (onlyShowUsersGuilds) {
-            compositeSubscription.add(socialRepository.getUserGroups("guild").subscribe({ viewAdapter.setUnfilteredData(it) }, RxErrorHandler.handleEmptyError()))
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                socialRepository.getUserGroups("guild")
+                    .collect {
+                        viewAdapter.setUnfilteredData(it)
+                    }
+            }
         } else {
             compositeSubscription.add(
                 this.socialRepository.getPublicGuilds()
@@ -60,7 +67,7 @@ class GuildListFragment : BaseFragment<FragmentRefreshRecyclerviewBinding>(), Se
                         { groups ->
                             this@GuildListFragment.viewAdapter.setUnfilteredData(groups)
                         },
-                        RxErrorHandler.handleEmptyError()
+                        ExceptionHandler.rx()
                     )
             )
         }
@@ -79,7 +86,7 @@ class GuildListFragment : BaseFragment<FragmentRefreshRecyclerviewBinding>(), Se
                     {
                         binding?.refreshLayout?.isRefreshing = false
                     },
-                    RxErrorHandler.handleEmptyError()
+                    ExceptionHandler.rx()
                 )
         )
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/NoPartyFragmentFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/NoPartyFragmentFragment.kt
index eeb1199d5..1843af8bd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/NoPartyFragmentFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/NoPartyFragmentFragment.kt
@@ -16,21 +16,23 @@ import android.widget.TextView
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.graphics.drawable.toBitmap
 import androidx.core.os.bundleOf
+import androidx.lifecycle.lifecycleScope
 import com.google.firebase.analytics.FirebaseAnalytics
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.databinding.FragmentNoPartyBinding
 import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import com.habitrpg.common.habitica.views.AvatarView
 import com.habitrpg.android.habitica.ui.activities.GroupFormActivity
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import com.habitrpg.common.habitica.extensions.DataBindingUtils
-import com.habitrpg.common.habitica.helpers.setMarkdown
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
+import com.habitrpg.common.habitica.extensions.DataBindingUtils
+import com.habitrpg.common.habitica.helpers.setMarkdown
+import com.habitrpg.common.habitica.views.AvatarView
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 import kotlin.math.roundToInt
 
@@ -64,36 +66,34 @@ class NoPartyFragmentFragment : BaseMainFragment<FragmentNoPartyBinding>() {
         binding?.refreshLayout?.setOnRefreshListener { this.refresh() }
 
         binding?.invitationsView?.acceptCall = {
-            socialRepository.joinGroup(it)
-                .flatMap { userRepository.retrieveUser(false) }
-                .subscribe(
-                    {
-                        parentFragmentManager.popBackStack()
-                        MainNavigationController.navigate(
-                            R.id.partyFragment,
-                            bundleOf(Pair("partyID", userViewModel.partyID))
-                        )
-                    },
-                    RxErrorHandler.handleEmptyError()
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                socialRepository.joinGroup(it)
+                userRepository.retrieveUser(false)
+                parentFragmentManager.popBackStack()
+                MainNavigationController.navigate(
+                    R.id.partyFragment,
+                    bundleOf(Pair("partyID", userViewModel.partyID))
                 )
+            }
         }
 
         binding?.invitationsView?.rejectCall = {
-            socialRepository.rejectGroupInvite(it).subscribe({ }, RxErrorHandler.handleEmptyError())
+            socialRepository.rejectGroupInvite(it).subscribe({ }, ExceptionHandler.rx())
             binding?.invitationWrapper?.visibility = View.GONE
         }
 
-        binding?.invitationsView?.setLeader = { leader ->
-            compositeSubscription.add(
-                socialRepository.getMember(leader)
-                    .subscribe(
-                        {
-                            binding?.root?.findViewById<AvatarView>(R.id.groupleader_avatar_view)?.setAvatar(it)
-                            binding?.root?.findViewById<TextView>(R.id.groupleader_text_view)?.text = getString(R.string.invitation_title, it.displayName, binding?.invitationsView?.groupName)
-                        },
-                        RxErrorHandler.handleEmptyError()
-                    )
-            )
+        binding?.invitationsView?.setLeader = { leaderID ->
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                val leader = socialRepository.retrieveMember(leaderID) ?: return@launch
+                binding?.root?.findViewById<AvatarView>(R.id.groupleader_avatar_view)
+                                ?.setAvatar(leader)
+                binding?.root?.findViewById<TextView>(R.id.groupleader_text_view)?.text =
+                                getString(
+                                    R.string.invitation_title,
+                                    leader.displayName,
+                                    binding?.invitationsView?.groupName
+                                )
+            }
         }
 
         binding?.usernameTextview?.setOnClickListener {
@@ -153,42 +153,38 @@ class NoPartyFragmentFragment : BaseMainFragment<FragmentNoPartyBinding>() {
         if (it.resultCode == Activity.RESULT_OK) {
             val bundle = it.data?.extras
             if (bundle?.getString("groupType") == "party") {
-                socialRepository.createGroup(
-                    bundle.getString("name"),
-                    bundle.getString("description"),
-                    bundle.getString("leader"),
-                    "party",
-                    bundle.getString("privacy"),
-                    bundle.getBoolean("leaderCreateChallenge")
-                )
-                    .flatMap {
+                    lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                        val group = socialRepository.createGroup(
+                            bundle.getString("name"),
+                            bundle.getString("description"),
+                            bundle.getString("leader"),
+                            "party",
+                            bundle.getString("privacy"),
+                            bundle.getBoolean("leaderCreateChallenge")
+                        )
                         userRepository.retrieveUser(false)
+                        if (isAdded) {
+                            parentFragmentManager.popBackStack()
+                        }
+                        MainNavigationController.navigate(
+                            R.id.partyFragment,
+                            bundleOf(Pair("partyID", userViewModel.partyID))
+                        )
                     }
-                    .subscribe(
-                        {
-                            if (isAdded) {
-                                parentFragmentManager.popBackStack()
-                            }
-                            MainNavigationController.navigate(
-                                R.id.partyFragment,
-                                bundleOf(Pair("partyID", userViewModel.partyID))
-                            )
-                        },
-                        RxErrorHandler.handleEmptyError()
-                    )
             }
         }
     }
 
     private fun refresh() {
-        compositeSubscription.add(
-            userRepository.retrieveUser(false, forced = true)
-                .filter { it.hasParty }
-                .flatMap { socialRepository.retrieveGroup("party") }
-                .flatMap { group1 -> socialRepository.retrieveGroupMembers(group1.id, true) }
-                .doOnComplete { binding?.refreshLayout?.isRefreshing = false }
-                .subscribe({ }, RxErrorHandler.handleEmptyError())
-        )
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            val user = userRepository.retrieveUser(false, true)
+            if (user?.hasParty == true) {
+                lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                    val group = socialRepository.retrieveGroup("party")
+                    socialRepository.retrievePartyMembers(group?.id ?: "", true)
+                }
+            }
+        }
     }
 
     override fun onDestroy() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt
index 134d560ca..a24a53493 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyDetailFragment.kt
@@ -17,32 +17,33 @@ import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.databinding.FragmentPartyDetailBinding
-import com.habitrpg.common.habitica.extensions.dpToPx
 import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.HapticFeedbackManager
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.inventory.QuestContent
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.social.Challenge
 import com.habitrpg.android.habitica.models.social.Group
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.modules.AppModule
-import com.habitrpg.common.habitica.views.AvatarView
 import com.habitrpg.android.habitica.ui.activities.FullProfileActivity
 import com.habitrpg.android.habitica.ui.activities.MainActivity
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
 import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemDialogFragment
-import com.habitrpg.common.habitica.extensions.DataBindingUtils
 import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
-import com.habitrpg.common.habitica.extensions.loadImage
-import com.habitrpg.common.habitica.helpers.setMarkdown
 import com.habitrpg.android.habitica.ui.viewHolders.GroupMemberViewHolder
 import com.habitrpg.android.habitica.ui.viewmodels.PartyViewModel
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
+import com.habitrpg.common.habitica.extensions.DataBindingUtils
+import com.habitrpg.common.habitica.extensions.dpToPx
+import com.habitrpg.common.habitica.extensions.loadImage
+import com.habitrpg.common.habitica.helpers.setMarkdown
+import com.habitrpg.common.habitica.views.AvatarView
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 import javax.inject.Named
@@ -95,28 +96,29 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
 
         binding?.invitationsView?.acceptCall = {
             viewModel?.joinGroup(it) {
-                compositeSubscription.add(
-                    userRepository.retrieveUser(false)
-                        .subscribe { user ->
-                            parentFragmentManager.popBackStack()
-                            MainNavigationController.navigate(
-                                R.id.partyFragment,
-                                bundleOf(Pair("partyID", user.party?.id))
-                            )
-                        }
-                )
+                lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                    val user = userRepository.retrieveUser(false)
+                    parentFragmentManager.popBackStack()
+                    MainNavigationController.navigate(
+                        R.id.partyFragment,
+                        bundleOf(Pair("partyID", user?.party?.id))
+                    )
+                }
             }
         }
 
         binding?.invitationsView?.rejectCall = {
             socialRepository.rejectGroupInvite(it)
-                .flatMap { userRepository.retrieveUser(false, true) }
-                .subscribe({ }, RxErrorHandler.handleEmptyError())
+                .subscribe({
+                           lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                               userRepository.retrieveUser(false, true)
+                           }
+                }, ExceptionHandler.rx())
         }
 
-        viewModel?.getGroupData()?.observe(viewLifecycleOwner, { updateParty(it) })
-        viewModel?.user?.observe(viewLifecycleOwner, { updateUser(it) })
-        viewModel?.getMembersData()?.observe(viewLifecycleOwner, { updateMembersList(it) })
+        viewModel?.getGroupData()?.observe(viewLifecycleOwner) { updateParty(it) }
+        viewModel?.user?.observe(viewLifecycleOwner) { updateUser(it) }
+        viewModel?.getMembersData()?.observe(viewLifecycleOwner) { updateMembersList(it) }
     }
 
     private fun refreshParty() {
@@ -141,8 +143,10 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
             binding?.questImageWrapper?.visibility = View.VISIBLE
             lifecycleScope.launch(Dispatchers.Main) {
                 delay(500)
-                inventoryRepository.getQuestContent(party.quest?.key ?: "")
-                    .subscribe({ this@PartyDetailFragment.updateQuestContent(it) }, RxErrorHandler.handleEmptyError())
+                val content = inventoryRepository.getQuestContent(party.quest?.key ?: "").firstOrNull()
+                if (content != null) {
+                    updateQuestContent(content)
+                }
             }
         } else {
             binding?.newQuestButton?.visibility = View.VISIBLE
@@ -184,16 +188,17 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
                     val groupName = invitation.name
 
                     leaderID.let { id ->
-                        compositeSubscription.add(
-                            socialRepository.getMember(id)
-                                .subscribe(
-                                    { member ->
-                                        binding?.root?.findViewById<AvatarView>(R.id.groupleader_avatar_view)?.setAvatar(member)
-                                        binding?.root?.findViewById<TextView>(R.id.groupleader_text_view)?.text = getString(R.string.invitation_title, member.displayName, groupName)
-                                    },
-                                    RxErrorHandler.handleEmptyError()
+                        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                            val member = socialRepository.retrieveMember(id) ?: return@launch
+                            binding?.root?.findViewById<AvatarView>(R.id.groupleader_avatar_view)
+                                ?.setAvatar(member)
+                            binding?.root?.findViewById<TextView>(R.id.groupleader_text_view)?.text =
+                                getString(
+                                    R.string.invitation_title,
+                                    member.displayName,
+                                    groupName
                                 )
-                        )
+                        }
                     }
 
                     view?.findViewById<Button>(R.id.accept_button)?.setOnClickListener {
@@ -263,7 +268,7 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
         val leaderID = viewModel?.leaderID
         members?.forEachIndexed { index, member ->
             val memberView = (
-                if (binding?.membersWrapper?.childCount ?: 0 > index) {
+                if ((binding?.membersWrapper?.childCount ?: 0) > index) {
                     binding?.membersWrapper?.getChildAt(index)
                 } else {
                     val view = binding?.membersWrapper?.inflate(R.layout.party_member, false)
@@ -299,18 +304,15 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
 
         val addMessageDialog = context?.let { HabiticaAlertDialog(it) }
         addMessageDialog?.addButton(android.R.string.ok, true) { _, _ ->
-            socialRepository.postPrivateMessage(userID, emojiEditText.text.toString())
-                .subscribe(
-                    {
-                        (activity as? MainActivity)?.snackbarContainer?.let { it1 ->
-                            HabiticaSnackbar.showSnackbar(
-                                it1,
-                                String.format(getString(R.string.profile_message_sent_to), username), HabiticaSnackbar.SnackbarDisplayType.NORMAL
-                            )
-                        }
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                socialRepository.postPrivateMessage(userID, emojiEditText.text.toString())
+                (activity as? MainActivity)?.snackbarContainer?.let { it1 ->
+                    HabiticaSnackbar.showSnackbar(
+                        it1,
+                        String.format(getString(R.string.profile_message_sent_to), username), HabiticaSnackbar.SnackbarDisplayType.NORMAL
+                    )
+                }
+            }
             activity?.dismissKeyboard()
         }
         addMessageDialog?.addButton(android.R.string.cancel, false) { _, _ -> activity?.dismissKeyboard() }
@@ -321,18 +323,15 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
     private fun showTransferOwnerShipDialog(userID: String, displayName: String) {
         val dialog = context?.let { HabiticaAlertDialog(it) }
         dialog?.addButton(R.string.transfer, true) { _, _ ->
-            socialRepository.transferGroupOwnership(viewModel?.groupID ?: "", userID)
-                .subscribe(
-                    {
-                        (activity as? MainActivity)?.snackbarContainer?.let { it1 ->
-                            HabiticaSnackbar.showSnackbar(
-                                it1,
-                                String.format(getString(R.string.transferred_ownership), displayName), HabiticaSnackbar.SnackbarDisplayType.NORMAL
-                            )
-                        }
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                socialRepository.transferGroupOwnership(viewModel?.groupID ?: "", userID)
+                (activity as? MainActivity)?.snackbarContainer?.let { it1 ->
+                    HabiticaSnackbar.showSnackbar(
+                        it1,
+                        String.format(getString(R.string.transferred_ownership), displayName), HabiticaSnackbar.SnackbarDisplayType.NORMAL
+                    )
+                }
+            }
             activity?.dismissKeyboard()
         }
         dialog?.addButton(android.R.string.cancel, false) { _, _ -> activity?.dismissKeyboard() }
@@ -344,18 +343,15 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
     private fun showRemoveMemberDialog(userID: String, displayName: String) {
         val dialog = context?.let { HabiticaAlertDialog(it) }
         dialog?.addButton(R.string.remove, true) { _, _ ->
-            socialRepository.removeMemberFromGroup(viewModel?.groupID ?: "", userID)
-                .subscribe(
-                    {
-                        (activity as? MainActivity)?.snackbarContainer?.let { it1 ->
-                            HabiticaSnackbar.showSnackbar(
-                                it1,
-                                String.format(getString(R.string.removed_member), displayName), HabiticaSnackbar.SnackbarDisplayType.NORMAL
-                            )
-                        }
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
+            lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                socialRepository.removeMemberFromGroup(viewModel?.groupID ?: "", userID)
+                (activity as? MainActivity)?.snackbarContainer?.let { it1 ->
+                    HabiticaSnackbar.showSnackbar(
+                        it1,
+                        String.format(getString(R.string.removed_member), displayName), HabiticaSnackbar.SnackbarDisplayType.NORMAL
+                    )
+                }
+            }
             activity?.dismissKeyboard()
         }
         dialog?.addButton(android.R.string.cancel, false) { _, _ -> activity?.dismissKeyboard() }
@@ -373,7 +369,7 @@ class PartyDetailFragment : BaseFragment<FragmentPartyDetailBinding>() {
     }
 
     private fun getGroupChallenges(): List<Challenge> {
-        var groupChallenges = mutableListOf<Challenge>()
+        val groupChallenges = mutableListOf<Challenge>()
         userRepository.getUserFlowable().forEach {
             it.challenges?.forEach {
                 challengeRepository.getChallenge(it.challengeID).forEach {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/BugFixFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/BugFixFragment.kt
index 67b8961c7..bddbfc9a6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/BugFixFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/BugFixFragment.kt
@@ -14,17 +14,18 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.databinding.FragmentSupportBugFixBinding
 import com.habitrpg.android.habitica.databinding.KnownIssueBinding
-import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.common.habitica.helpers.AppTestingLevel
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.modules.AppModule
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
+import com.habitrpg.common.habitica.extensions.layoutInflater
+import com.habitrpg.common.habitica.helpers.AppTestingLevel
 import com.jaredrummler.android.device.DeviceName
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 import javax.inject.Named
-import kotlinx.coroutines.launch
 
 class BugFixFragment : BaseMainFragment<FragmentSupportBugFixBinding>() {
     private var deviceInfo: DeviceName.DeviceInfo? = null
@@ -62,7 +63,7 @@ class BugFixFragment : BaseMainFragment<FragmentSupportBugFixBinding>() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        lifecycleScope.launch {
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
             DeviceName.with(context).request { info, _ ->
                 deviceInfo = info
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQDetailFragment.kt
index d01a7c2be..9c9e8c51f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQDetailFragment.kt
@@ -8,7 +8,7 @@ import android.view.ViewGroup
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.FAQRepository
 import com.habitrpg.android.habitica.databinding.FragmentFaqDetailBinding
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.common.habitica.helpers.MarkdownParser
 import javax.inject.Inject
@@ -48,7 +48,7 @@ class FAQDetailFragment : BaseMainFragment<FragmentFaqDetailBinding>() {
                             binding?.questionTextView?.text = faq.question
                             binding?.answerTextView?.text = MarkdownParser.parseMarkdown(faq.answer)
                         },
-                        RxErrorHandler.handleEmptyError()
+                        ExceptionHandler.rx()
                     )
                 )
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt
index 39c4c28e7..e80d41327 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt
@@ -14,7 +14,7 @@ import com.habitrpg.android.habitica.databinding.FragmentFaqOverviewBinding
 import com.habitrpg.android.habitica.databinding.SupportFaqItemBinding
 import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.common.habitica.helpers.setMarkdown
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
@@ -91,7 +91,7 @@ class FAQOverviewFragment : BaseMainFragment<FragmentFaqOverviewBinding>() {
                         }
                     }
                 },
-                RxErrorHandler.handleEmptyError()
+                ExceptionHandler.rx()
             )
         )
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/SupportMainFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/SupportMainFragment.kt
index 89d424f90..402109bdd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/SupportMainFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/SupportMainFragment.kt
@@ -12,7 +12,7 @@ import com.habitrpg.android.habitica.data.FAQRepository
 import com.habitrpg.android.habitica.databinding.FragmentSupportMainBinding
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.modules.AppModule
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
@@ -61,7 +61,7 @@ class SupportMainFragment : BaseMainFragment<FragmentSupportMainBinding>() {
         binding?.resetTutorialButton?.setOnClickListener {
             userRepository.resetTutorial().subscribe({
                 activity?.showSnackbar(null, null, getString(R.string.tutorial_reset_confirmation), displayType = HabiticaSnackbar.SnackbarDisplayType.SUCCESS)
-            }, RxErrorHandler.handleEmptyError())
+            }, ExceptionHandler.rx())
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt
index 035729ba6..82854c32a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt
@@ -9,19 +9,21 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.content.ContextCompat
+import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.shops.ShopItem
-import com.habitrpg.shared.habitica.models.tasks.TaskType
 import com.habitrpg.android.habitica.ui.activities.MainActivity
 import com.habitrpg.android.habitica.ui.activities.SkillMemberActivity
 import com.habitrpg.android.habitica.ui.adapter.tasks.RewardsRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
+import com.habitrpg.shared.habitica.models.tasks.TaskType
 import io.reactivex.rxjava3.functions.Consumer
+import kotlinx.coroutines.launch
 
 class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() {
 
@@ -33,7 +35,7 @@ class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        compositeSubscription.add(inventoryRepository.retrieveInAppRewards().subscribe({ }, RxErrorHandler.handleEmptyError()))
+        compositeSubscription.add(inventoryRepository.retrieveInAppRewards().subscribe({ }, ExceptionHandler.rx()))
         return super.onCreateView(inflater, container, savedInstanceState)
     }
 
@@ -42,7 +44,7 @@ class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() {
 
         (layoutManager as? GridLayoutManager)?.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
             override fun getSpanSize(position: Int): Int {
-                return if (recyclerAdapter?.getItemViewType(position) ?: 0 < 2) {
+                return if ((recyclerAdapter?.getItemViewType(position) ?: 0) < 2) {
                     (layoutManager as? GridLayoutManager)?.spanCount ?: 1
                 } else {
                     1
@@ -62,7 +64,7 @@ class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() {
                     {
                         (recyclerAdapter as? RewardsRecyclerViewAdapter)?.updateItemRewards(it)
                     },
-                    RxErrorHandler.handleEmptyError()
+                    ExceptionHandler.rx()
                 )
             )
         }
@@ -73,7 +75,7 @@ class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() {
                 val intent = Intent(activity, SkillMemberActivity::class.java)
                 cardSelectedResult.launch(intent)
             },
-            RxErrorHandler.handleEmptyError()
+            ExceptionHandler.rx()
         )?.let { compositeSubscription.add(it) }
         recyclerAdapter?.brokenTaskEvents?.subscribeWithErrorHandler { showBrokenChallengeDialog(it) }?.let { compositeSubscription.add(it) }
 
@@ -93,12 +95,14 @@ class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() {
 
     override fun onRefresh() {
         binding?.refreshLayout?.isRefreshing = true
-        compositeSubscription.add(
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
             userRepository.retrieveUser(withTasks = true, forced = true)
-                .flatMap { inventoryRepository.retrieveInAppRewards() }
+        }
+        compositeSubscription.add(
+            inventoryRepository.retrieveInAppRewards()
                 .doOnTerminate {
                     binding?.refreshLayout?.isRefreshing = false
-                }.subscribe({ }, RxErrorHandler.handleEmptyError())
+                }.subscribe({ }, ExceptionHandler.rx())
         )
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
index 95c13db11..23f0e279f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
@@ -1,7 +1,6 @@
 package com.habitrpg.android.habitica.ui.fragments.tasks
 
 import android.content.Context
-import android.content.Intent
 import android.content.SharedPreferences
 import android.graphics.drawable.BitmapDrawable
 import android.os.Bundle
@@ -25,11 +24,12 @@ import com.habitrpg.android.habitica.extensions.observeOnce
 import com.habitrpg.android.habitica.extensions.setScaledPadding
 import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
 import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.HapticFeedbackManager
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.NotificationsManager
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.helpers.SoundManager
+import com.habitrpg.android.habitica.models.tasks.ChecklistItem
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.ui.activities.MainActivity
 import com.habitrpg.android.habitica.ui.activities.TaskFormActivity
@@ -54,7 +54,10 @@ import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.distinctUntilChangedBy
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.takeWhile
 import kotlinx.coroutines.launch
 import java.util.Date
 import java.util.concurrent.TimeUnit
@@ -111,12 +114,11 @@ open class TaskRecyclerViewFragment : BaseFragment<FragmentRefreshRecyclerviewBi
                 TaskType.HABIT -> HabitsRecyclerViewAdapter(R.layout.habit_item_card, viewModel)
                 TaskType.DAILY -> DailiesRecyclerViewHolder(R.layout.daily_item_card, viewModel)
                 TaskType.TODO -> TodosRecyclerViewAdapter(R.layout.todo_item_card, viewModel)
-                TaskType.REWARD -> RewardsRecyclerViewAdapter(null, R.layout.reward_item_card)
+                TaskType.REWARD -> RewardsRecyclerViewAdapter(null, R.layout.reward_item_card, viewModel)
                 else -> null
             }
 
             recyclerAdapter = adapter as? TaskRecyclerViewAdapter
-            recyclerAdapter?.canScoreTasks = canScoreTaks
             binding?.recyclerView?.adapter = adapter
 
             viewModel.getFilterSet(taskType)?.observe(viewLifecycleOwner) {
@@ -127,9 +129,9 @@ open class TaskRecyclerViewFragment : BaseFragment<FragmentRefreshRecyclerviewBi
 
         recyclerAdapter?.errorButtonEvents?.subscribe(
             {
-                taskRepository.syncErroredTasks().subscribe({}, RxErrorHandler.handleEmptyError())
+                taskRepository.syncErroredTasks().subscribe({}, ExceptionHandler.rx())
             },
-            RxErrorHandler.handleEmptyError()
+            ExceptionHandler.rx()
         )?.let { recyclerSubscription.add(it) }
         recyclerAdapter?.taskOpenEvents?.subscribeWithErrorHandler {
             openTaskForm(it.first)
@@ -139,17 +141,15 @@ open class TaskRecyclerViewFragment : BaseFragment<FragmentRefreshRecyclerviewBi
                 playSound(it.second)
                 context?.let { it1 -> notificationsManager.dismissTaskNotification(it1, it.first) }
             }?.subscribeWithErrorHandler { scoreTask(it.first, it.second) }?.let { recyclerSubscription.add(it) }
-        recyclerAdapter?.checklistItemScoreEvents
-            ?.flatMap {
-                taskRepository.scoreChecklistItem(it.first.id ?: "", it.second.id ?: "")
-            }?.subscribeWithErrorHandler {}?.let { recyclerSubscription.add(it) }
+        recyclerAdapter?.checklistItemScoreEvents?.subscribeWithErrorHandler {
+            scoreChecklistItem(it.first, it.second)
+        }?.let { recyclerSubscription.add(it) }
         recyclerAdapter?.brokenTaskEvents?.subscribeWithErrorHandler { showBrokenChallengeDialog(it) }?.let { recyclerSubscription.add(it) }
         recyclerAdapter?.adventureGuideOpenEvents?.subscribeWithErrorHandler { MainNavigationController.navigate(R.id.adventureGuideActivity) }?.let { recyclerSubscription.add(it) }
 
         viewModel.ownerID.observe(viewLifecycleOwner) {
             canEditTasks = viewModel.isPersonalBoard
             canScoreTaks = viewModel.isPersonalBoard
-            recyclerAdapter?.canScoreTasks = canScoreTaks
             updateTaskSubscription(it)
         }
         lifecycleScope.launch {
@@ -162,6 +162,12 @@ open class TaskRecyclerViewFragment : BaseFragment<FragmentRefreshRecyclerviewBi
         }
     }
 
+    private fun scoreChecklistItem(task: Task, item: ChecklistItem) {
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            taskRepository.scoreChecklistItem(task.id ?: "", item.id ?: "")
+        }
+    }
+
     private fun handleTaskResult(result: TaskScoringResult, value: Int) {
         if (taskType == TaskType.REWARD) {
             (activity as? MainActivity)?.let { activity ->
@@ -213,7 +219,6 @@ open class TaskRecyclerViewFragment : BaseFragment<FragmentRefreshRecyclerviewBi
         component.inject(this)
     }
 
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         savedInstanceState?.let { this.taskType = TaskType.from(savedInstanceState.getString(CLASS_TYPE_KEY, "")) ?: TaskType.HABIT }
@@ -299,7 +304,7 @@ open class TaskRecyclerViewFragment : BaseFragment<FragmentRefreshRecyclerviewBi
                             .subscribe(
                                 {
                                 },
-                                RxErrorHandler.handleEmptyError()
+                                ExceptionHandler.rx()
                             )
                     )
                 }
@@ -328,22 +333,23 @@ open class TaskRecyclerViewFragment : BaseFragment<FragmentRefreshRecyclerviewBi
             }
         })
 
-        compositeSubscription.add(
-            userRepository.getUserFlowable()
-                .distinct { it.hasCompletedOnboarding }
-                .doOnNext { recyclerAdapter?.showAdventureGuide = !it.hasCompletedOnboarding }
-                .subscribe({ recyclerAdapter?.user = it }, RxErrorHandler.handleEmptyError())
-        )
-
-        setPreferenceTaskFilters()
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.getUser()
+                .distinctUntilChangedBy { it?.hasCompletedOnboarding }
+                .onEach { recyclerAdapter?.showAdventureGuide = it?.hasCompletedOnboarding != true }
+                .takeWhile { it?.hasCompletedOnboarding != true }
+                .collect {
+                    recyclerAdapter?.user = it
+                }
+        }
     }
 
     private fun updateTaskSubscription(ownerID: String?) {
         if (taskFlowJob?.isActive == true) {
             taskFlowJob?.cancel()
         }
-        val additionalGroupIDs = viewModel.userViewModel.mirrorGroupTasks.toTypedArray()
-        taskFlowJob = lifecycleScope.launch {
+        val additionalGroupIDs = if (ownerID == viewModel.userViewModel.userID) viewModel.userViewModel.mirrorGroupTasks.toTypedArray() else emptyArray()
+        taskFlowJob = lifecycleScope.launch(ExceptionHandler.coroutine()) {
             taskRepository.getTasks(taskType, ownerID, additionalGroupIDs).collect {
                 recyclerAdapter?.updateUnfilteredData(it)
             }
@@ -364,8 +370,11 @@ open class TaskRecyclerViewFragment : BaseFragment<FragmentRefreshRecyclerviewBi
                     dialog.addButton(it.getString(R.string.keep_x_tasks, taskCount), true) { _, _ ->
                         if (!task.isValid) return@addButton
                         taskRepository.unlinkAllTasks(task.challengeID, "keep-all")
-                            .flatMap { userRepository.retrieveUser(true, forced = true) }
-                            .subscribe({}, RxErrorHandler.handleEmptyError())
+                            .subscribe({
+                                       lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                                           userRepository.retrieveUser(true, forced = true)
+                                       }
+                            }, ExceptionHandler.rx())
                     }
                     dialog.addButton(
                         it.getString(R.string.delete_x_tasks, taskCount),
@@ -374,13 +383,16 @@ open class TaskRecyclerViewFragment : BaseFragment<FragmentRefreshRecyclerviewBi
                     ) { _, _ ->
                         if (!task.isValid) return@addButton
                         taskRepository.unlinkAllTasks(task.challengeID, "remove-all")
-                            .flatMap { userRepository.retrieveUser(true, forced = true) }
-                            .subscribe({}, RxErrorHandler.handleEmptyError())
+                            .subscribe({
+                                lifecycleScope.launch(ExceptionHandler.coroutine()) {
+                                    userRepository.retrieveUser(true, forced = true)
+                                }
+                            }, ExceptionHandler.rx())
                     }
                     dialog.setExtraCloseButtonVisibility(View.VISIBLE)
                     dialog.show()
                 },
-                RxErrorHandler.handleEmptyError()
+                ExceptionHandler.rx()
             )
         }
     }
@@ -478,7 +490,6 @@ open class TaskRecyclerViewFragment : BaseFragment<FragmentRefreshRecyclerviewBi
         super.onResume()
         context?.let { recyclerAdapter?.taskDisplayMode = configManager.taskDisplayMode(it) }
         setInnerAdapter()
-        recyclerAdapter?.filter()
     }
 
     fun setActiveFilter(activeFilter: String) {
@@ -488,7 +499,7 @@ open class TaskRecyclerViewFragment : BaseFragment<FragmentRefreshRecyclerviewBi
         setEmptyLabels()
 
         if (activeFilter == Task.FILTER_COMPLETED) {
-            compositeSubscription.add(taskRepository.retrieveCompletedTodos().subscribe({}, RxErrorHandler.handleEmptyError()))
+            compositeSubscription.add(taskRepository.retrieveCompletedTodos().subscribe({}, ExceptionHandler.rx()))
         }
     }
 
@@ -524,12 +535,12 @@ open class TaskRecyclerViewFragment : BaseFragment<FragmentRefreshRecyclerviewBi
         bundle.putString(TaskFormActivity.TASK_ID_KEY, task.id)
         bundle.putDouble(TaskFormActivity.TASK_VALUE_KEY, task.value)
 
-        val intent = Intent(activity, TaskFormActivity::class.java)
-        intent.putExtras(bundle)
-        TasksFragment.lastTaskFormOpen = Date()
-        if (isAdded) {
-            startActivity(intent)
+        if (task.canEdit(viewModel.userViewModel.userID)) {
+            MainNavigationController.navigate(R.id.taskFormActivity, bundle)
+        } else {
+            MainNavigationController.navigate(R.id.taskSummaryActivity, bundle)
         }
+        TasksFragment.lastTaskFormOpen = Date()
     }
 
     companion object {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt
index d7a70ecbd..51ef3782b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt
@@ -15,7 +15,6 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.widget.SearchView
 import androidx.core.content.ContextCompat
 import androidx.core.content.edit
-import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.viewpager2.adapter.FragmentStateAdapter
@@ -26,8 +25,7 @@ import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.databinding.FragmentViewpagerBinding
 import com.habitrpg.android.habitica.extensions.setTintWith
 import com.habitrpg.android.habitica.helpers.AmplitudeManager
-import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.ui.activities.TaskFormActivity
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.viewmodels.TasksViewModel
@@ -81,7 +79,7 @@ class TasksFragment : BaseMainFragment<FragmentViewpagerBinding>(), SearchView.O
             if (args.ownerID?.isNotBlank() == true) {
                 viewModel.canSwitchOwners.value = false
                 viewModel.ownerID.value = args.ownerID ?: viewModel.userViewModel.userID
-            } else {
+            } else if (viewModel.ownerID.value?.isNotBlank() != true) {
                 viewModel.ownerID.value = viewModel.userViewModel.userID
             }
             if (taskTypeValue?.isNotBlank() == true) {
@@ -185,10 +183,6 @@ class TasksFragment : BaseMainFragment<FragmentViewpagerBinding>(), SearchView.O
                 viewModel.refreshData { }
                 true
             }
-            R.id.action_team_info -> {
-                MainNavigationController.navigate(R.id.guildFragment, bundleOf(Pair("groupID", viewModel.ownerID)))
-                true
-            }
             else -> super.onOptionsItemSelected(item)
         }
     }
@@ -306,7 +300,7 @@ class TasksFragment : BaseMainFragment<FragmentViewpagerBinding>(), SearchView.O
                         }
                     }
                 },
-                RxErrorHandler.handleEmptyError()
+                ExceptionHandler.rx()
             )
         )
     }
@@ -422,6 +416,7 @@ class TasksFragment : BaseMainFragment<FragmentViewpagerBinding>(), SearchView.O
         if (viewModel.ownerTitle.isNotBlank()) {
             activity?.title = viewModel.ownerTitle
         }
+        viewModel.userViewModel.currentTeamPlan.value = viewModel.teamPlans[viewModel.ownerID.value]
         val isPersonalBoard = viewModel.isPersonalBoard
         bottomNavigation?.canAddTasks = isPersonalBoard
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/HabiticaDrawerItem.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/HabiticaDrawerItem.kt
index 2586929be..42b2cd6f5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/HabiticaDrawerItem.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/HabiticaDrawerItem.kt
@@ -8,6 +8,7 @@ data class HabiticaDrawerItem(
     var transitionId: Int,
     val identifier: String,
     val text: String,
+    val icon: Drawable? = null,
     val isHeader: Boolean = false
 ) {
     constructor(transitionId: Int, identifier: String) : this(transitionId, identifier, "")
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/theme/HabiticaTheme.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/theme/HabiticaTheme.kt
new file mode 100644
index 000000000..a82ff67d1
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/theme/HabiticaTheme.kt
@@ -0,0 +1,111 @@
+package com.habitrpg.android.habitica.ui.theme
+
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Typography
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalLayoutDirection
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.sp
+import com.google.android.material.composethemeadapter.createMdcTheme
+
+@Composable
+fun HabiticaTheme(
+    content: @Composable () -> Unit
+) {
+    val context = LocalContext.current
+    val layoutDirection = LocalLayoutDirection.current
+    val (colors, typography, shapes) = createMdcTheme(
+        context = context,
+        layoutDirection = layoutDirection,
+        setTextColors = true
+    )
+    MaterialTheme(
+        colors = colors ?: MaterialTheme.colors,
+        typography = Typography(
+            defaultFontFamily = FontFamily.Default,
+            h1 = TextStyle(
+                fontWeight = FontWeight.Medium,
+                fontSize = 20.sp,
+                letterSpacing = (0.05).sp
+            ),
+            h2 = TextStyle(
+                fontWeight = FontWeight.Normal,
+                fontSize = 28.sp,
+                letterSpacing = (0.05).sp
+            ),
+            subtitle1 = TextStyle(
+                fontWeight = FontWeight.Medium,
+                fontSize = 16.sp,
+            ),
+            subtitle2 = TextStyle(
+                fontWeight = FontWeight.Normal,
+                fontSize = 16.sp,
+                letterSpacing = 0.1.sp
+            ),
+            body1 = TextStyle(
+                fontWeight = FontWeight.Medium,
+                fontSize = 14.sp,
+                letterSpacing = 0.35.sp,
+                lineHeight = 16.sp
+            ),
+            body2 = TextStyle(
+                fontWeight = FontWeight.Normal,
+                fontSize = 14.sp,
+                letterSpacing = 0.2.sp,
+                lineHeight = 16.sp
+            ),
+            button = TextStyle(
+                fontWeight = FontWeight.Medium,
+                fontSize = 14.sp,
+                letterSpacing = 1.25.sp
+            ),
+            caption = TextStyle(
+                fontWeight = FontWeight.Bold,
+                fontSize = 12.sp
+            ),
+            overline = TextStyle(
+                fontWeight = FontWeight.Medium,
+                fontSize = 10.sp,
+                letterSpacing = 1.5.sp
+            )
+        ),
+        shapes = shapes ?: MaterialTheme.shapes,
+        content = content
+    )
+}
+
+val Typography.caption1
+    get() = caption
+val Typography.caption2
+get() = TextStyle(
+    fontWeight = FontWeight.Medium,
+    fontSize = 12.sp,
+    letterSpacing = 0.4.sp
+)
+val Typography.caption3
+    get() = TextStyle(
+        fontWeight = FontWeight.Medium,
+        fontSize = 12.sp,
+        letterSpacing = 0.3.sp,
+        lineHeight = 14.sp
+    )
+val Typography.caption4
+    get() = TextStyle(
+        fontWeight = FontWeight.Normal,
+        fontSize = 12.sp,
+        letterSpacing = 0.35.sp
+    )
+val Typography.subtitle3
+    get() = TextStyle(
+        fontWeight = FontWeight.Normal,
+        fontSize = 16.sp,
+        letterSpacing = 0.15.sp
+    )
+object HabiticaTheme {
+    val typography: Typography
+    @Composable
+    get() = MaterialTheme.typography
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/BindableViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/BindableViewHolder.kt
index 1d9936845..fa1f6469f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/BindableViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/BindableViewHolder.kt
@@ -5,5 +5,9 @@ import androidx.recyclerview.widget.RecyclerView
 
 abstract class BindableViewHolder<T>(itemView: View) : RecyclerView.ViewHolder(itemView) {
 
-    abstract fun bind(data: T, position: Int, displayMode: String)
+    abstract fun bind(
+        data: T,
+        position: Int,
+        displayMode: String
+    )
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ChatRecyclerViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ChatRecyclerViewHolder.kt
index a595185ca..517fbed3f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ChatRecyclerViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/ChatRecyclerViewHolder.kt
@@ -13,17 +13,17 @@ import com.habitrpg.android.habitica.databinding.ChatItemBinding
 import com.habitrpg.android.habitica.databinding.TavernChatIntroItemBinding
 import com.habitrpg.android.habitica.extensions.getAgoString
 import com.habitrpg.android.habitica.extensions.setScaledPadding
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.social.ChatMessage
 import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
 import com.habitrpg.android.habitica.ui.views.SnackbarActivity
 import com.habitrpg.common.habitica.extensions.DataBindingUtils
 import com.habitrpg.common.habitica.extensions.dpToPx
 import com.habitrpg.common.habitica.helpers.MarkdownParser
 import com.habitrpg.common.habitica.helpers.setParsedMarkdown
-import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.core.Maybe
 import io.reactivex.rxjava3.schedulers.Schedulers
@@ -41,7 +41,8 @@ class ChatRecyclerIntroViewHolder(itemView: View, replyToUUID: String) : ChatRec
         binding.sublineTextview.setOnClickListener { onOpenProfile?.invoke(replyToUUID) }
     }
 
-    fun bind(member: Member) {
+    fun bind(member: Member?) {
+        if (member == null) return
         binding.avatarView.setAvatar(member)
         binding.displayNameTextview.username = member.displayName
         binding.displayNameTextview.tier = member.contributor?.level ?: 0
@@ -193,7 +194,7 @@ class ChatRecyclerMessageViewHolder(
                         chatMessage?.parsedText = parsedText
                         binding.messageText.setParsedMarkdown(parsedText)
                     },
-                    RxErrorHandler.handleEmptyError()
+                    ExceptionHandler.rx()
                 )
         }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/GroupMemberViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/GroupMemberViewHolder.kt
index 8bdc10c86..7f5910529 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/GroupMemberViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/GroupMemberViewHolder.kt
@@ -71,7 +71,7 @@ class GroupMemberViewHolder(itemView: View) : androidx.recyclerview.widget.Recyc
         binding.displayNameTextview.tier = user.contributor?.level ?: 0
 
         if (user.hasClass) {
-            binding.sublineTextview.text = itemView.context.getString(R.string.user_level_with_class, user.stats?.lvl, user.stats?.getTranslatedClassName(itemView.context))
+            binding.sublineTextview.text = itemView.context.getString(R.string.user_level_with_class, user.stats?.lvl, user.stats?.getTranslatedClassName(itemView.context.resources))
         } else {
             binding.sublineTextview.text = itemView.context.getString(R.string.user_level, user.stats?.lvl)
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.kt
index 2d40a1341..1af36d06d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.kt
@@ -13,7 +13,8 @@ import android.widget.ProgressBar
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.GroupPlanInfoProvider
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.ui.viewHolders.BindableViewHolder
 import com.habitrpg.android.habitica.ui.views.EllipsisTextView
@@ -34,15 +35,19 @@ abstract class BaseTaskViewHolder constructor(
     itemView: View,
     var scoreTaskFunc: ((Task, TaskDirection) -> Unit),
     var openTaskFunc: ((Pair<Task, View>) -> Unit),
-    var brokenTaskFunc: ((Task) -> Unit)
+    var brokenTaskFunc: ((Task) -> Unit),
+    var assignedTextProvider: GroupPlanInfoProvider?
 ) : BindableViewHolder<Task>(itemView), View.OnTouchListener {
     private val scope = MainScope()
+
     var task: Task? = null
     var movingFromPosition: Int? = null
     var errorButtonClicked: Action? = null
+    var userID: String? = null
     var isLocked = false
     protected var context: Context
     private val mainTaskWrapper: ViewGroup = itemView.findViewById(R.id.main_task_wrapper)
+    protected val assignedTextView: TextView = itemView.findViewById(R.id.assigned_textview)
     protected val titleTextView: EllipsisTextView = itemView.findViewById(R.id.checkedTextView)
     protected val notesTextView: EllipsisTextView? = itemView.findViewById(R.id.notesTextView)
     protected val calendarIconView: ImageView? = itemView.findViewById(R.id.iconViewCalendar)
@@ -51,7 +56,7 @@ abstract class BaseTaskViewHolder constructor(
     private val iconViewChallenge: ImageView? = itemView.findViewById(R.id.iconviewChallenge)
     private val iconViewReminder: ImageView? = itemView.findViewById(R.id.iconviewReminder)
     private val taskIconWrapper: LinearLayout? = itemView.findViewById(R.id.taskIconWrapper)
-    private val approvalRequiredTextView: TextView? = itemView.findViewById(R.id.approvalRequiredTextField)
+    private val approvalRequiredTextView: TextView = itemView.findViewById(R.id.approvalRequiredTextField)
     private val expandNotesButton: Button? = itemView.findViewById(R.id.expand_notes_button)
     private val syncingView: ProgressBar? = itemView.findViewById(R.id.syncing_view)
     private val errorIconView: ImageButton? = itemView.findViewById(R.id.error_icon)
@@ -132,6 +137,15 @@ abstract class BaseTaskViewHolder constructor(
     }
 
     override fun bind(data: Task, position: Int, displayMode: String) {
+        bind(data, position, displayMode, null)
+    }
+
+    open fun bind(
+        data: Task,
+        position: Int,
+        displayMode: String,
+        ownerID: String?
+    ) {
         notesExpanded = false
         task = data
         itemView.setBackgroundColor(context.getThemeColor(R.attr.colorContentBackground))
@@ -164,7 +178,7 @@ abstract class BaseTaskViewHolder constructor(
                                 data.parsedText = parsedText
                                 titleTextView.setParsedMarkdown(parsedText)
                             },
-                            RxErrorHandler.handleEmptyError()
+                            ExceptionHandler.rx()
                         )
                 }
             }
@@ -191,7 +205,7 @@ abstract class BaseTaskViewHolder constructor(
                                         data.parsedNotes = parsedNotes
                                         notesTextView?.setParsedMarkdown(parsedNotes)
                                     },
-                                    RxErrorHandler.handleEmptyError()
+                                    ExceptionHandler.rx()
                                 )
                         }
                     }
@@ -226,7 +240,7 @@ abstract class BaseTaskViewHolder constructor(
             }
             configureSpecialTaskTextView(data)
 
-            iconViewTeam?.visibility = if (data.isGroupTask) View.VISIBLE else View.GONE
+            iconViewTeam?.visibility = if (data.isGroupTask && ownerID != data.group?.groupID) View.VISIBLE else View.GONE
 
             taskIconWrapper?.visibility = if (taskIconWrapperIsVisible) View.VISIBLE else View.GONE
         } else {
@@ -235,9 +249,16 @@ abstract class BaseTaskViewHolder constructor(
         }
 
         if (data.isPendingApproval) {
-            approvalRequiredTextView?.visibility = View.VISIBLE
+            approvalRequiredTextView.visibility = View.VISIBLE
         } else {
-            approvalRequiredTextView?.visibility = View.GONE
+            approvalRequiredTextView.visibility = View.GONE
+        }
+
+        if (data.group?.assignedUsers?.isNotEmpty() == true) {
+            assignedTextView.text = assignedTextProvider?.assignedTextForTask(context.resources, data.group?.assignedUsers ?: emptyList())
+            assignedTextView.visibility = View.VISIBLE
+        } else {
+            assignedTextView.visibility = View.GONE
         }
 
         syncingView?.visibility = if (task?.isSaving == true) View.VISIBLE else View.GONE
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.kt
index b771d8f15..499445b24 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.kt
@@ -12,7 +12,8 @@ import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.GroupPlanInfoProvider
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.tasks.ChecklistItem
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.common.habitica.extensions.getThemeColor
@@ -30,8 +31,9 @@ abstract class ChecklistedViewHolder(
     scoreTaskFunc: ((Task, TaskDirection) -> Unit),
     var scoreChecklistItemFunc: ((Task, ChecklistItem) -> Unit),
     openTaskFunc: ((Pair<Task, View>) -> Unit),
-    brokenTaskFunc: ((Task) -> Unit)
-) : BaseTaskViewHolder(itemView, scoreTaskFunc, openTaskFunc, brokenTaskFunc) {
+    brokenTaskFunc: ((Task) -> Unit),
+    assignedTextProvider: GroupPlanInfoProvider?
+) : BaseTaskViewHolder(itemView, scoreTaskFunc, openTaskFunc, brokenTaskFunc, assignedTextProvider) {
 
     private val checkboxHolder: ViewGroup = itemView.findViewById(R.id.checkBoxHolder)
     private val checkmarkView: ImageView = itemView.findViewById(R.id.checkmark)
@@ -48,8 +50,13 @@ abstract class ChecklistedViewHolder(
         checklistIndicatorWrapper.setOnClickListener { onChecklistIndicatorClicked() }
     }
 
-    override fun bind(data: Task, position: Int, displayMode: String) {
-        var completed = data.completed
+    override fun bind(
+        data: Task,
+        position: Int,
+        displayMode: String,
+        ownerID: String?
+    ) {
+        var completed = data.completed(userID)
         if (data.isPendingApproval) {
             completed = false
         }
@@ -69,15 +76,15 @@ abstract class ChecklistedViewHolder(
         this.updateChecklistDisplay()
 
         this.checklistIndicatorWrapper.visibility = if (data.checklist?.size == 0) View.GONE else View.VISIBLE
-        super.bind(data, position, displayMode)
+        super.bind(data, position, displayMode, ownerID)
         val regularBoxBackground = if (task?.type == TaskType.DAILY) R.drawable.daily_unchecked else R.drawable.todo_unchecked
         val completedBoxBackground = if (task?.type == TaskType.DAILY) R.drawable.daily_checked else R.drawable.todo_checked
         val inactiveBoxBackground = R.drawable.daily_inactive
-        if (this.shouldDisplayAsActive(data) && !data.isPendingApproval) {
+        if (this.shouldDisplayAsActive(data, userID) && !data.isPendingApproval) {
             this.checkboxHolder.setBackgroundResource(data.lightTaskColor)
             checkboxBackground.setBackgroundResource(regularBoxBackground)
         } else {
-            if (data.completed) {
+            if (completed) {
                 titleTextView.setTextColor(ContextCompat.getColor(context, R.color.text_quad))
                 notesTextView?.setTextColor(ContextCompat.getColor(context, R.color.text_quad))
                 this.checkboxHolder.setBackgroundColor(context.getThemeColor(R.attr.colorWindowBackground))
@@ -91,7 +98,7 @@ abstract class ChecklistedViewHolder(
         }
     }
 
-    abstract fun shouldDisplayAsActive(newTask: Task?): Boolean
+    abstract fun shouldDisplayAsActive(task: Task?, userID: String?): Boolean
 
     private fun updateChecklistDisplay() {
         // This needs to be a LinearLayout, as ListViews can not be inside other ListViews.
@@ -109,7 +116,7 @@ abstract class ChecklistedViewHolder(
                         context,
                         (
                             if (context.isUsingNightModeResources()) {
-                                if (task?.completed == true || (task?.type == TaskType.DAILY && task?.isDue == false)) {
+                                if (task?.completed(userID) == true || (task?.type == TaskType.DAILY && task?.isDue == false)) {
                                     R.color.checkbox_fill
                                 } else {
                                     task?.lightTaskColor
@@ -132,7 +139,7 @@ abstract class ChecklistedViewHolder(
                                 {
                                     textView?.setParsedMarkdown(it)
                                 },
-                                RxErrorHandler.handleEmptyError()
+                                ExceptionHandler.rx()
                             )
                     }
                     val checkmark = itemView?.findViewById<ImageView>(R.id.checkmark)
@@ -144,7 +151,7 @@ abstract class ChecklistedViewHolder(
                     }
                     val color = ContextCompat.getColor(
                         context,
-                        if (task?.completed == true || (task?.type == TaskType.DAILY && task?.isDue == false)) {
+                        if (task?.completed(userID) == true || (task?.type == TaskType.DAILY && task?.isDue == false)) {
                             checkmark?.drawable?.setTint(ContextCompat.getColor(context, R.color.text_dimmed))
                             R.color.offset_background
                         } else {
@@ -200,7 +207,7 @@ abstract class ChecklistedViewHolder(
     override fun onLeftActionTouched() {
         super.onLeftActionTouched()
         if (task?.isValid == true) {
-            onCheckedChanged(!(task?.completed ?: false))
+            onCheckedChanged(!(task?.completed(userID) ?: false))
         }
     }
 
@@ -217,8 +224,8 @@ abstract class ChecklistedViewHolder(
         if (task?.isValid != true) {
             return
         }
-        if (isChecked != task?.completed) {
-            task?.let { scoreTaskFunc(it, if (task?.completed == false) TaskDirection.UP else TaskDirection.DOWN) }
+        if (isChecked != task?.completed(userID)) {
+            task?.let { scoreTaskFunc(it, if (task?.completed(userID) == false) TaskDirection.UP else TaskDirection.DOWN) }
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/DailyViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/DailyViewHolder.kt
index 9b1665f04..d9cf2886d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/DailyViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/DailyViewHolder.kt
@@ -1,9 +1,10 @@
 package com.habitrpg.android.habitica.ui.viewHolders.tasks
 
 import android.view.View
-import com.habitrpg.shared.habitica.models.responses.TaskDirection
+import com.habitrpg.android.habitica.helpers.GroupPlanInfoProvider
 import com.habitrpg.android.habitica.models.tasks.ChecklistItem
 import com.habitrpg.android.habitica.models.tasks.Task
+import com.habitrpg.shared.habitica.models.responses.TaskDirection
 import java.text.DateFormat
 import java.util.Calendar
 import java.util.Date
@@ -13,8 +14,9 @@ class DailyViewHolder(
     scoreTaskFunc: ((Task, TaskDirection) -> Unit),
     scoreChecklistItemFunc: ((Task, ChecklistItem) -> Unit),
     openTaskFunc: ((Pair<Task, View>) -> Unit),
-    brokenTaskFunc: ((Task) -> Unit)
-) : ChecklistedViewHolder(itemView, scoreTaskFunc, scoreChecklistItemFunc, openTaskFunc, brokenTaskFunc) {
+    brokenTaskFunc: ((Task) -> Unit),
+    assignedTextProvider: GroupPlanInfoProvider?
+) : ChecklistedViewHolder(itemView, scoreTaskFunc, scoreChecklistItemFunc, openTaskFunc, brokenTaskFunc, assignedTextProvider) {
 
     override val taskIconWrapperIsVisible: Boolean
         get() {
@@ -25,7 +27,12 @@ class DailyViewHolder(
             return isVisible
         }
 
-    override fun bind(data: Task, position: Int, displayMode: String) {
+    override fun bind(
+        data: Task,
+        position: Int,
+        displayMode: String,
+        ownerID: String?
+    ) {
         this.task = data
         setChecklistIndicatorBackgroundActive(data.isChecklistDisplayActive)
 
@@ -59,16 +66,16 @@ class DailyViewHolder(
             reminderTextView.text = reminderString
         }
 
-        super.bind(data, position, displayMode)
+        super.bind(data, position, displayMode, ownerID)
     }
 
-    override fun shouldDisplayAsActive(newTask: Task?): Boolean {
-        return newTask?.isDisplayedActive ?: false
+    override fun shouldDisplayAsActive(task: Task?, userID: String?): Boolean {
+        return task?.isDisplayedActiveForUser(userID) ?: false
     }
 
     override fun configureSpecialTaskTextView(task: Task) {
         super.configureSpecialTaskTextView(task)
-        if (task.streak ?: 0 > 0) {
+        if ((task.streak ?: 0) > 0) {
             this.streakTextView.text = task.streak.toString()
             this.streakTextView.visibility = View.VISIBLE
             this.streakIconView.visibility = View.VISIBLE
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.kt
index 2c8cf24ab..b56939f23 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.kt
@@ -7,6 +7,7 @@ import android.widget.FrameLayout
 import android.widget.ImageView
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.helpers.GroupPlanInfoProvider
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.shared.habitica.models.responses.TaskDirection
 
@@ -14,8 +15,9 @@ class HabitViewHolder(
     itemView: View,
     scoreTaskFunc: ((Task, TaskDirection) -> Unit),
     openTaskFunc: ((Pair<Task, View>) -> Unit),
-    brokenTaskFunc: ((Task) -> Unit)
-) : BaseTaskViewHolder(itemView, scoreTaskFunc, openTaskFunc, brokenTaskFunc) {
+    brokenTaskFunc: ((Task) -> Unit),
+    assignedTextProvider: GroupPlanInfoProvider?
+) : BaseTaskViewHolder(itemView, scoreTaskFunc, openTaskFunc, brokenTaskFunc, assignedTextProvider) {
 
     private val btnPlusWrapper: FrameLayout = itemView.findViewById(R.id.btnPlusWrapper)
     private val btnPlusIconView: ImageView = itemView.findViewById(R.id.btnPlusIconView)
@@ -33,7 +35,12 @@ class HabitViewHolder(
         btnMinus.isClickable = true
     }
 
-    override fun bind(data: Task, position: Int, displayMode: String) {
+    override fun bind(
+        data: Task,
+        position: Int,
+        displayMode: String,
+        ownerID: String?
+    ) {
         this.task = data
         if (data.up == true) {
             val plusIcon = if (isLocked) {
@@ -121,7 +128,7 @@ class HabitViewHolder(
         }
         reminderTextView.visibility = View.GONE
         calendarIconView?.visibility = View.GONE
-        super.bind(data, position, displayMode)
+        super.bind(data, position, displayMode, ownerID)
         if (data.up == false && data.down == false) {
             titleTextView.setTextColor(ContextCompat.getColor(context, R.color.text_quad))
             notesTextView?.setTextColor(ContextCompat.getColor(context, R.color.text_quad))
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.kt
index fb5b8b7d5..c083240b7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.kt
@@ -4,20 +4,30 @@ import android.view.MotionEvent
 import android.view.View
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.ColorUtils
+import androidx.core.graphics.drawable.toDrawable
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.RewardItemCardBinding
-import com.habitrpg.common.habitica.helpers.NumberAbbreviator
-import com.habitrpg.shared.habitica.models.responses.TaskDirection
+import com.habitrpg.android.habitica.helpers.GroupPlanInfoProvider
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.ui.ItemDetailDialog
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import com.habitrpg.common.habitica.extensions.dpToPx
+import com.habitrpg.common.habitica.helpers.NumberAbbreviator
+import com.habitrpg.shared.habitica.models.responses.TaskDirection
 
 class RewardViewHolder(
     itemView: View,
     scoreTaskFunc: ((Task, TaskDirection) -> Unit),
     openTaskFunc: ((Pair<Task, View>) -> Unit),
-    brokenTaskFunc: ((Task) -> Unit)
-) : BaseTaskViewHolder(itemView, scoreTaskFunc, openTaskFunc, brokenTaskFunc) {
+    brokenTaskFunc: ((Task) -> Unit),
+    assignedTextProvider: GroupPlanInfoProvider?
+) : BaseTaskViewHolder(
+    itemView,
+    scoreTaskFunc,
+    openTaskFunc,
+    brokenTaskFunc,
+    assignedTextProvider
+) {
     private val binding = RewardItemCardBinding.bind(itemView)
 
     private val isItem: Boolean
@@ -27,6 +37,7 @@ class RewardViewHolder(
         binding.buyButton.setOnClickListener {
             buyReward()
         }
+        binding.goldIcon.setImageBitmap(HabiticaIconsHelper.imageOfGold())
     }
 
     override fun canContainMarkdown(): Boolean {
@@ -61,29 +72,48 @@ class RewardViewHolder(
         binding.buyButton.isEnabled = !taskActionsDisabled
     }
 
-    fun bind(reward: Task, position: Int, canBuy: Boolean, displayMode: String) {
+    fun bind(reward: Task, position: Int, canBuy: Boolean, displayMode: String, ownerID: String?) {
         this.task = reward
         streakTextView.visibility = View.GONE
-        super.bind(reward, position, displayMode)
-        binding.priceLabel.text = NumberAbbreviator.abbreviate(itemView.context, this.task?.value ?: 0.0)
+        super.bind(reward, position, displayMode, ownerID)
+        binding.priceLabel.text =
+            NumberAbbreviator.abbreviate(itemView.context, this.task?.value ?: 0.0)
 
         if (isLocked) {
-            binding.goldIcon.setImageResource(R.drawable.task_lock)
-            binding.goldIcon.drawable.setTint(ContextCompat.getColor(context, R.color.reward_buy_button_text))
-            binding.goldIcon.alpha = 1.0f
-            binding.priceLabel.setTextColor(ContextCompat.getColor(context, R.color.reward_buy_button_text))
-            binding.buyButton.setBackgroundColor(ContextCompat.getColor(context, R.color.reward_buy_button_bg))
+            binding.priceLabel.setCompoundDrawablesWithIntrinsicBounds(
+                HabiticaIconsHelper.imageOfLocked(
+                    ContextCompat.getColor(context, R.color.gray_1_30), 10, 12
+                ).toDrawable(context.resources), null, null, null
+            )
+            binding.priceLabel.compoundDrawablePadding = 2.dpToPx(context)
         } else {
-            binding.goldIcon.setImageBitmap(HabiticaIconsHelper.imageOfGold())
-            if (canBuy) {
-                binding.goldIcon.alpha = 1.0f
-                binding.priceLabel.setTextColor(ContextCompat.getColor(context, R.color.reward_buy_button_text))
-                binding.buyButton.setBackgroundColor(ContextCompat.getColor(context, R.color.reward_buy_button_bg))
-            } else {
-                binding.goldIcon.alpha = 0.6f
-                binding.priceLabel.setTextColor(ContextCompat.getColor(context, R.color.text_quad))
-                binding.buyButton.setBackgroundColor(ColorUtils.setAlphaComponent(ContextCompat.getColor(context, R.color.offset_background), 127))
-            }
+            binding.priceLabel.setCompoundDrawables(null, null, null, null)
+        }
+        if (canBuy && !isLocked) {
+            binding.goldIcon.alpha = 1.0f
+            binding.priceLabel.setTextColor(
+                ContextCompat.getColor(
+                    context,
+                    R.color.reward_buy_button_text
+                )
+            )
+            binding.buyButton.setBackgroundColor(
+                ContextCompat.getColor(
+                    context,
+                    R.color.reward_buy_button_bg
+                )
+            )
+        } else {
+            binding.goldIcon.alpha = 0.6f
+            binding.priceLabel.setTextColor(ContextCompat.getColor(context, R.color.text_quad))
+            binding.buyButton.setBackgroundColor(
+                ColorUtils.setAlphaComponent(
+                    ContextCompat.getColor(
+                        context,
+                        R.color.offset_background
+                    ), 127
+                )
+            )
         }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/TodoViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/TodoViewHolder.kt
index 6657681ba..8ac863f50 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/TodoViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/TodoViewHolder.kt
@@ -1,9 +1,10 @@
 package com.habitrpg.android.habitica.ui.viewHolders.tasks
 
 import android.view.View
-import com.habitrpg.shared.habitica.models.responses.TaskDirection
+import com.habitrpg.android.habitica.helpers.GroupPlanInfoProvider
 import com.habitrpg.android.habitica.models.tasks.ChecklistItem
 import com.habitrpg.android.habitica.models.tasks.Task
+import com.habitrpg.shared.habitica.models.responses.TaskDirection
 import java.text.DateFormat
 
 class TodoViewHolder(
@@ -11,17 +12,23 @@ class TodoViewHolder(
     scoreTaskFunc: ((Task, TaskDirection) -> Unit),
     scoreChecklistItemFunc: ((Task, ChecklistItem) -> Unit),
     openTaskFunc: ((Pair<Task, View>) -> Unit),
-    brokenTaskFunc: ((Task) -> Unit)
-) : ChecklistedViewHolder(itemView, scoreTaskFunc, scoreChecklistItemFunc, openTaskFunc, brokenTaskFunc) {
+    brokenTaskFunc: ((Task) -> Unit),
+    assignedTextProvider: GroupPlanInfoProvider?
+) : ChecklistedViewHolder(itemView, scoreTaskFunc, scoreChecklistItemFunc, openTaskFunc, brokenTaskFunc, assignedTextProvider) {
 
     private val dateFormatter: DateFormat = android.text.format.DateFormat.getDateFormat(context)
 
-    override fun bind(data: Task, position: Int, displayMode: String) {
+    override fun bind(
+        data: Task,
+        position: Int,
+        displayMode: String,
+        ownerID: String?
+    ) {
         this.task = data
         setChecklistIndicatorBackgroundActive(data.isChecklistDisplayActive)
         reminderTextView.visibility = View.GONE
         this.streakTextView.visibility = View.GONE
-        super.bind(data, position, displayMode)
+        super.bind(data, position, displayMode, ownerID)
     }
 
     override fun configureSpecialTaskTextView(task: Task) {
@@ -35,7 +42,7 @@ class TodoViewHolder(
         }
     }
 
-    override fun shouldDisplayAsActive(newTask: Task?): Boolean {
-        return newTask?.completed != true
+    override fun shouldDisplayAsActive(task: Task?, userID: String?): Boolean {
+        return task?.completed(userID) != true
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/AuthenticationViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/AuthenticationViewModel.kt
index 8230ddd5e..8c5b6958c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/AuthenticationViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/AuthenticationViewModel.kt
@@ -21,22 +21,25 @@ import com.google.android.gms.common.UserRecoverableException
 import com.habitrpg.android.habitica.BuildConfig
 import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.R
-import com.habitrpg.common.habitica.api.HostConfig
 import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.extensions.addCloseButton
-import com.habitrpg.common.habitica.helpers.KeyHelper
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.SignInWithAppleResult
 import com.habitrpg.android.habitica.helpers.SignInWithAppleService
-import com.habitrpg.common.habitica.models.auth.UserAuthResponse
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.proxy.AnalyticsManager
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
+import com.habitrpg.common.habitica.api.HostConfig
+import com.habitrpg.common.habitica.helpers.KeyHelper
+import com.habitrpg.common.habitica.models.auth.UserAuthResponse
 import com.willowtreeapps.signinwithapplebutton.SignInWithAppleConfiguration
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.exceptions.Exceptions
 import io.reactivex.rxjava3.schedulers.Schedulers
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.launch
 import java.io.IOException
 import javax.inject.Inject
 
@@ -136,10 +139,12 @@ class AuthenticationViewModel() {
                     newUser = it.newUser
                     handleAuthResponse(it)
                 }
-                .flatMap { userRepository.retrieveUser(true, true) }
                 .subscribe(
                     {
-                        onSuccess(it, newUser)
+                        MainScope().launch(ExceptionHandler.coroutine()) {
+                            val user = userRepository.retrieveUser(true, true) ?: return@launch
+                            onSuccess(user, newUser)
+                        }
                     },
                     { throwable ->
                         if (recoverFromPlayServicesErrorResult == null) return@subscribe
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/BaseViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/BaseViewModel.kt
index 78c3fc71a..50078eceb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/BaseViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/BaseViewModel.kt
@@ -5,7 +5,7 @@ import androidx.lifecycle.ViewModel
 import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.UserRepository
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.user.User
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import javax.inject.Inject
@@ -40,7 +40,7 @@ abstract class BaseViewModel(initializeComponent: Boolean = true) : ViewModel()
     fun updateUser(path: String, value: Any) {
         disposable.add(
             userRepository.updateUser(path, value)
-                .subscribe({ }, RxErrorHandler.handleEmptyError())
+                .subscribe({ }, ExceptionHandler.rx())
         )
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/GroupViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/GroupViewModel.kt
index 08e69698c..0b07975b4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/GroupViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/GroupViewModel.kt
@@ -3,26 +3,27 @@ package com.habitrpg.android.habitica.ui.viewmodels
 import android.os.Bundle
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.asLiveData
+import androidx.lifecycle.viewModelScope
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.ChallengeRepository
 import com.habitrpg.android.habitica.data.SocialRepository
-import com.habitrpg.android.habitica.extensions.filterOptionalDoOnEmpty
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.NotificationsManager
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.social.Challenge
 import com.habitrpg.android.habitica.models.social.ChatMessage
 import com.habitrpg.android.habitica.models.social.Group
-import com.habitrpg.common.habitica.extensions.Optional
-import com.habitrpg.common.habitica.extensions.asOptional
 import com.habitrpg.common.habitica.models.notifications.NewChatMessageData
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.core.BackpressureStrategy
-import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.subjects.BehaviorSubject
+import io.realm.kotlin.toFlow
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
 import retrofit2.HttpException
-import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 enum class GroupViewType(internal val order: String) {
@@ -41,19 +42,28 @@ open class GroupViewModel(initializeComponent: Boolean) : BaseViewModel(initiali
     @Inject
     lateinit var notificationsManager: NotificationsManager
 
+    protected val groupIDState = MutableStateFlow<String?>(null)
+    val groupIDFlow: Flow<String?> = groupIDState
+
     var groupViewType: GroupViewType? = null
 
-    private val group: MutableLiveData<Group?> by lazy {
-        MutableLiveData<Group?>()
-    }
+    private val groupFlow = groupIDFlow
+        .filterNotNull()
+        .flatMapLatest { socialRepository.getGroup(it) }
+    private val group = groupFlow.asLiveData()
 
-    private val leader: MutableLiveData<Member?> by lazy {
-        MutableLiveData<Member?>()
-    }
 
-    private val isMemberData: MutableLiveData<Boolean?> by lazy {
-        MutableLiveData<Boolean?>()
-    }
+    private val leaderFlow = groupFlow.map { it?.leaderID }
+        .filterNotNull()
+        .flatMapLatest { socialRepository.retrieveMember(it).toFlow() }
+    private val leader = leaderFlow.asLiveData()
+
+
+    private val isMemberFlow = groupIDFlow
+        .filterNotNull()
+        .flatMapLatest { socialRepository.getGroupMembership(it) }
+        .map { it != null }
+    private val isMemberData = isMemberFlow.asLiveData()
 
     private val _chatMessages: MutableLiveData<List<ChatMessage>> by lazy {
         MutableLiveData<List<ChatMessage>>(listOf())
@@ -62,16 +72,8 @@ open class GroupViewModel(initializeComponent: Boolean) : BaseViewModel(initiali
         _chatMessages
     }
 
-    protected val groupIDSubject = BehaviorSubject.create<Optional<String>>()
-    val groupIDFlowable: Flowable<Optional<String>> = groupIDSubject.toFlowable(BackpressureStrategy.BUFFER)
     var gotNewMessages: Boolean = false
 
-    init {
-        loadGroupFromLocal()
-        loadLeaderFromLocal()
-        loadMembershipFromLocal()
-    }
-
     override fun inject(component: UserComponent) {
         component.inject(this)
     }
@@ -82,8 +84,8 @@ open class GroupViewModel(initializeComponent: Boolean) : BaseViewModel(initiali
     }
 
     fun setGroupID(groupID: String) {
-        if (groupID == groupIDSubject.value?.value) return
-        groupIDSubject.onNext(groupID.asOptional())
+        if (groupID == groupIDState.value) return
+        groupIDState.value = groupID
 
         disposable.add(
             notificationsManager.getNotifications().firstElement().map {
@@ -97,13 +99,13 @@ open class GroupViewModel(initializeComponent: Boolean) : BaseViewModel(initiali
                 .subscribe(
                     {
                     },
-                    RxErrorHandler.handleEmptyError()
+                    ExceptionHandler.rx()
                 )
         )
     }
 
     val groupID: String?
-        get() = groupIDSubject.value?.value
+        get() = groupIDState.value
     val isMember: Boolean
         get() = isMemberData.value ?: false
     val leaderID: String?
@@ -115,92 +117,50 @@ open class GroupViewModel(initializeComponent: Boolean) : BaseViewModel(initiali
 
     fun getGroupData(): LiveData<Group?> = group
     fun getLeaderData(): LiveData<Member?> = leader
-    fun getIsMemberData(): LiveData<Boolean?> = isMemberData
-
-    private fun loadGroupFromLocal() {
-        disposable.add(
-            groupIDFlowable
-                .filterOptionalDoOnEmpty { group.value = null }
-                .flatMap { socialRepository.getGroupFlowable(it) }
-                .map { socialRepository.getUnmanagedCopy(it) }
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({ group.value = it }, RxErrorHandler.handleEmptyError())
-        )
-    }
-
-    private fun loadLeaderFromLocal() {
-        disposable.add(
-            groupIDFlowable
-                .filterOptionalDoOnEmpty { leader.value = null }
-                .flatMap { socialRepository.getGroupFlowable(it) }
-                .distinctUntilChanged { group1, group2 -> group1.id == group2.id }
-                .flatMap { socialRepository.getMember(it.leaderID) }
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({ leader.value = it }, RxErrorHandler.handleEmptyError())
-        )
-    }
-
-    private fun loadMembershipFromLocal() {
-        disposable.add(
-            groupIDFlowable
-                .filterOptionalDoOnEmpty { isMemberData.value = null }
-                .flatMap { socialRepository.getGroupMemberships() }
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(
-                    {
-                        isMemberData.value = it.firstOrNull { membership -> membership.groupID == groupID } != null
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
-        )
-    }
+    fun getIsMemberData(): LiveData<Boolean> = isMemberData
 
     fun retrieveGroup(function: (() -> Unit)?) {
         if (groupID?.isNotEmpty() == true) {
-            disposable.add(
-                socialRepository.retrieveGroup(groupID ?: "")
-                    .filter { groupViewType == GroupViewType.PARTY }
-                    .flatMap { group1 ->
-                        socialRepository.retrieveGroupMembers(group1.id, true)
-                    }
-                    .doOnComplete { function?.invoke() }
-                    .subscribe({ }, {
-                        if (it is HttpException && it.code() == 404) {
-                            MainNavigationController.navigateBack()
-                        }
-                        RxErrorHandler.reportError(it)
-                    })
-            )
+            viewModelScope.launch(ExceptionHandler.coroutine {
+                if (it is HttpException && it.code() == 404) {
+                    MainNavigationController.navigateBack()
+                }
+            }) {
+                val group = socialRepository.retrieveGroup(groupID ?: "")
+                if (groupViewType == GroupViewType.PARTY) {
+                    socialRepository.retrievePartyMembers(group?.id ?: "", true)
+                }
+                function?.invoke()
+            }
         }
     }
 
     fun inviteToGroup(inviteData: HashMap<String, Any>) {
         disposable.add(
             socialRepository.inviteToGroup(group.value?.id ?: "", inviteData)
-                .subscribe({ }, RxErrorHandler.handleEmptyError())
+                .subscribe({ }, ExceptionHandler.rx())
         )
     }
 
     fun updateOrCreateGroup(bundle: Bundle?) {
-        if (group.value == null) {
-            socialRepository.createGroup(
-                bundle?.getString("name"),
-                bundle?.getString("description"),
-                bundle?.getString("leader"),
-                bundle?.getString("groupType"),
-                bundle?.getString("privacy"),
-                bundle?.getBoolean("leaderCreateChallenge")
-            )
-        } else {
-            disposable.add(
-                socialRepository.updateGroup(
-                    group.value, bundle?.getString("name"),
+        viewModelScope.launch(ExceptionHandler.coroutine()) {
+            if (group.value == null) {
+                socialRepository.createGroup(
+                    bundle?.getString("name"),
                     bundle?.getString("description"),
                     bundle?.getString("leader"),
+                    bundle?.getString("groupType"),
+                    bundle?.getString("privacy"),
                     bundle?.getBoolean("leaderCreateChallenge")
                 )
-                    .subscribe({ }, RxErrorHandler.handleEmptyError())
-            )
+            } else {
+                    socialRepository.updateGroup(
+                        group.value, bundle?.getString("name"),
+                        bundle?.getString("description"),
+                        bundle?.getString("leader"),
+                        bundle?.getBoolean("leaderCreateChallenge")
+                    )
+            }
         }
     }
 
@@ -211,40 +171,30 @@ open class GroupViewModel(initializeComponent: Boolean) : BaseViewModel(initiali
     ) {
         if (!keepChallenges) {
             for (challenge in groupChallenges) {
-                challengeRepository.leaveChallenge(challenge, "remove-all").subscribe({}, RxErrorHandler.handleEmptyError())
+                challengeRepository.leaveChallenge(challenge, "remove-all").subscribe({}, ExceptionHandler.rx())
             }
         }
-        disposable.add(
-            socialRepository.leaveGroup(this.group.value?.id ?: "", keepChallenges)
-                .flatMap { userRepository.retrieveUser(withTasks = false, forced = true) }
-                .subscribe(
-                    {
-                        function?.invoke()
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
-        )
+        viewModelScope.launch(ExceptionHandler.coroutine()) {
+            socialRepository.leaveGroup(groupID ?: "", keepChallenges)
+            userRepository.retrieveUser(withTasks = false, forced = true)
+        }
     }
 
     fun joinGroup(id: String? = null, function: (() -> Unit)? = null) {
-        disposable.add(
-            socialRepository.joinGroup(id ?: groupID).subscribe(
-                {
-                    function?.invoke()
-                },
-                RxErrorHandler.handleEmptyError()
-            )
-        )
+        viewModelScope.launch(ExceptionHandler.coroutine()) {
+            socialRepository.joinGroup(id ?: groupID)
+            function?.invoke()
+        }
     }
 
     fun rejectGroupInvite(id: String? = null) {
         groupID?.let {
-            disposable.add(socialRepository.rejectGroupInvite(id ?: it).subscribe({ }, RxErrorHandler.handleEmptyError()))
+            disposable.add(socialRepository.rejectGroupInvite(id ?: it).subscribe({ }, ExceptionHandler.rx()))
         }
     }
 
     fun markMessagesSeen() {
-        groupIDSubject.value?.value?.let {
+        groupID?.let {
             if (groupViewType != GroupViewType.TAVERN && it.isNotEmpty() && gotNewMessages) {
                 socialRepository.markMessagesSeen(it)
             }
@@ -260,7 +210,7 @@ open class GroupViewModel(initializeComponent: Boolean) : BaseViewModel(initiali
                     val list = _chatMessages.value?.toMutableList()
                     list?.set(index, it)
                     _chatMessages.postValue(list)
-                }, RxErrorHandler.handleEmptyError()
+                }, ExceptionHandler.rx()
             )
         )
     }
@@ -275,13 +225,13 @@ open class GroupViewModel(initializeComponent: Boolean) : BaseViewModel(initiali
             }, {
                 list?.add(oldIndex, chatMessage)
                 _chatMessages.postValue(list)
-                RxErrorHandler.reportError(it)
+                ExceptionHandler.reportError(it)
             })
         )
     }
 
     fun postGroupChat(chatText: String, onComplete: () -> Unit, onError: () -> Unit) {
-        groupIDSubject.value?.value?.let { groupID ->
+        groupID?.let { groupID ->
             socialRepository.postGroupChat(groupID, chatText).subscribe(
                 {
                     val list = _chatMessages.value?.toMutableList()
@@ -290,7 +240,7 @@ open class GroupViewModel(initializeComponent: Boolean) : BaseViewModel(initiali
                     onComplete()
                 },
                 { error ->
-                    RxErrorHandler.reportError(error)
+                    ExceptionHandler.reportError(error)
                     onError()
                 }
             )
@@ -298,27 +248,20 @@ open class GroupViewModel(initializeComponent: Boolean) : BaseViewModel(initiali
     }
 
     fun retrieveGroupChat(onComplete: () -> Unit) {
-        val groupID = groupIDSubject.value?.value
+        val groupID = groupID
         if (groupID.isNullOrEmpty()) {
             onComplete()
             return
         }
-        disposable.add(
-            socialRepository.retrieveGroupChat(groupID)
-                .delay(500, TimeUnit.MILLISECONDS)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(
-                    {
-                        _chatMessages.postValue(it)
-                        onComplete()
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
-        )
+        viewModelScope.launch(ExceptionHandler.coroutine()) {
+            val messages = socialRepository.retrieveGroupChat(groupID)
+            _chatMessages.postValue(messages)
+            onComplete()
+        }
     }
 
     fun updateGroup(bundle: Bundle?) {
-        disposable.add(
+        viewModelScope.launch(ExceptionHandler.coroutine()) {
             socialRepository.updateGroup(
                 group.value,
                 bundle?.getString("name"),
@@ -326,7 +269,6 @@ open class GroupViewModel(initializeComponent: Boolean) : BaseViewModel(initiali
                 bundle?.getString("leader"),
                 bundle?.getBoolean("leaderOnlyChallenges")
             )
-                .subscribe({}, RxErrorHandler.handleEmptyError())
-        )
+        }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/InboxViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/InboxViewModel.kt
index 95489448b..8bebb03c3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/InboxViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/InboxViewModel.kt
@@ -4,24 +4,28 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.asLiveData
+import androidx.lifecycle.viewModelScope
 import androidx.paging.DataSource
 import androidx.paging.PagedList
 import androidx.paging.PositionalDataSource
 import androidx.paging.toLiveData
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.SocialRepository
-import com.habitrpg.android.habitica.extensions.filterOptionalDoOnEmpty
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.social.ChatMessage
-import com.habitrpg.common.habitica.extensions.Optional
-import com.habitrpg.common.habitica.extensions.asOptional
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.core.BackpressureStrategy
-import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.subjects.BehaviorSubject
+import io.realm.kotlin.toFlow
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.emptyFlow
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 import kotlin.math.ceil
@@ -30,6 +34,9 @@ class InboxViewModel(recipientID: String?, recipientUsername: String?) : BaseVie
     @Inject
     lateinit var socialRepository: SocialRepository
 
+    protected var memberIDFlow = MutableStateFlow<String?>(null)
+    val memberIDState: StateFlow<String?> = memberIDFlow
+
     private val config = PagedList.Config.Builder()
         .setPageSize(10)
         .setEnablePlaceholders(false)
@@ -37,31 +44,19 @@ class InboxViewModel(recipientID: String?, recipientUsername: String?) : BaseVie
 
     val dataSourceFactory = MessagesDataSourceFactory(socialRepository, recipientID, ChatMessage())
     val messages: LiveData<PagedList<ChatMessage>> = dataSourceFactory.toLiveData(config)
-    private val member: MutableLiveData<Member?> by lazy {
-        MutableLiveData<Member?>()
-    }
+    private val member = memberIDFlow
+        .filterNotNull()
+        .flatMapLatest { socialRepository.retrieveMember(it).toFlow() }
+        .asLiveData()
     fun getMemberData(): LiveData<Member?> = member
 
-    private fun loadMemberFromLocal() {
-        disposable.add(
-            memberIDFlowable
-                .filterOptionalDoOnEmpty { member.value = null }
-                .flatMap { socialRepository.getMember(it) }
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({ member.value = it }, RxErrorHandler.handleEmptyError())
-        )
-    }
-
-    protected var memberIDSubject = BehaviorSubject.create<Optional<String>>()
-    val memberIDFlowable: Flowable<Optional<String>> = memberIDSubject.toFlowable(BackpressureStrategy.BUFFER)
-
-    fun setMemberID(groupID: String) {
-        if (groupID == memberIDSubject.value?.value) return
-        memberIDSubject.onNext(groupID.asOptional())
+    fun setMemberID(memberID: String) {
+        if (memberID == memberIDState.value) return
+        memberIDFlow.value = memberID
     }
 
     val memberID: String?
-        get() = memberIDSubject.value?.value
+        get() = memberIDFlow.value
 
     override fun inject(component: UserComponent) {
         component.inject(this)
@@ -74,17 +69,13 @@ class InboxViewModel(recipientID: String?, recipientUsername: String?) : BaseVie
     init {
         if (recipientID?.isNotBlank() == true) {
             setMemberID(recipientID)
-            loadMemberFromLocal()
         } else if (recipientUsername?.isNotBlank() == true) {
-            socialRepository.getMemberWithUsername(recipientUsername).subscribe(
-                {
-                    setMemberID(it.id ?: "")
-                    member.value = it
-                    dataSourceFactory.updateRecipientID(memberIDSubject.value?.value)
-                    invalidateDataSource()
-                },
-                RxErrorHandler.handleEmptyError()
-            )
+            viewModelScope.launch(ExceptionHandler.coroutine()) {
+                val member = socialRepository.retrieveMemberWithUsername(recipientUsername)
+                setMemberID(member?.id ?: "")
+                invalidateDataSource()
+                dataSourceFactory.updateRecipientID(memberID)
+            }
         }
     }
 }
@@ -104,17 +95,13 @@ class MessagesDataSource(
         MainScope().launch(Dispatchers.Main.immediate) {
             if (recipientID?.isNotBlank() != true) { return@launch }
             val page = ceil(params.startPosition.toFloat() / params.loadSize.toFloat()).toInt()
-            socialRepository.retrieveInboxMessages(recipientID ?: "", page)
-                .subscribe(
-                    {
-                        if (it.size < 10) {
-                            lastFetchWasEnd = true
-                            callback.onResult(it)
-                        } else
-                            callback.onResult(it)
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
+            val messages = socialRepository.retrieveInboxMessages(recipientID ?: "", page) ?: return@launch
+            if (messages.size < 10) {
+                lastFetchWasEnd = true
+                callback.onResult(messages)
+            } else {
+                callback.onResult(messages)
+            }
         }
     }
 
@@ -123,29 +110,25 @@ class MessagesDataSource(
         MainScope().launch(Dispatchers.Main.immediate) {
             socialRepository.getInboxMessages(recipientID)
                 .map { socialRepository.getUnmanagedCopy(it) }
-                .firstElement()
-                .flatMapPublisher {
+                .take(1)
+                .flatMapLatest {
                     if (it.isEmpty()) {
-                        if (recipientID?.isNotBlank() != true) { return@flatMapPublisher Flowable.just(it) }
-                        socialRepository.retrieveInboxMessages(recipientID ?: "", 0)
-                            .doOnNext { messages ->
-                                if (messages.size < 10) {
-                                    lastFetchWasEnd = true
-                                }
-                            }
+                        if (recipientID?.isNotBlank() != true) { return@flatMapLatest flowOf(it) }
+                        val messages = socialRepository.retrieveInboxMessages(recipientID ?: "", 0) ?: return@flatMapLatest emptyFlow()
+                        if (messages.size < 10) {
+                            lastFetchWasEnd = true
+                        }
+                        flowOf(messages)
                     } else {
-                        Flowable.just(it)
+                        flowOf(it)
                     }
                 }
-                .subscribe(
-                    {
+                .collect {
                         if (it.size < 10 && footer != null)
                             callback.onResult(it.plusElement(footer!!), 0)
                         else
                             callback.onResult(it, 0)
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
+                }
         }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainActivityViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainActivityViewModel.kt
index 1c0119848..d1110e573 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainActivityViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainActivityViewModel.kt
@@ -10,7 +10,7 @@ import com.habitrpg.android.habitica.data.ContentRepository
 import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.helpers.AmplitudeManager
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.TaskAlarmManager
 import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager
 import com.habitrpg.android.habitica.models.TutorialStep
@@ -23,7 +23,7 @@ import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.schedulers.Schedulers
 import io.realm.kotlin.isValid
 import kotlinx.coroutines.launch
-import java.util.Date
+import java.util.*
 import javax.inject.Inject
 
 class MainActivityViewModel : BaseViewModel(), TutorialView.OnTutorialReaction {
@@ -71,7 +71,7 @@ class MainActivityViewModel : BaseViewModel(), TutorialView.OnTutorialReaction {
 
     fun onCreate() {
         try {
-            viewModelScope.launch {
+            viewModelScope.launch(ExceptionHandler.coroutine()) {
                 taskAlarmManager.scheduleAllSavedAlarms(sharedPreferences.getBoolean("preventDailyReminder", false))
             }
         } catch (e: Exception) {
@@ -89,20 +89,21 @@ class MainActivityViewModel : BaseViewModel(), TutorialView.OnTutorialReaction {
 
     fun retrieveUser(forced: Boolean = false) {
         if (hostConfig.hasAuthentication()) {
-            disposable.add(
+            viewModelScope.launch(ExceptionHandler.coroutine()) {
                 contentRepository.retrieveWorldState()
-                    .flatMap { userRepository.retrieveUser(true, forced) }
-                    .doOnNext { user1 ->
-                        analyticsManager.setUserProperty("has_party", if (user1.party?.id?.isNotEmpty() == true) "true" else "false")
-                        analyticsManager.setUserProperty("is_subscribed", if (user1.isSubscribed) "true" else "false")
-                        analyticsManager.setUserProperty("checkin_count", user1.loginIncentives.toString())
-                        analyticsManager.setUserProperty("level", user1.stats?.lvl?.toString() ?: "")
-                        pushNotificationManager.setUser(user1)
-                        pushNotificationManager.addPushDeviceUsingStoredToken()
-                    }
-                    .flatMap { userRepository.retrieveTeamPlans() }
-                    .flatMap { contentRepository.retrieveContent() }
-                    .subscribe({ }, RxErrorHandler.handleEmptyError())
+                userRepository.retrieveUser(true, forced)?.let { user ->
+                    analyticsManager.setUserProperty("has_party", if (user.party?.id?.isNotEmpty() == true) "true" else "false")
+                    analyticsManager.setUserProperty("is_subscribed", if (user.isSubscribed) "true" else "false")
+                    analyticsManager.setUserProperty("checkin_count", user.loginIncentives.toString())
+                    analyticsManager.setUserProperty("level", user.stats?.lvl?.toString() ?: "")
+                    pushNotificationManager.setUser(user)
+                    pushNotificationManager.addPushDeviceUsingStoredToken()
+                }
+                contentRepository.retrieveContent()
+            }
+            disposable.add(
+                userRepository.retrieveTeamPlans()
+                    .subscribe({ }, ExceptionHandler.rx())
             )
         }
     }
@@ -141,7 +142,7 @@ class MainActivityViewModel : BaseViewModel(), TutorialView.OnTutorialReaction {
                         }
                         onResult(maintenanceResponse)
                     },
-                    RxErrorHandler.handleEmptyError()
+                    ExceptionHandler.rx()
                 )
         )
     }
@@ -165,7 +166,7 @@ class MainActivityViewModel : BaseViewModel(), TutorialView.OnTutorialReaction {
                             }
                         )
                     },
-                    RxErrorHandler.handleEmptyError()
+                    ExceptionHandler.rx()
                 )
             )
         } else {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainUserViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainUserViewModel.kt
index 3b29243c2..c86726f30 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainUserViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainUserViewModel.kt
@@ -2,27 +2,28 @@ package com.habitrpg.android.habitica.ui.viewmodels
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.asLiveData
-import com.habitrpg.android.habitica.HabiticaBaseApplication
+import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.data.UserRepository
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
+import com.habitrpg.android.habitica.models.TeamPlan
 import com.habitrpg.android.habitica.models.invitations.PartyInvite
+import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.modules.AppModule
 import io.reactivex.rxjava3.disposables.CompositeDisposable
-import javax.inject.Inject
-import javax.inject.Named
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.flatMapLatest
 
-class MainUserViewModel(val userRepository: UserRepository) {
-
-    @field:[Inject Named(AppModule.NAMED_USER_ID)]
-    lateinit var injectedUserID: String
+class MainUserViewModel(private val providedUserID: String, val userRepository: UserRepository, val socialRepository: SocialRepository) {
 
     val formattedUsername: CharSequence?
         get() = user.value?.formattedUsername
     val partyInvitations: List<PartyInvite>
         get() = user.value?.invitations?.parties ?: emptyList()
     val userID: String
-        get() = user.value?.id ?: injectedUserID
+        get() = user.value?.id ?: providedUserID
     val username: CharSequence
         get() = user.value?.username ?: ""
     val displayName: CharSequence
@@ -36,12 +37,19 @@ class MainUserViewModel(val userRepository: UserRepository) {
     val mirrorGroupTasks: List<String>
     get() = user.value?.preferences?.tasks?.mirrorGroupTasks ?: emptyList()
 
-    val user: LiveData<User?>
-
-    init {
-        HabiticaBaseApplication.userComponent?.inject(this)
-        user = userRepository.getUser().asLiveData()
-    }
+    val user: LiveData<User?> = userRepository.getUser().asLiveData()
+    var currentTeamPlan: MutableStateFlow<TeamPlan?> = MutableStateFlow(null)
+    @OptIn(ExperimentalCoroutinesApi::class)
+    var currentTeamPlanGroup = currentTeamPlan
+        .filterNotNull()
+        .distinctUntilChanged { old, new -> old.id == new.id }
+        .flatMapLatest { socialRepository.getGroup(it.id) }
+    @OptIn(ExperimentalCoroutinesApi::class)
+    var currentTeamPlanMembers: LiveData<List<Member>> = currentTeamPlan
+        .filterNotNull()
+        .distinctUntilChanged { old, new -> old.id == new.id }
+        .flatMapLatest { socialRepository.getGroupMembers(it.id) }
+        .asLiveData()
 
     fun onCleared() {
         userRepository.close()
@@ -53,14 +61,14 @@ class MainUserViewModel(val userRepository: UserRepository) {
     fun updateUser(path: String, value: Any) {
         disposable.add(
             userRepository.updateUser(path, value)
-                .subscribe({ }, RxErrorHandler.handleEmptyError())
+                .subscribe({ }, ExceptionHandler.rx())
         )
     }
 
     fun updateUser(data: Map<String, Any>) {
         disposable.add(
             userRepository.updateUser(data)
-                .subscribe({ }, RxErrorHandler.handleEmptyError())
+                .subscribe({ }, ExceptionHandler.rx())
         )
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt
index 39be81d98..42f00777f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt
@@ -2,12 +2,13 @@ package com.habitrpg.android.habitica.ui.viewmodels
 
 import android.os.Bundle
 import androidx.core.os.bundleOf
+import androidx.lifecycle.viewModelScope
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.NotificationsManager
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.social.UserParty
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.common.habitica.models.Notification
@@ -24,6 +25,7 @@ import io.reactivex.rxjava3.core.BackpressureStrategy
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.functions.BiFunction
 import io.reactivex.rxjava3.subjects.BehaviorSubject
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 open class NotificationsViewModel : BaseViewModel() {
@@ -116,7 +118,7 @@ open class NotificationsViewModel : BaseViewModel() {
             .distinctUntilChanged()
     }
 
-    fun refreshNotifications(): Flowable<*> {
+    suspend fun refreshNotifications(): User? {
         return userRepository.retrieveUser(withTasks = false, forced = true)
     }
 
@@ -204,7 +206,7 @@ open class NotificationsViewModel : BaseViewModel() {
 
         disposable.add(
             userRepository.readNotification(notification.id)
-                .subscribe({}, RxErrorHandler.handleEmptyError())
+                .subscribe({}, ExceptionHandler.rx())
         )
     }
 
@@ -230,7 +232,7 @@ open class NotificationsViewModel : BaseViewModel() {
 
         disposable.add(
             userRepository.readNotifications(notificationIds)
-                .subscribe({}, RxErrorHandler.handleEmptyError())
+                .subscribe({}, ExceptionHandler.rx())
         )
     }
 
@@ -249,7 +251,7 @@ open class NotificationsViewModel : BaseViewModel() {
 
         disposable.add(
             userRepository.seeNotifications(notificationIds)
-                .subscribe({}, RxErrorHandler.handleEmptyError())
+                .subscribe({}, ExceptionHandler.rx())
         )
     }
 
@@ -327,7 +329,9 @@ open class NotificationsViewModel : BaseViewModel() {
             Notification.Type.GROUP_TASK_REQUIRES_APPROVAL.type -> acceptTaskApproval(notification)
         }
         if (isCustomNotification(notification)) {
-            disposable.add(userRepository.retrieveUser(false).subscribe())
+            viewModelScope.launch(ExceptionHandler.coroutine()) {
+                userRepository.retrieveUser()
+            }
         } else {
             dismissNotification(notification)
         }
@@ -354,16 +358,10 @@ open class NotificationsViewModel : BaseViewModel() {
 
     private fun acceptGroupInvitation(groupId: String?) {
         groupId?.let {
-            disposable.add(
+            viewModelScope.launch(ExceptionHandler.coroutine()) {
                 socialRepository.joinGroup(it)
-                    .flatMap { userRepository.retrieveUser(false, forced = true) }
-                    .subscribe(
-                        {
-                            refreshNotifications()
-                        },
-                        RxErrorHandler.handleEmptyError()
-                    )
-            )
+                refreshUser()
+            }
         }
     }
 
@@ -371,12 +369,11 @@ open class NotificationsViewModel : BaseViewModel() {
         groupId?.let {
             disposable.add(
                 socialRepository.rejectGroupInvite(it)
-                    .flatMap { userRepository.retrieveUser(false, forced = true) }
                     .subscribe(
                         {
-                            refreshNotifications()
+                            refreshUser()
                         },
-                        RxErrorHandler.handleEmptyError()
+                        ExceptionHandler.rx()
                     )
             )
         }
@@ -386,12 +383,11 @@ open class NotificationsViewModel : BaseViewModel() {
         party?.id?.let {
             disposable.add(
                 socialRepository.acceptQuest(null, it)
-                    .flatMap { userRepository.retrieveUser(false, forced = true) }
                     .subscribe(
                         {
-                            refreshNotifications()
+                            refreshUser()
                         },
-                        RxErrorHandler.handleEmptyError()
+                        ExceptionHandler.rx()
                     )
             )
         }
@@ -401,17 +397,22 @@ open class NotificationsViewModel : BaseViewModel() {
         party?.id?.let {
             disposable.add(
                 socialRepository.rejectQuest(null, it)
-                    .flatMap { userRepository.retrieveUser(false, forced = true) }
                     .subscribe(
                         {
-                            refreshNotifications()
+                            refreshUser()
                         },
-                        RxErrorHandler.handleEmptyError()
+                        ExceptionHandler.rx()
                     )
             )
         }
     }
 
+    private fun refreshUser() {
+        viewModelScope.launch(ExceptionHandler.coroutine()) {
+            refreshNotifications()
+        }
+    }
+
     private fun acceptTaskApproval(notification: Notification) {
         notification.data as? GroupTaskRequiresApprovalData
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/PartyViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/PartyViewModel.kt
index 0bca2c7c1..344def085 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/PartyViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/PartyViewModel.kt
@@ -1,14 +1,13 @@
 package com.habitrpg.android.habitica.ui.viewmodels
 
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.asLiveData
 import androidx.lifecycle.viewModelScope
 import com.habitrpg.android.habitica.components.UserComponent
-import com.habitrpg.android.habitica.extensions.filterOptionalDoOnEmpty
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import com.habitrpg.android.habitica.models.members.Member
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.core.BackpressureStrategy
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 
 class PartyViewModel(initializeComponent: Boolean) : GroupViewModel(initializeComponent) {
@@ -23,60 +22,48 @@ class PartyViewModel(initializeComponent: Boolean) : GroupViewModel(initializeCo
                 ?: true
             )
 
-    private val members: MutableLiveData<List<Member>?> by lazy {
-        MutableLiveData<List<Member>?>()
-    }
+    private val membersFlow = groupIDFlow
+        .filterNotNull()
+        .flatMapLatest { socialRepository.getPartyMembers(it) }
+    private val members = membersFlow.asLiveData()
 
     init {
         groupViewType = GroupViewType.PARTY
-        loadMembersFromLocal()
     }
 
     override fun inject(component: UserComponent) {
         component.inject(this)
     }
 
-    fun getMembersData(): LiveData<List<Member>?> = members
-
-    private fun loadMembersFromLocal() {
-        disposable.add(
-            groupIDSubject.toFlowable(BackpressureStrategy.LATEST)
-                .distinctUntilChanged()
-                .filterOptionalDoOnEmpty { members.value = null }
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({
-                    viewModelScope.launch {
-                        socialRepository.getGroupMembers(it)
-                            .collect {
-                                members.value = it
-                            }
-                    }}, RxErrorHandler.handleEmptyError())
-        )
-    }
+    fun getMembersData() = members
 
     fun acceptQuest() {
-        groupIDSubject.value?.value?.let { groupID ->
+        groupID?.let { groupID ->
             disposable.add(
                 socialRepository.acceptQuest(null, groupID)
-                    .flatMap { userRepository.retrieveUser() }
-                    .flatMap { socialRepository.retrieveGroup(groupID) }
-                    .subscribe(
-                        {},
-                        RxErrorHandler.handleEmptyError()
+                    .subscribe({
+                               viewModelScope.launch(ExceptionHandler.coroutine()) {
+                                   socialRepository.retrieveGroup(groupID)
+                                   userRepository.retrieveUser()
+                               }
+                    },
+                        ExceptionHandler.rx()
                     )
             )
         }
     }
 
     fun rejectQuest() {
-        groupIDSubject.value?.value?.let { groupID ->
+        groupID?.let { groupID ->
             disposable.add(
                 socialRepository.rejectQuest(null, groupID)
-                    .flatMap { userRepository.retrieveUser() }
-                    .flatMap { socialRepository.retrieveGroup(groupID) }
-                    .subscribe(
-                        {},
-                        RxErrorHandler.handleEmptyError()
+                    .subscribe({
+                        viewModelScope.launch(ExceptionHandler.coroutine()) {
+                            socialRepository.retrieveGroup(groupID)
+                            userRepository.retrieveUser()
+                        }
+                    },
+                        ExceptionHandler.rx()
                     )
             )
         }
@@ -88,16 +75,14 @@ class PartyViewModel(initializeComponent: Boolean) : GroupViewModel(initializeCo
     }
 
     fun loadPartyID() {
-        disposable.add(
-            userRepository.getUserFlowable()
-                .map { it.party?.id ?: "" }
+        viewModelScope.launch(ExceptionHandler.coroutine()) {
+            userRepository.getUser()
+                .map { it?.party?.id }
                 .distinctUntilChanged()
-                .subscribe(
-                    { groupID ->
-                        setGroupID(groupID)
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
-        )
+                .filterNotNull()
+                .collect {
+                    setGroupID(it)
+                }
+        }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/StableViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/StableViewModel.kt
index ebb5002a5..588ce4585 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/StableViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/StableViewModel.kt
@@ -11,7 +11,7 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.extensions.getTranslatedType
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.inventory.Animal
 import com.habitrpg.android.habitica.models.inventory.Egg
 import com.habitrpg.android.habitica.models.inventory.Mount
@@ -58,7 +58,7 @@ class StableViewModel(private val application: Application?, private val itemTyp
     }
 
     private fun loadItems() {
-        viewModelScope.launch {
+        viewModelScope.launch(ExceptionHandler.coroutine()) {
             val animals = if ("pets" == itemType) {
                 inventoryRepository.getPets().firstOrNull()
             } else {
@@ -78,11 +78,7 @@ class StableViewModel(private val application: Application?, private val itemTyp
             }.collect {
                 _items.value = mapAnimals(animals, it)
             }
-
-            viewModelScope.launch {
-
-            }
-            disposable.add(inventoryRepository.getOwnedItems(true).subscribe({ _ownedItems.value = it }, RxErrorHandler.handleEmptyError()))
+            disposable.add(inventoryRepository.getOwnedItems(true).subscribe({ _ownedItems.value = it }, ExceptionHandler.rx()))
             _mounts.value = if ("pets" == itemType) {
                 inventoryRepository.getMounts().firstOrNull() ?: emptyList()
             } else {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/TasksViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/TasksViewModel.kt
index 3b778a0e0..abaf697de 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/TasksViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/TasksViewModel.kt
@@ -1,16 +1,20 @@
 package com.habitrpg.android.habitica.ui.viewmodels
 
 import android.content.SharedPreferences
+import android.content.res.Resources
 import android.text.format.DateUtils
 import androidx.core.content.edit
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
+import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.TagRepository
 import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.helpers.AmplitudeManager
 import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
+import com.habitrpg.android.habitica.helpers.GroupPlanInfoProvider
+import com.habitrpg.android.habitica.models.TeamPlan
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.shared.habitica.models.responses.TaskDirection
 import com.habitrpg.shared.habitica.models.responses.TaskScoringResult
@@ -24,7 +28,7 @@ import kotlinx.coroutines.launch
 import java.util.Date
 import javax.inject.Inject
 
-class TasksViewModel : BaseViewModel() {
+class TasksViewModel : BaseViewModel(), GroupPlanInfoProvider {
     private var compositeSubscription: CompositeDisposable = CompositeDisposable()
 
     override fun inject(component: UserComponent) {
@@ -33,10 +37,13 @@ class TasksViewModel : BaseViewModel() {
 
     @Inject
     lateinit var taskRepository: TaskRepository
+
     @Inject
     lateinit var tagRepository: TagRepository
+
     @Inject
     lateinit var appConfigManager: AppConfigManager
+
     @Inject
     lateinit var sharedPreferences: SharedPreferences
 
@@ -45,6 +52,7 @@ class TasksViewModel : BaseViewModel() {
     val ownerID: MutableLiveData<String?> by lazy {
         MutableLiveData()
     }
+    var teamPlans = mapOf<String, TeamPlan>()
     var initialPreferenceFilterSet: Boolean = false
 
     val isPersonalBoard: Boolean
@@ -58,10 +66,11 @@ class TasksViewModel : BaseViewModel() {
 
     init {
         if (appConfigManager.enableTeamBoards()) {
-            viewModelScope.launch {
+            viewModelScope.launch(ExceptionHandler.coroutine()) {
                 userRepository.getTeamPlans()
-                    .collect {
-                        owners = listOf(Pair(userViewModel.userID, userViewModel.displayName)) + it.map {
+                    .collect { plans ->
+                        teamPlans = plans.associateBy { it.id }
+                        owners = listOf(Pair(userViewModel.userID, userViewModel.displayName)) + plans.map {
                             Pair(
                                 it.id,
                                 it.summary
@@ -73,28 +82,22 @@ class TasksViewModel : BaseViewModel() {
                     }
             }
             compositeSubscription.add(
-                userRepository.retrieveTeamPlans().subscribe({}, RxErrorHandler.handleEmptyError())
+                userRepository.retrieveTeamPlans().subscribe({}, ExceptionHandler.rx())
             )
         }
     }
 
     internal fun refreshData(onComplete: () -> Unit) {
-        if (isPersonalBoard) {
-            compositeSubscription.add(
+        viewModelScope.launch(ExceptionHandler.coroutine()) {
+            if (isPersonalBoard) {
                 userRepository.retrieveUser(
                     withTasks = true,
                     forced = true
-                ).doOnTerminate {
-                    onComplete()
-                }.subscribe({ }, RxErrorHandler.handleEmptyError())
-            )
-        } else {
-            compositeSubscription.add(
+                )
+            } else {
                 userRepository.retrieveTeamPlan(ownerID.value ?: "")
-                    .doOnTerminate {
-                        onComplete()
-                    }.subscribe({ }, RxErrorHandler.handleEmptyError())
-            )
+            }
+            onComplete()
         }
     }
 
@@ -108,9 +111,18 @@ class TasksViewModel : BaseViewModel() {
         }
     }
 
-    fun scoreTask(task: Task, direction: TaskDirection, onResult: (TaskScoringResult, Int) -> Unit) {
-        compositeSubscription.add(
-            taskRepository.taskChecked(null, task.id ?: "", direction == TaskDirection.UP, false) { result ->
+    fun scoreTask(
+        task: Task,
+        direction: TaskDirection,
+        onResult: (TaskScoringResult, Int) -> Unit
+    ) {
+        viewModelScope.launch(ExceptionHandler.coroutine()) {
+            taskRepository.taskChecked(
+                null,
+                task.id ?: "",
+                direction == TaskDirection.UP,
+                false
+            ) { result ->
                 onResult(result, task.value.toInt())
                 if (!DateUtils.isToday(sharedPreferences.getLong("last_task_reporting", 0))) {
                     AmplitudeManager.sendEvent(
@@ -122,15 +134,16 @@ class TasksViewModel : BaseViewModel() {
                         putLong("last_task_reporting", Date().time)
                     }
                 }
-            }.subscribe({}, RxErrorHandler.handleEmptyError())
-        )
+            }
+        }
     }
 
-    private val filterSets: HashMap<TaskType, MutableLiveData<Triple<String?, String?, List<String>>>> = hashMapOf(
-        Pair(TaskType.HABIT, MutableLiveData()),
-        Pair(TaskType.DAILY, MutableLiveData()),
-        Pair(TaskType.TODO, MutableLiveData())
-    )
+    private val filterSets: HashMap<TaskType, MutableLiveData<Triple<String?, String?, List<String>>>> =
+        hashMapOf(
+            Pair(TaskType.HABIT, MutableLiveData()),
+            Pair(TaskType.DAILY, MutableLiveData()),
+            Pair(TaskType.TODO, MutableLiveData())
+        )
 
     fun getFilterSet(type: TaskType): MutableLiveData<Triple<String?, String?, List<String>>>? {
         return filterSets[type]
@@ -276,10 +289,12 @@ class TasksViewModel : BaseViewModel() {
                     } else {
                         query.equalTo("completed", false)
                     }
-                    Task.FILTER_GRAY -> query = query.equalTo("completed", true).or().equalTo("isDue", false)
+                    Task.FILTER_GRAY -> query =
+                        query.equalTo("completed", true).or().equalTo("isDue", false)
                     Task.FILTER_WEAK -> query = query.lessThan("value", 1.0)
                     Task.FILTER_STRONG -> query = query.greaterThanOrEqualTo("value", 1.0)
-                    Task.FILTER_DATED -> query = query.isNotNull("dueDate").equalTo("completed", false).sort("dueDate")
+                    Task.FILTER_DATED -> query =
+                        query.isNotNull("dueDate").equalTo("completed", false).sort("dueDate")
                     Task.FILTER_COMPLETED -> query = query.equalTo("completed", true)
                 }
             }
@@ -289,4 +304,34 @@ class TasksViewModel : BaseViewModel() {
         }
         return query
     }
+
+    override fun canScoreTask(task: Task): Boolean {
+        if (!task.isGroupTask) {
+            return true
+        }
+        return task.isAssignedToUser(userViewModel.userID) || task.group?.assignedUsers?.isEmpty() != false
+    }
+
+    override fun canEditTask(task: Task): Boolean {
+        if (!task.isGroupTask) {
+            return true
+        }
+        return false
+    }
+
+    override fun assignedTextForTask(resources: Resources, assignedUsers: List<String>): String {
+        return if (assignedUsers.contains(userViewModel.userID)) {
+            if (assignedUsers.size == 1) {
+                resources.getString(R.string.you)
+            } else {
+                resources.getQuantityString(R.plurals.you_x_others, assignedUsers.size - 1, assignedUsers.size - 1)
+            }
+        } else {
+            if (assignedUsers.size == 1) {
+                userViewModel.currentTeamPlanMembers.value?.firstOrNull { it.id == assignedUsers.first() }?.displayName ?: ""
+            } else {
+                resources.getQuantityString(R.plurals.people, assignedUsers.size, assignedUsers.size)
+            }
+        }
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/inventory/equipment/EquipmentOverviewViewModel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/inventory/equipment/EquipmentOverviewViewModel.kt
index bece1a9a1..befd2219f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/inventory/equipment/EquipmentOverviewViewModel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/inventory/equipment/EquipmentOverviewViewModel.kt
@@ -1,14 +1,13 @@
 package com.habitrpg.android.habitica.ui.viewmodels.inventory.equipment
 
-import androidx.lifecycle.SavedStateHandle
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.InventoryRepository
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.inventory.Equipment
 import com.habitrpg.android.habitica.ui.viewmodels.BaseViewModel
 import javax.inject.Inject
 
-class EquipmentOverviewViewModel(savedStateHandle: SavedStateHandle) : BaseViewModel() {
+class EquipmentOverviewViewModel : BaseViewModel() {
     val usesAutoEquip: Boolean
         get() = user.value?.preferences?.autoEquip == true
     val usesCostume: Boolean
@@ -25,7 +24,7 @@ class EquipmentOverviewViewModel(savedStateHandle: SavedStateHandle) : BaseViewM
         disposable.add(
             inventoryRepository.getEquipment(key).subscribe({
                 onSuccess(it)
-            }, RxErrorHandler.handleEmptyError())
+            }, ExceptionHandler.rx())
         )
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/AppHeaderView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/AppHeaderView.kt
new file mode 100644
index 000000000..a604a4bf2
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/AppHeaderView.kt
@@ -0,0 +1,304 @@
+package com.habitrpg.android.habitica.ui.views
+
+import android.graphics.Bitmap
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.slideInHorizontally
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.slideOutHorizontally
+import androidx.compose.animation.slideOutVertically
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.requiredSize
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.LinearProgressIndicator
+import androidx.compose.material.ProgressIndicatorDefaults
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.core.os.bundleOf
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.helpers.MainNavigationController
+import com.habitrpg.android.habitica.models.user.User
+import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel
+import com.habitrpg.common.habitica.helpers.NumberAbbreviator
+import java.lang.Double.max
+import java.math.RoundingMode
+import java.text.NumberFormat
+
+@Composable
+fun UserLevelText(user: User) {
+    val text = if (user.hasClass) {
+        stringResource(
+            id = R.string.user_level_with_class,
+            user.stats?.lvl ?: 0,
+            user.stats?.getTranslatedClassName(
+                LocalContext.current.resources
+            ) ?: ""
+        )
+    } else {
+        stringResource(id = R.string.user_level, user.stats?.lvl ?: 0)
+    }
+    Text(
+        text,
+        fontSize = 12.sp,
+        fontWeight = FontWeight.SemiBold,
+        color = colorResource(R.color.text_primary)
+    )
+}
+
+@Composable
+fun CurrencyText(
+    currency: String,
+    value: Double,
+    modifier: Modifier = Modifier,
+    decimals: Int = 2,
+    minForAbbrevation: Int = 0
+) {
+    Row(verticalAlignment = Alignment.CenterVertically) {
+        when (currency) {
+            "gold" -> HabiticaIconsHelper.imageOfGold()
+            "gems" -> HabiticaIconsHelper.imageOfGem()
+            "hourglasses" -> HabiticaIconsHelper.imageOfHourglass()
+            else -> null
+        }?.asImageBitmap()?.let { Image(it, null, Modifier.padding(end = 5.dp)) }
+        Text(
+            NumberAbbreviator.abbreviate(null, value, decimals, minForAbbrevation),
+            color = when (currency) {
+                "gold" -> colorResource(R.color.text_gold)
+                "gems" -> colorResource(R.color.text_green)
+                "hourglasses" -> colorResource(R.color.text_brand)
+                else -> colorResource(R.color.text_primary)
+            },
+            fontSize = 12.sp,
+            fontWeight = FontWeight.SemiBold,
+            modifier = modifier
+        )
+    }
+}
+
+@Composable
+fun AppHeaderView(
+    viewModel: MainUserViewModel,
+) {
+    val user by viewModel.user.observeAsState(null)
+    val teamPlan by viewModel.currentTeamPlan.collectAsState(null)
+    val teamPlanMembers by viewModel.currentTeamPlanMembers.observeAsState()
+    Column {
+        Row {
+            ComposableAvatarView(
+                user,
+                Modifier
+                    .size(110.dp, 100.dp)
+                    .padding(end = 16.dp)
+            )
+            Column(modifier = Modifier.height(100.dp)) {
+                Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.weight(1f)) {
+                    Column(modifier = Modifier.weight(1f)) {
+                        LabeledBar(
+                            icon = HabiticaIconsHelper.imageOfHeartLightBg(),
+                            label = stringResource(R.string.HP_default),
+                            color = colorResource(R.color.hpColor),
+                            value = user?.stats?.hp ?: 0.0,
+                            maxValue = user?.stats?.maxHealth?.toDouble() ?: 0.0,
+                            displayCompact = teamPlan != null,
+                            modifier = Modifier.weight(1f)
+                        )
+                        LabeledBar(
+                            icon = HabiticaIconsHelper.imageOfExperience(),
+                            label = stringResource(R.string.XP_default),
+                            color = colorResource(R.color.xpColor),
+                            value = user?.stats?.exp ?: 0.0,
+                            maxValue = user?.stats?.toNextLevel?.toDouble() ?: 0.0,
+                            displayCompact = teamPlan != null,
+                            modifier = Modifier.weight(1f)
+                        )
+                        if (user?.hasClass == true) {
+                            LabeledBar(
+                                icon = HabiticaIconsHelper.imageOfMagic(),
+                                label = stringResource(R.string.MP_default),
+                                color = colorResource(R.color.mpColor),
+                                value = user?.stats?.mp ?: 0.0,
+                                maxValue = user?.stats?.maxMP?.toDouble() ?: 0.0,
+                                displayCompact = teamPlan != null,
+                                modifier = Modifier.weight(1f)
+                            )
+                        }
+                    }
+                    val animWidth = with(LocalDensity.current) { 48.dp.roundToPx() }
+                    AnimatedVisibility(
+                        visible = teamPlan != null,
+                        enter = slideInHorizontally { animWidth } + fadeIn(),
+                        exit = slideOutHorizontally { animWidth } + fadeOut()) {
+                        Row(
+                            horizontalArrangement = Arrangement.Center,
+                            verticalAlignment = Alignment.CenterVertically,
+                            modifier = Modifier
+                                .padding(start = 12.dp)
+                                .width(72.dp)
+                                .height(48.dp)
+                                .clip(RoundedCornerShape(8.dp))
+                                .background(
+                                    colorResource(R.color.window_background)
+                                )
+                                .clickable {
+                                    MainNavigationController.navigate(
+                                        R.id.guildFragment,
+                                        bundleOf("groupID" to teamPlan?.id)
+                                    )
+                                }
+                        ) {
+                            Image(painterResource(R.drawable.icon_chat), null, colorFilter = ColorFilter.tint(
+                                colorResource(R.color.text_ternary)))
+                        }
+                    }
+                }
+                val animHeight = with(LocalDensity.current) { 40.dp.roundToPx() }
+                AnimatedVisibility(
+                    visible = teamPlan != null,
+                    enter = slideInVertically { animHeight } + fadeIn(),
+                    exit = slideOutVertically { animHeight } + fadeOut()) {
+                    Row(
+                        horizontalArrangement = Arrangement.spacedBy(14.dp, Alignment.CenterHorizontally),
+                        verticalAlignment = Alignment.CenterVertically,
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(top = 12.dp)
+                            .height(40.dp)
+                            .width(72.dp)
+                            .clip(RoundedCornerShape(8.dp))
+                            .background(
+                                colorResource(R.color.window_background)
+                            )
+                            .clickable {
+                                MainNavigationController.navigate(
+                                    R.id.guildFragment,
+                                    bundleOf("groupID" to teamPlan?.id)
+                                )
+                            }
+                    ) {
+                        for (member in teamPlanMembers?.filter { it.id != user?.id }?.take(6) ?: emptyList()) {
+                            Box(modifier = Modifier
+                                .clip(CircleShape)
+                                .size(26.dp)
+                                .padding(end = 6.dp, top = 4.dp)) {
+                                ComposableAvatarView(
+                                    avatar = member,
+                                    Modifier
+                                        .size(64.dp)
+                                        .requiredSize(64.dp)
+                                )
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        Row(verticalAlignment = Alignment.CenterVertically) {
+            if (user?.hasClass == true) {
+                val icon = when (user?.stats?.habitClass) {
+                    "warrior" -> HabiticaIconsHelper.imageOfWarriorLightBg().asImageBitmap()
+                    "wizard" -> HabiticaIconsHelper.imageOfMageLightBg().asImageBitmap()
+                    "healer" -> HabiticaIconsHelper.imageOfHealerLightBg().asImageBitmap()
+                    "rogue" -> HabiticaIconsHelper.imageOfRogueLightBg().asImageBitmap()
+                    else -> null
+                }
+                if (icon != null) {
+                    Image(bitmap = icon, "", modifier = Modifier.padding(end = 4.dp))
+                }
+            }
+            user?.let { UserLevelText(it) }
+            Spacer(Modifier.weight(1f))
+            user?.hourglassCount?.toDouble()
+                ?.let { CurrencyText("hourglasses", it, modifier = Modifier.padding(end = 12.dp)) }
+            CurrencyText("gold", user?.stats?.gp ?: 0.0, modifier = Modifier.padding(end = 12.dp))
+            CurrencyText("gems", user?.gemCount?.toDouble() ?: 0.0)
+        }
+    }
+}
+
+@Composable
+fun LabeledBar(
+    icon: Bitmap,
+    label: String,
+    color: Color,
+    value: Double,
+    maxValue: Double,
+    displayCompact: Boolean,
+    modifier: Modifier = Modifier
+) {
+    val formatter = NumberFormat.getInstance()
+    formatter.maximumFractionDigits = 1
+    formatter.roundingMode = RoundingMode.UP
+    formatter.isGroupingUsed = true
+
+    val cleanedMaxVlaue = max(1.0, maxValue)
+
+    val animatedValue = animateFloatAsState(
+        targetValue = value.toFloat(),
+        animationSpec = ProgressIndicatorDefaults.ProgressAnimationSpec,
+    ).value
+    Row(verticalAlignment = Alignment.CenterVertically, modifier = modifier) {
+        AnimatedVisibility(
+            visible = !displayCompact,
+            enter = slideInHorizontally { -18 },
+            exit = slideOutHorizontally { -18 }) {
+            Image(icon.asImageBitmap(), null, modifier = Modifier.padding(end = 8.dp))
+        }
+        Column(modifier = Modifier.weight(1f)) {
+            LinearProgressIndicator(
+                progress = (animatedValue / cleanedMaxVlaue).toFloat(),
+                Modifier
+                    .fillMaxWidth()
+                    .clip(CircleShape)
+                    .height(8.dp),
+                backgroundColor = colorResource(R.color.window_background),
+                color = color
+            )
+            AnimatedVisibility(visible = !displayCompact) {
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    modifier = Modifier.padding(top = 2.dp)
+                ) {
+                    Text(
+                        "${formatter.format(animatedValue)} / ${formatter.format(cleanedMaxVlaue)}",
+                        fontSize = 12.sp,
+                        color = colorResource(R.color.text_ternary)
+                    )
+                    Spacer(Modifier.weight(1f))
+                    Text(label, fontSize = 12.sp, color = colorResource(R.color.text_ternary))
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CollapsibleSectionView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CollapsibleSectionView.kt
index e3ee68a1d..88c7fb4bd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CollapsibleSectionView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CollapsibleSectionView.kt
@@ -2,7 +2,6 @@ package com.habitrpg.android.habitica.ui.views
 
 import android.content.Context
 import android.content.SharedPreferences
-import android.graphics.drawable.ColorDrawable
 import android.util.AttributeSet
 import android.view.View
 import android.widget.ImageView
@@ -48,14 +47,6 @@ class CollapsibleSectionView(context: Context, attrs: AttributeSet?) : LinearLay
 
     var identifier: String? = null
 
-    var separatorColor: Int
-        get() {
-            return (binding.separator.background as? ColorDrawable)?.color ?: 0
-        }
-        set(value) {
-            binding.separator.setBackgroundColor(value)
-        }
-
     private fun showViews() {
         updatePreferences()
         setCaretImage()
@@ -67,7 +58,7 @@ class CollapsibleSectionView(context: Context, attrs: AttributeSet?) : LinearLay
     private fun hideViews() {
         updatePreferences()
         setCaretImage()
-        (2 until childCount)
+        (0 until childCount)
             .map { getChildAt(it) }
             .filter { it != binding.sectionTitleView }
             .forEach {
@@ -87,7 +78,7 @@ class CollapsibleSectionView(context: Context, attrs: AttributeSet?) : LinearLay
     }
 
     private fun setChildMargins() {
-        (2 until childCount)
+        (0 until childCount)
             .map { getChildAt(it) }
             .filter { it != binding.sectionTitleView }
             .forEach {
@@ -104,11 +95,9 @@ class CollapsibleSectionView(context: Context, attrs: AttributeSet?) : LinearLay
 
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
         var height = 0
-        measureChildWithMargins(binding.separator, widthMeasureSpec, 0, heightMeasureSpec, height)
-        height += binding.separator.measuredHeight
         measureChildWithMargins(binding.sectionTitleView, widthMeasureSpec, 0, heightMeasureSpec, height)
         height += binding.sectionTitleView.measuredHeight
-        (2 until childCount)
+        (1 until childCount)
             .map { getChildAt(it) }
             .forEach {
                 if (it.visibility != View.GONE) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ComposableAvatarView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ComposableAvatarView.kt
new file mode 100644
index 000000000..5bee6721a
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ComposableAvatarView.kt
@@ -0,0 +1,40 @@
+package com.habitrpg.android.habitica.ui.views
+
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.graphics.Outline
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.LayoutDirection
+import androidx.compose.ui.viewinterop.AndroidView
+import com.habitrpg.common.habitica.views.AvatarView
+import com.habitrpg.shared.habitica.models.Avatar
+
+object AvatarCircleShape : Shape {
+    override fun createOutline(
+        size: Size,
+        layoutDirection: LayoutDirection,
+        density: Density
+    ): Outline =
+        CircleShape.createOutline(size, 20f, 20f, 20f, 20f, layoutDirection)
+}
+
+@Composable
+fun ComposableAvatarView(
+    avatar: Avatar?,
+    modifier: Modifier = Modifier
+) {
+    AndroidView(
+        modifier = modifier, // Occupy the max size in the Compose UI tree
+        factory = { context ->
+            AvatarView(context)
+        },
+        update = { view ->
+            if (avatar != null) {
+                view.setAvatar(avatar)
+            }
+        }
+    )
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyView.kt
index d62f07d79..551af68c0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CurrencyView.kt
@@ -69,21 +69,21 @@ class CurrencyView : androidx.appcompat.widget.AppCompatTextView {
 
     private fun configureCurrency() {
         if ("gold" == currency) {
-            icon = com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper.imageOfGold()
+            icon = HabiticaIconsHelper.imageOfGold()
             if (lightBackground) {
                 setTextColor(ContextCompat.getColor(context, R.color.yellow_1))
             } else {
                 setTextColor(ContextCompat.getColor(context, R.color.yellow_100))
             }
         } else if ("gems" == currency) {
-            icon = com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper.imageOfGem()
+            icon = HabiticaIconsHelper.imageOfGem()
             if (lightBackground) {
                 setTextColor(ContextCompat.getColor(context, R.color.green_10))
             } else {
                 setTextColor(ContextCompat.getColor(context, R.color.green_50))
             }
         } else if ("hourglasses" == currency) {
-            icon = com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper.imageOfHourglass()
+            icon = HabiticaIconsHelper.imageOfHourglass()
             if (lightBackground) {
                 setTextColor(ContextCompat.getColor(context, R.color.brand_300))
             } else {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EquipmentOverviewView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EquipmentOverviewView.kt
new file mode 100644
index 000000000..ce37fef3b
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EquipmentOverviewView.kt
@@ -0,0 +1,217 @@
+package com.habitrpg.android.habitica.ui.views
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.models.user.Outfit
+import com.habitrpg.android.habitica.models.user.Preferences
+import com.habitrpg.android.habitica.ui.theme.HabiticaTheme
+import com.habitrpg.android.habitica.ui.theme.caption2
+
+@Composable
+fun OverviewItem(
+    text: String,
+    iconName: String?,
+    modifier: Modifier = Modifier,
+    isTwoHanded: Boolean = false
+) {
+    val hasIcon = iconName?.isNotBlank() == true
+    Column(
+        horizontalAlignment = Alignment.CenterHorizontally, modifier = modifier
+            .width(70.dp)
+    ) {
+        Box(
+            Modifier
+                .size(70.dp)
+                .clip(RoundedCornerShape(4.dp))
+                .background(colorResource(if (hasIcon) R.color.gray_700 else R.color.gray_10)),
+            contentAlignment = Alignment.Center
+        ) {
+            if (isTwoHanded) {
+                Image(painterResource(R.drawable.equipment_two_handed), null)
+            } else if (hasIcon) {
+                PixelArtView(
+                    imageName = iconName, Modifier
+                        .size(70.dp)
+                )
+            } else {
+                Image(painterResource(R.drawable.equipment_nothing_equipped), null)
+            }
+        }
+        Text(
+            text,
+            style = HabiticaTheme.typography.caption2,
+            color = colorResource(R.color.gray_400),
+            textAlign = TextAlign.Center,
+            modifier = Modifier.padding(top = 4.dp)
+        )
+    }
+}
+
+@Composable
+fun EquipmentOverviewView(
+    outfit: Outfit?,
+    onEquipmentTap: (String, String?) -> Unit,
+    modifier: Modifier = Modifier
+) {
+    Column(
+        verticalArrangement = Arrangement.spacedBy(18.dp),
+        modifier = modifier
+            .fillMaxWidth()
+            .clip(RoundedCornerShape(6.dp))
+            .background(colorResource(R.color.gray_50))
+            .padding(12.dp)
+    ) {
+        Row(horizontalArrangement = Arrangement.SpaceBetween, modifier = Modifier.fillMaxWidth()) {
+            OverviewItem(stringResource(R.string.outfit_weapon), outfit?.weapon.let { "shop_$it" }, Modifier.clickable {
+                onEquipmentTap("weapon", null)
+            })
+            OverviewItem(stringResource(R.string.outfit_shield), outfit?.shield.let { "shop_$it" }, Modifier.clickable {
+                onEquipmentTap("shield", null)
+            })
+            OverviewItem(stringResource(R.string.outfit_head), outfit?.head.let { "shop_$it" }, Modifier.clickable {
+                onEquipmentTap("head", null)
+            })
+            OverviewItem(stringResource(R.string.outfit_armor), outfit?.armor.let { "shop_$it" }, Modifier.clickable {
+                onEquipmentTap("armor", null)
+            })
+        }
+        Row(horizontalArrangement = Arrangement.SpaceBetween, modifier = Modifier.fillMaxWidth()) {
+            OverviewItem(
+                stringResource(R.string.outfit_headAccessory),
+                outfit?.headAccessory.let { "shop_$it" }, Modifier.clickable {
+                    onEquipmentTap("headAccessory", null)
+                })
+            OverviewItem(stringResource(R.string.outfit_body), outfit?.body.let { "shop_$it" }, Modifier.clickable {
+                onEquipmentTap("body", null)
+            })
+            OverviewItem(stringResource(R.string.outfit_back), outfit?.back.let { "shop_$it" }, Modifier.clickable {
+                onEquipmentTap("back", null)
+            })
+            OverviewItem(
+                stringResource(R.string.outfit_eyewear),
+                outfit?.eyeWear.let { "shop_$it" }, Modifier.clickable {
+                    onEquipmentTap("eyewear", null)
+                })
+        }
+    }
+}
+
+@Composable
+fun AvatarCustomizationOverviewView(
+    preferences: Preferences?,
+    onCustomizationTap: (String, String?) -> Unit,
+    modifier: Modifier = Modifier
+) {
+    Column(
+        verticalArrangement = Arrangement.spacedBy(18.dp),
+        modifier = modifier
+            .fillMaxWidth()
+            .clip(RoundedCornerShape(6.dp))
+            .background(colorResource(R.color.gray_50))
+            .padding(12.dp)
+    ) {
+        Row(horizontalArrangement = Arrangement.SpaceBetween, modifier = Modifier.fillMaxWidth()) {
+            OverviewItem(
+                stringResource(R.string.avatar_shirt),
+                preferences?.shirt.let { "${preferences?.size}_shirt$it" }, Modifier.clickable {
+                    onCustomizationTap("shirt", null)
+                })
+            OverviewItem(
+                stringResource(R.string.avatar_skin),
+                preferences?.skin.let { "skin_$it" },
+                Modifier.clickable {
+                    onCustomizationTap("skin", null)
+                })
+            OverviewItem(
+                stringResource(R.string.avatar_hair_color),
+                if (preferences?.hair?.color != null && preferences.hair?.color != "") "hair_bangs_1_" + preferences.hair?.color else "",
+                Modifier.clickable {
+                    onCustomizationTap("hair", "color")
+                }
+            )
+            OverviewItem(
+                stringResource(R.string.avatar_hair_bangs),
+                if (preferences?.hair?.bangs != null && preferences.hair?.bangs != 0) "hair_bangs_" + preferences.hair?.bangs + "_" + preferences.hair?.color else "",
+                Modifier.clickable {
+                    onCustomizationTap("hair", "bangs")
+                }
+            )
+        }
+        Row(horizontalArrangement = Arrangement.SpaceBetween, modifier = Modifier.fillMaxWidth()) {
+            OverviewItem(
+                stringResource(R.string.avatar_style),
+                if (preferences?.hair?.base != null && preferences.hair?.base != 0) "hair_base_" + preferences.hair?.base + "_" + preferences.hair?.color else "",
+                Modifier.clickable {
+                    onCustomizationTap("hair", "base")
+                }
+            )
+            OverviewItem(
+                stringResource(R.string.avatar_mustache),
+                if (preferences?.hair?.mustache != null && preferences.hair?.mustache != 0) "hair_mustache_" + preferences.hair?.mustache + "_" + preferences.hair?.color else "",
+                Modifier.clickable {
+                    onCustomizationTap("hair", "mustache")
+                }
+            )
+            OverviewItem(
+                stringResource(R.string.avatar_beard),
+                if (preferences?.hair?.beard != null && preferences.hair?.beard != 0) "hair_beard_" + preferences.hair?.beard + "_" + preferences.hair?.color else "",
+                Modifier.clickable {
+                    onCustomizationTap("hair", "beard")
+                }
+            )
+            OverviewItem(
+                stringResource(R.string.avatar_flower),
+                if (preferences?.hair?.flower != null && preferences.hair?.flower != 0) "hair_flower_" + preferences.hair?.flower else "",
+                Modifier.clickable {
+                    onCustomizationTap("hair", "flower")
+                }
+            )
+        }
+        Row(horizontalArrangement = Arrangement.SpaceBetween, modifier = Modifier.fillMaxWidth()) {
+            OverviewItem(
+                stringResource(R.string.avatar_wheelchair),
+                preferences?.chair?.let { if (it.startsWith("handleless")) "chair_$it" else it })
+            OverviewItem(
+                stringResource(R.string.avatar_background),
+                preferences?.background.let { "background_$it" })
+            Box(Modifier.size(70.dp))
+            Box(Modifier.size(70.dp))
+        }
+    }
+}
+
+@Preview
+@Composable
+fun EquipmentOverviewItemPreview() {
+    Column(Modifier.width(320.dp)) {
+        Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+            OverviewItem("Main-Hand", "shop_weapon_warrior_1")
+            OverviewItem("Off-Hand", null, isTwoHanded = true)
+            OverviewItem("Armor", null)
+        }
+        EquipmentOverviewView(null, { _, _ -> })
+        AvatarCustomizationOverviewView(null, { _, _ -> })
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/NPCBannerView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/NPCBannerView.kt
index 34b7e2aaf..ce2f650c4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/NPCBannerView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/NPCBannerView.kt
@@ -10,11 +10,10 @@ import android.widget.ImageView
 import androidx.core.graphics.drawable.toBitmap
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.NpcBannerBinding
-import com.habitrpg.common.habitica.extensions.layoutInflater
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.common.habitica.extensions.DataBindingUtils
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.core.Observable
+import com.habitrpg.common.habitica.extensions.layoutInflater
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.launch
 import kotlin.math.roundToInt
 
 class NPCBannerView(context: Context, attrs: AttributeSet?) : FrameLayout(context, attrs) {
@@ -50,14 +49,9 @@ class NPCBannerView(context: Context, attrs: AttributeSet?) : FrameLayout(contex
             val width = (height * aspectRatio).roundToInt()
             val drawable = BitmapDrawable(context.resources, Bitmap.createScaledBitmap(it.toBitmap(), width, height, false))
             drawable.tileModeX = Shader.TileMode.REPEAT
-            Observable.just(drawable)
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(
-                    {
-                        binding.backgroundView.background = it
-                    },
-                    RxErrorHandler.handleEmptyError()
-                )
+            MainScope().launch {
+                binding.backgroundView.background = it
+            }
         }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/PixelArtView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/PixelArtView.kt
new file mode 100644
index 000000000..d9f95f89c
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/PixelArtView.kt
@@ -0,0 +1,28 @@
+package com.habitrpg.android.habitica.ui.views
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.viewinterop.AndroidView
+import com.habitrpg.common.habitica.extensions.loadImage
+import com.habitrpg.common.habitica.views.PixelArtView
+
+@Composable
+fun PixelArtView(
+    imageName: String?,
+    modifier: Modifier = Modifier,
+    imageFormat: String? = null
+) {
+    AndroidView(
+        modifier = modifier, // Occupy the max size in the Compose UI tree
+        factory = { context ->
+            PixelArtView(context)
+        },
+        update = { view ->
+            if (imageName != null) {
+                view.loadImage(imageName, imageFormat)
+            } else {
+                view.bitmap = null
+            }
+        }
+    )
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/SegmentedControl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/SegmentedControl.kt
new file mode 100644
index 000000000..c13f53773
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/SegmentedControl.kt
@@ -0,0 +1,139 @@
+package com.habitrpg.android.habitica.ui.views
+
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.ButtonDefaults
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.OutlinedButton
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.zIndex
+
+/**
+ * items : list of items to be render
+ * defaultSelectedItemIndex : to highlight item by default (Optional)
+ * useFixedWidth : set true if you want to set fix width to item (Optional)
+ * itemWidth : Provide item width if useFixedWidth is set to true (Optional)
+ * cornerRadius : To make control as rounded (Optional)
+ * color : Set color to control (Optional)
+ * onItemSelection : Get selected item index
+ */
+@Composable
+fun SegmentedControl(
+    items: List<String>,
+    defaultSelectedItemIndex: Int = 0,
+    useFixedWidth: Boolean = false,
+    itemWidth: Dp = 120.dp,
+    cornerRadius : Int = 10,
+    onItemSelection: (selectedItemIndex: Int) -> Unit
+) {
+    val selectedIndex = remember { mutableStateOf(defaultSelectedItemIndex) }
+    val color = MaterialTheme.colors.primary
+    Row(
+        modifier = Modifier
+    ) {
+        items.forEachIndexed { index, item ->
+            OutlinedButton(
+                modifier = when (index) {
+                    0 -> {
+                        if (useFixedWidth) {
+                            Modifier
+                                .width(itemWidth)
+                                .offset(0.dp, 0.dp)
+                                .zIndex(if (selectedIndex.value == 0) 1f else 0f)
+                        } else {
+                            Modifier
+                                .wrapContentSize()
+                                .offset(0.dp, 0.dp)
+                                .zIndex(if (selectedIndex.value == 0) 1f else 0f)
+                        }
+                    } else -> {
+                        if (useFixedWidth)
+                            Modifier
+                                .width(itemWidth)
+                                .offset((-1 * index).dp, 0.dp)
+                                .zIndex(if (selectedIndex.value == index) 1f else 0f)
+                        else Modifier
+                            .wrapContentSize()
+                            .offset((-1 * index).dp, 0.dp)
+                            .zIndex(if (selectedIndex.value == index) 1f else 0f)
+                    }
+                },
+                onClick = {
+                    selectedIndex.value = index
+                    onItemSelection(selectedIndex.value)
+                },
+                shape = when (index) {
+                    /**
+                     * left outer button
+                     */
+                    0 -> RoundedCornerShape(
+                        topStartPercent = cornerRadius,
+                        topEndPercent = 0,
+                        bottomStartPercent = cornerRadius,
+                        bottomEndPercent = 0
+                    )
+                    /**
+                     * right outer button
+                     */
+                    items.size - 1 -> RoundedCornerShape(
+                        topStartPercent = 0,
+                        topEndPercent = cornerRadius,
+                        bottomStartPercent = 0,
+                        bottomEndPercent = cornerRadius
+                    )
+                    /**
+                     * middle button
+                     */
+                    else -> RoundedCornerShape(
+                        topStartPercent = 0,
+                        topEndPercent = 0,
+                        bottomStartPercent = 0,
+                        bottomEndPercent = 0
+                    )
+                },
+                border = BorderStroke(
+                    1.dp, if (selectedIndex.value == index) {
+                        color
+                    } else {
+                        color.copy(alpha = 0.75f)
+                    }
+                ),
+                colors = if (selectedIndex.value == index) {
+                    /**
+                     * selected colors
+                     */
+                    ButtonDefaults.outlinedButtonColors(
+                        backgroundColor = color
+                    )
+                } else {
+                    /**
+                     * not selected colors
+                     */
+                    ButtonDefaults.outlinedButtonColors(backgroundColor = Color.Transparent)
+                },
+            ) {
+                Text(
+                    text = item,
+                    fontWeight = FontWeight.Normal,
+                    color = if (selectedIndex.value == index) {
+                        Color.White
+                    } else {
+                        color.copy(alpha = 0.9f)
+                    },
+                )
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/Typewriter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/Typewriter.kt
index beb762365..6d41cf526 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/Typewriter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/Typewriter.kt
@@ -8,8 +8,8 @@ import android.util.AttributeSet
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 
@@ -51,8 +51,8 @@ class Typewriter : androidx.appcompat.widget.AppCompatTextView {
 
         setText(stringBuilder)
         job?.cancel()
-        job = GlobalScope.launch(Dispatchers.Main) {
-            while (index <= stringBuilder?.length ?: 0) {
+        job = MainScope().launch(Dispatchers.Main) {
+            while (index <= (stringBuilder?.length ?: 0)) {
                 stringBuilder?.setSpan(visibleSpan, 0, index++, Spannable.SPAN_INCLUSIVE_INCLUSIVE)
                 setText(stringBuilder)
                 delay(delay)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/PetSuggestHatchDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/PetSuggestHatchDialog.kt
index 3e3b35b4a..1652ba27f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/PetSuggestHatchDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/PetSuggestHatchDialog.kt
@@ -11,7 +11,7 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.DialogHatchPetButtonBinding
 import com.habitrpg.android.habitica.databinding.DialogPetSuggestHatchBinding
 import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.interactors.HatchPetUseCase
 import com.habitrpg.android.habitica.models.inventory.Animal
 import com.habitrpg.android.habitica.models.inventory.Egg
@@ -148,12 +148,12 @@ class PetSuggestHatchDialog(context: Context) : HabiticaAlertDialog(context) {
                         observable = observable.flatMap { activity.inventoryRepository.purchaseItem("hatchingPotions", thisPotion.key, 1) }
                     }
                     observable
-                        .flatMap { activity.userRepository.retrieveUser(true, forced = true) }
                         .subscribe(
                             {
+                                // TODO: activity.userRepository.retrieveUser(true, forced = true)
                                 hatchPet(thisPotion, thisEgg)
                             },
-                            RxErrorHandler.handleEmptyError()
+                            ExceptionHandler.rx()
                         )
                 }
             }
@@ -173,7 +173,7 @@ class PetSuggestHatchDialog(context: Context) : HabiticaAlertDialog(context) {
                     {
                         binding.petView.bitmap = drawable.toBitmap()
                     },
-                    RxErrorHandler.handleEmptyError()
+                    ExceptionHandler.rx()
                 )
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientGemsDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientGemsDialog.kt
index 26597f250..a5e94d945 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientGemsDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientGemsDialog.kt
@@ -12,6 +12,7 @@ import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.addCloseButton
 import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.PurchaseHandler
 import com.habitrpg.android.habitica.helpers.PurchaseTypes
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/HabiticaBottomNavigationView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/HabiticaBottomNavigationView.kt
index e6dfa6468..03e3d67fd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/HabiticaBottomNavigationView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/HabiticaBottomNavigationView.kt
@@ -5,7 +5,6 @@ import android.content.Context
 import android.graphics.PorterDuff
 import android.util.AttributeSet
 import android.view.MotionEvent
-import android.view.View
 import android.view.animation.Animation
 import android.view.animation.BounceInterpolator
 import android.view.animation.LinearInterpolator
@@ -16,9 +15,9 @@ import androidx.core.view.ViewCompat
 import androidx.core.view.children
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.MainNavigationViewBinding
+import com.habitrpg.android.habitica.extensions.setTintWith
 import com.habitrpg.common.habitica.extensions.getThemeColor
 import com.habitrpg.common.habitica.extensions.layoutInflater
-import com.habitrpg.android.habitica.extensions.setTintWith
 import com.habitrpg.shared.habitica.models.tasks.TaskType
 
 interface HabiticaBottomNavigationViewListener {
@@ -68,26 +67,11 @@ class HabiticaBottomNavigationView @JvmOverloads constructor(
             field = value
             val animator = ObjectAnimator.ofFloat(0f, 1.0f)
             if (field) {
-                val params = binding.cutoutFill.layoutParams
-                params.height = binding.cutoutBackground.height
-                binding.cutoutFill.layoutParams = params
-                animator.addUpdateListener {
-                    val reversed = 1.0f - it.animatedFraction
-                    binding.cutoutFill.translationY = -(reversed) * binding.cutoutBackground.height
-                }
-                binding.cutoutSpace.visibility = View.VISIBLE
                 binding.addButtonBackground.animate()
                     .translationY(0f)
                     .alpha(1f)
                     .setDuration(200)
             } else {
-                val params = binding.cutoutFill.layoutParams
-                params.height = binding.cutoutBackground.height
-                binding.cutoutFill.layoutParams = params
-                animator.addUpdateListener {
-                    binding.cutoutFill.translationY = -it.animatedFraction * (binding.cutoutBackground.height)
-                }
-                binding.cutoutSpace.visibility = View.INVISIBLE
                 binding.addButtonBackground.animate()
                     .translationY(-binding.addButtonBackground.height.toFloat() / 2)
                     .alpha(0.0f)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
index 622503bb8..953bb8be7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
@@ -20,9 +20,9 @@ import com.habitrpg.android.habitica.extensions.addCancelButton
 import com.habitrpg.android.habitica.extensions.addCloseButton
 import com.habitrpg.android.habitica.extensions.getShortRemainingString
 import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.helpers.HapticFeedbackManager
 import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.shops.Shop
 import com.habitrpg.android.habitica.models.shops.ShopItem
 import com.habitrpg.android.habitica.models.user.OwnedItem
@@ -42,7 +42,6 @@ import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.delay
@@ -99,11 +98,16 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
                 shopItem.isTypeItem -> contentView = PurchaseDialogItemContent(context)
                 shopItem.isTypeQuest -> {
                     contentView = PurchaseDialogQuestContent(context)
-                    inventoryRepository.getQuestContent(shopItem.key).firstElement().subscribe({ contentView.setQuestContent(it) }, RxErrorHandler.handleEmptyError())
+                    MainScope().launch(ExceptionHandler.coroutine()) {
+                        val content = inventoryRepository.getQuestContent(shopItem.key).firstOrNull()
+                        if (content != null) {
+                            contentView.setQuestContentItem(content)
+                        }
+                    }
                 }
                 shopItem.isTypeGear -> {
                     contentView = PurchaseDialogGearContent(context)
-                    inventoryRepository.getEquipment(shopItem.key).firstElement().subscribe({ contentView.setEquipment(it) }, RxErrorHandler.handleEmptyError())
+                    inventoryRepository.getEquipment(shopItem.key).firstElement().subscribe({ contentView.setEquipment(it) }, ExceptionHandler.rx())
                     checkGearClass()
                 }
                 "gems" == shopItem.purchaseType -> contentView = PurchaseDialogGemsContent(context)
@@ -182,7 +186,7 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
             limitedTextView.setBackgroundColor(ContextCompat.getColor(context, R.color.inverted_background))
         } else if (shopItem.event?.end != null) {
             limitedTextViewJob?.cancel()
-            limitedTextViewJob = GlobalScope.launch(Dispatchers.Main) {
+            limitedTextViewJob = MainScope().launch(Dispatchers.Main) {
                 limitedTextView.visibility = View.VISIBLE
                 while (shopItem.event?.end?.after(Date()) == true) {
                     limitedTextView.text = context.getString(R.string.available_for, shopItem.event?.end?.getShortRemainingString())
@@ -250,11 +254,11 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
         priceLabel = buyButton.findViewById(R.id.priceLabel)
         priceLabel.animationDuration = 0L
         buyLabel = buyButton.findViewById(R.id.buy_label)
-        pinButton.setOnClickListener { inventoryRepository.togglePinnedItem(shopItem).subscribe({ isPinned = !this.isPinned }, RxErrorHandler.handleEmptyError()) }
+        pinButton.setOnClickListener { inventoryRepository.togglePinnedItem(shopItem).subscribe({ isPinned = !this.isPinned }, ExceptionHandler.rx()) }
 
         shopItem = item
 
-        compositeSubscription.add(userRepository.getUserFlowable().subscribe({ this.setUser(it) }, RxErrorHandler.handleEmptyError()))
+        compositeSubscription.add(userRepository.getUserFlowable().subscribe({ this.setUser(it) }, ExceptionHandler.rx()))
     }
 
     private fun setUser(user: User) {
@@ -360,8 +364,8 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
             } else {
                 inventoryRepository.purchaseHourglassItem(shopItem.purchaseType, shopItem.key).cast(Any::class.java)
             }
-        } else if (shopItem.purchaseType == "fortify") {
-            observable = userRepository.reroll().cast(Any::class.java)
+        // TODO: } else if (shopItem.purchaseType == "fortify") {
+            // observable = userRepository.reroll().cast(Any::class.java)
         } else if (shopItem.purchaseType == "quests" && shopItem.currency == "gold") {
             observable = inventoryRepository.purchaseQuest(shopItem.key).cast(Any::class.java)
         } else if (shopItem.purchaseType == "debuffPotion") {
@@ -412,7 +416,7 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
                     rightText = "-" + priceLabel.text
                 )
             }
-            .flatMap { userRepository.retrieveUser(withTasks = false, forced = true) }
+            // TODO: .flatMap { userRepository.retrieveUser(withTasks = false, forced = true) }
             .flatMap { inventoryRepository.retrieveInAppRewards() }
             .subscribe({
                 if (item.isTypeGear || item.currency == "hourglasses") {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestProgressView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestProgressView.kt
index 9a32b88b4..0ffdf322c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestProgressView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestProgressView.kt
@@ -19,19 +19,19 @@ import androidx.core.graphics.drawable.toBitmap
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.QuestCollectBinding
 import com.habitrpg.android.habitica.databinding.QuestProgressBinding
-import com.habitrpg.common.habitica.extensions.layoutInflater
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.inventory.Quest
 import com.habitrpg.android.habitica.models.inventory.QuestContent
 import com.habitrpg.android.habitica.models.inventory.QuestProgressCollect
 import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.common.habitica.extensions.DataBindingUtils
-import com.habitrpg.common.habitica.extensions.loadImage
-import com.habitrpg.common.habitica.helpers.setMarkdown
 import com.habitrpg.android.habitica.ui.views.HabiticaIcons
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.NPCBannerView
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
+import com.habitrpg.common.habitica.extensions.DataBindingUtils
+import com.habitrpg.common.habitica.extensions.layoutInflater
+import com.habitrpg.common.habitica.extensions.loadImage
+import com.habitrpg.common.habitica.helpers.setMarkdown
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.core.Observable
 
@@ -152,7 +152,6 @@ class QuestProgressView : LinearLayout {
         binding.questFlourishesImageView.loadImage("quest_" + quest.key + "_flourishes")
         val lightColor = quest.colors?.lightColor
         if (lightColor != null) {
-            binding.questDescriptionSection.separatorColor = lightColor
             binding.questImageSeparator.setBackgroundColor(lightColor)
 
             val gradientDrawable = GradientDrawable(
@@ -196,7 +195,7 @@ class QuestProgressView : LinearLayout {
                                     showActiveStrikeAlert(strike.key)
                                 }
                             },
-                            RxErrorHandler.handleEmptyError()
+                            ExceptionHandler.rx()
                         )
                 }
             } else {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/BulkAllocateStatsDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/BulkAllocateStatsDialog.kt
index 88beb2920..ab6c2836a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/BulkAllocateStatsDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/BulkAllocateStatsDialog.kt
@@ -9,10 +9,13 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.databinding.DialogBulkAllocateBinding
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.common.habitica.extensions.getThemeColor
 import com.habitrpg.common.habitica.extensions.layoutInflater
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import io.reactivex.rxjava3.disposables.Disposable
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class BulkAllocateStatsDialog(context: Context, component: UserComponent?) : AlertDialog(context) {
@@ -67,7 +70,7 @@ class BulkAllocateStatsDialog(context: Context, component: UserComponent?) : Ale
                     this.dismiss()
                 },
                 {
-                    RxErrorHandler.reportError(it)
+                    ExceptionHandler.reportError(it)
                     this.dismiss()
                 }
             )
@@ -75,16 +78,17 @@ class BulkAllocateStatsDialog(context: Context, component: UserComponent?) : Ale
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        subscription = userRepository.getUserFlowable().subscribe(
-            {
-                pointsToAllocate = it.stats?.points ?: 0
-                binding.strengthSliderView.previousValue = it.stats?.strength ?: 0
-                binding.intelligenceSliderView.previousValue = it.stats?.intelligence ?: 0
-                binding.constitutionSliderView.previousValue = it.stats?.constitution ?: 0
-                binding.perceptionSliderView.previousValue = it.stats?.per ?: 0
-            },
-            RxErrorHandler.handleEmptyError()
-        )
+        MainScope().launch(ExceptionHandler.coroutine()) {
+            userRepository.getUser()
+                .filterNotNull()
+                .collect {
+                    pointsToAllocate = it.stats?.points ?: 0
+                    binding.strengthSliderView.previousValue = it.stats?.strength ?: 0
+                    binding.intelligenceSliderView.previousValue = it.stats?.intelligence ?: 0
+                    binding.constitutionSliderView.previousValue = it.stats?.constitution ?: 0
+                    binding.perceptionSliderView.previousValue = it.stats?.per ?: 0
+                }
+        }
 
         binding.strengthSliderView.allocateAction = {
             checkRedistribution(binding.strengthSliderView)
@@ -130,7 +134,7 @@ class BulkAllocateStatsDialog(context: Context, component: UserComponent?) : Ale
         firstSlider: StatsSliderView?,
         secondSlider: StatsSliderView?
     ): StatsSliderView? {
-        return if (firstSlider?.currentValue ?: 0 > secondSlider?.currentValue ?: 0) {
+        return if ((firstSlider?.currentValue ?: 0) > (secondSlider?.currentValue ?: 0)) {
             firstSlider
         } else {
             secondSlider
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsView.kt
index 8a3455f0d..d6624df74 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsView.kt
@@ -5,13 +5,126 @@ import android.graphics.PorterDuff
 import android.util.AttributeSet
 import android.view.View
 import android.widget.LinearLayout
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.Text
+import androidx.compose.material.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.StatsViewBinding
-import com.habitrpg.common.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.extensions.setTintWith
 import com.habitrpg.android.habitica.helpers.HapticFeedbackManager
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import com.habitrpg.common.habitica.extensions.layoutInflater
+
+@Composable
+fun StatsViewComposable(
+    statText: String,
+    statColor: Color,
+    levelValue: Int,
+    equipmentValue: Int,
+    buffValue: Int,
+    allocatedValue: Int,
+    canAllocate: Boolean,
+    allocateAction: () -> Unit
+) {
+    Column(
+        Modifier
+            .background(colorResource(R.color.window_background))
+            .clip(RoundedCornerShape(12.dp))) {
+        Row(
+            Modifier
+                .height(43.dp)
+                .fillMaxWidth()
+                .background(statColor)
+                .padding(horizontal = 12.dp),
+        horizontalArrangement = Arrangement.SpaceBetween,
+        verticalAlignment = Alignment.CenterVertically) {
+            Text(statText, color = colorResource(R.color.white))
+            Text("${levelValue + equipmentValue + buffValue + allocatedValue}", color = colorResource(R.color.white))
+        }
+        Row(Modifier.height(61.dp),
+            horizontalArrangement = Arrangement.SpaceEvenly,
+            verticalAlignment = Alignment.CenterVertically ) {
+            Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.Center, Alignment.CenterHorizontally) {
+                Text(text = "$levelValue", fontSize = 20.sp)
+                Text(text = stringResource(R.string.level), color = colorResource(R.color.text_quad), fontSize = 12.sp)
+            }
+            Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.Center, Alignment.CenterHorizontally) {
+                Text(text = "$equipmentValue", fontSize = 20.sp)
+                Text(text = stringResource(R.string.sidebar_equipment), color = colorResource(R.color.text_quad), fontSize = 12.sp)
+            }
+            Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.Center, Alignment.CenterHorizontally) {
+                Text(text = "$buffValue", fontSize = 20.sp)
+                Text(text = stringResource(R.string.buffs), color = colorResource(R.color.text_quad), fontSize = 12.sp)
+            }
+            Column(modifier = Modifier
+                .weight(1f)
+                .fillMaxHeight()
+                .background(colorResource(if (canAllocate) R.color.offset_background_30 else R.color.window_background)), verticalArrangement = Arrangement.Center, Alignment.CenterHorizontally) {
+                Text(text = "$allocatedValue", fontSize = 20.sp, color = if (canAllocate) statColor else colorResource(R.color.text_primary))
+                Text(text = stringResource(R.string.allocated), color = if (canAllocate) statColor else colorResource(R.color.text_quad), fontSize = 12.sp)
+            }
+            AnimatedVisibility(visible = canAllocate) {
+                TextButton(onClick = allocateAction,
+                    Modifier
+                        .width(48.dp)
+                        .fillMaxHeight()
+                        .background(
+                            colorResource(id = R.color.offset_background_30)
+                        )) {
+                    Image(HabiticaIconsHelper.imageOfAttributeAllocateButton().asImageBitmap(), null)
+                }
+            }
+        }
+    }
+}
+
+@Preview
+@Composable
+fun StatsViewPreview() {
+    Column(Modifier.background(colorResource(id = R.color.content_background))) {
+        StatsViewComposable(
+            statText = "Strength",
+            statColor = colorResource(id = R.color.red_50),
+            levelValue = 10,
+            equipmentValue = 5,
+            buffValue = 4,
+            allocatedValue = 8,
+            canAllocate = false
+        ) {}
+        StatsViewComposable(
+            statText = "Intelligence",
+            statColor = colorResource(id = R.color.blue_50),
+            levelValue = 10,
+            equipmentValue = 5,
+            buffValue = 4,
+            allocatedValue = 8,
+            canAllocate = true
+        ) {}
+    }
+}
 
 class StatsView(context: Context, attrs: AttributeSet?) : LinearLayout(context, attrs) {
     private val binding = StatsViewBinding.inflate(context.layoutInflater, this, true)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt
index 4e96f6a56..eac11188b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt
@@ -20,7 +20,7 @@ import com.habitrpg.android.habitica.data.TagRepository
 import com.habitrpg.android.habitica.databinding.DialogTaskFilterBinding
 import com.habitrpg.android.habitica.databinding.EditTagItemBinding
 import com.habitrpg.android.habitica.extensions.OnChangeTextWatcher
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.Tag
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.ui.viewmodels.TasksViewModel
@@ -106,7 +106,7 @@ class TaskFilterDialog(context: Context, component: UserComponent?) : HabiticaBo
     override fun show() {
         tagDisposale = viewModel.tagRepository.getTags().subscribe({
             setTags(it)
-        }, RxErrorHandler.handleEmptyError())
+        }, ExceptionHandler.rx())
         super.show()
         this.window?.clearFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM)
     }
@@ -193,9 +193,9 @@ class TaskFilterDialog(context: Context, component: UserComponent?) : HabiticaBo
         createTagViews()
         binding.tagEditButton.setText(R.string.edit_tag_btn_edit)
         this.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN)
-        repository.updateTags(editedTags.values).toObservable().flatMap { tags -> Observable.fromIterable(tags) }.subscribe({ tag -> editedTags.remove(tag.id) }, RxErrorHandler.handleEmptyError())
-        repository.createTags(createdTags.values).toObservable().flatMap { tags -> Observable.fromIterable(tags) }.subscribe({ tag -> createdTags.remove(tag.id) }, RxErrorHandler.handleEmptyError())
-        repository.deleteTags(deletedTags).subscribe({ deletedTags.clear() }, RxErrorHandler.handleEmptyError())
+        repository.updateTags(editedTags.values).toObservable().flatMap { tags -> Observable.fromIterable(tags) }.subscribe({ tag -> editedTags.remove(tag.id) }, ExceptionHandler.rx())
+        repository.createTags(createdTags.values).toObservable().flatMap { tags -> Observable.fromIterable(tags) }.subscribe({ tag -> createdTags.remove(tag.id) }, ExceptionHandler.rx())
+        repository.deleteTags(deletedTags).subscribe({ deletedTags.clear() }, ExceptionHandler.rx())
     }
 
     private fun createTagEditViews() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt
index ce3059d8a..155833d03 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt
@@ -9,11 +9,12 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.core.content.ContextCompat
+import androidx.lifecycle.lifecycleScope
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.helpers.AmplitudeManager
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.tasks.ChecklistItem
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
@@ -22,6 +23,8 @@ import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.shared.habitica.models.tasks.TaskType
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.core.Observable
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.launch
 import java.lang.ref.WeakReference
 import java.util.Calendar
 import java.util.Date
@@ -81,7 +84,9 @@ class YesterdailyDialog private constructor(
             }
         }
         lastCronRun = Date()
-        userRepository.runCron(completedTasks)
+        MainScope().launch(ExceptionHandler.coroutine()) {
+            userRepository.runCron(completedTasks)
+        }
         displayedDialog = null
     }
 
@@ -137,14 +142,12 @@ class YesterdailyDialog private constructor(
         val checkboxHolder = checklistView.findViewById<View>(R.id.checkBoxHolder) as? ViewGroup
         checkboxHolder?.setOnClickListener { _ ->
             item.completed = !item.completed
-            taskRepository.scoreChecklistItem(task.id ?: "", item.id ?: "")
-                .subscribe({ }, RxErrorHandler.handleEmptyError())
+            scoreChecklistItem(task, item)
             configureChecklistView(checklistView, task, item)
         }
         checklistView.setOnClickListener {
             item.completed = !item.completed
-            taskRepository.scoreChecklistItem(task.id ?: "", item.id ?: "")
-                .subscribe({ }, RxErrorHandler.handleEmptyError())
+            scoreChecklistItem(task, item)
             configureChecklistView(checklistView, task, item)
         }
         checkboxHolder?.setBackgroundResource(
@@ -173,6 +176,15 @@ class YesterdailyDialog private constructor(
         )
     }
 
+    private fun scoreChecklistItem(
+        task: Task,
+        item: ChecklistItem
+    ) {
+        lifecycleScope.launch(ExceptionHandler.coroutine()) {
+            taskRepository.scoreChecklistItem(task.id ?: "", item.id ?: "")
+        }
+    }
+
     private fun configureTaskView(taskView: View, task: Task) {
         val completed = !task.isDisplayedActive
         val checkmark = taskView.findViewById<ImageView>(R.id.checkmark)
@@ -272,10 +284,12 @@ class YesterdailyDialog private constructor(
                                 )
                             } else {
                                 lastCronRun = Date()
-                                userRepository.runCron()
+                                MainScope().launch(ExceptionHandler.coroutine()) {
+                                    userRepository.runCron()
+                                }
                             }
                         },
-                        RxErrorHandler.handleEmptyError()
+                        ExceptionHandler.rx()
                     )
             }
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/AssignedDetailsDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/AssignedDetailsDeserializer.kt
new file mode 100644
index 000000000..9adef8c45
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/AssignedDetailsDeserializer.kt
@@ -0,0 +1,31 @@
+package com.habitrpg.android.habitica.utils
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.habitrpg.android.habitica.models.tasks.GroupAssignedDetails
+import io.realm.RealmList
+import java.lang.reflect.Type
+
+class AssignedDetailsDeserializer: JsonDeserializer<RealmList<GroupAssignedDetails?>> {
+    override fun deserialize(
+        json: JsonElement?,
+        typeOfT: Type?,
+        context: JsonDeserializationContext?
+    ): RealmList<GroupAssignedDetails?> {
+        val list = RealmList<GroupAssignedDetails?>()
+        if (json == null) {
+            return list
+        } else if (json.isJsonArray) {
+            json.asJsonArray.forEach { list.add(context?.deserialize(it, GroupAssignedDetails::class.java)) }
+        } else {
+            val jsonObject = json.asJsonObject
+            jsonObject.keySet().forEach {
+                val details= context?.deserialize<GroupAssignedDetails>(jsonObject[it], GroupAssignedDetails::class.java)
+                details?.assignedUserID = it
+                list.add(details)
+            }
+        }
+        return list
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.kt
index ef2461ff5..3466d4ee7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.kt
@@ -5,7 +5,7 @@ import com.google.gson.JsonDeserializer
 import com.google.gson.JsonElement
 import com.google.gson.JsonObject
 import com.google.gson.JsonParseException
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.inventory.Customization
 import io.realm.Realm
 import io.realm.RealmList
@@ -154,7 +154,7 @@ class CustomizationDeserializer : JsonDeserializer<List<Customization>> {
                         format.parse(setInfo.get("availableUntil").asString)
                 }
             } catch (e: Exception) {
-                RxErrorHandler.reportError(e)
+                ExceptionHandler.reportError(e)
             }
         }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt
index bbab794b2..74e5cf493 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AvatarStatsWidgetProvider.kt
@@ -11,7 +11,7 @@ import android.widget.RemoteViews
 import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.withImmutableFlag
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.activities.MainActivity
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
@@ -55,7 +55,7 @@ class AvatarStatsWidgetProvider : BaseWidgetProvider() {
         userRepository.getUserFlowable().subscribe({
             user = it
             updateData()
-        }, RxErrorHandler.handleEmptyError())
+        }, ExceptionHandler.rx())
     }
 
     override fun onUpdate(
@@ -82,7 +82,7 @@ class AvatarStatsWidgetProvider : BaseWidgetProvider() {
             userRepository.getUserFlowable().firstElement().subscribe({
                 user = it
                 updateData(appWidgetIds)
-            }, RxErrorHandler.handleEmptyError())
+            }, ExceptionHandler.rx())
         } else {
             updateData()
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.kt
index 6c561c5d7..2684fd174 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.kt
@@ -8,8 +8,11 @@ import android.widget.RemoteViews
 import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.TaskRepository
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.shared.habitica.models.responses.TaskDirection
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class HabitButtonWidgetProvider : BaseWidgetProvider() {
@@ -72,8 +75,12 @@ class HabitButtonWidgetProvider : BaseWidgetProvider() {
             val ids = intArrayOf(appWidgetId)
 
             if (taskId != null) {
-                userRepository.getUserFlowable().firstElement().flatMap { user -> taskRepository.taskChecked(user, taskId, TaskDirection.UP.text == direction, false, null) }
-                    .subscribe({ taskDirectionData -> showToastForTaskDirection(context, taskDirectionData) }, RxErrorHandler.handleEmptyError(), { this.onUpdate(context, mgr, ids) })
+                MainScope().launch(ExceptionHandler.coroutine()) {
+                    val user = userRepository.getUser().firstOrNull()
+                    val response = taskRepository.taskChecked(user, taskId, TaskDirection.UP.text == direction, false, null)
+                    showToastForTaskDirection(context, response)
+                    this@HabitButtonWidgetProvider.onUpdate(context, mgr, ids)
+                }
             }
         }
         super.onReceive(context, intent)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.kt
index b7fe8c728..52c469901 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.kt
@@ -16,10 +16,13 @@ import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.extensions.withImmutableFlag
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import com.habitrpg.shared.habitica.models.responses.TaskDirection
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.common.habitica.helpers.MarkdownParser
+import com.habitrpg.shared.habitica.models.responses.TaskDirection
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 import kotlin.math.min
 
@@ -42,10 +45,14 @@ class HabitButtonWidgetService : Service() {
         allWidgetIds = appWidgetManager?.getAppWidgetIds(thisWidget)
         makeTaskMapping()
 
-        for (taskid in this.taskMapping.keys) {
-            taskRepository.getUnmanagedTask(taskid).firstElement().subscribe({ this.updateData(it) }, RxErrorHandler.handleEmptyError())
+        MainScope().launch(ExceptionHandler.coroutine()) {
+            for (taskid in taskMapping.keys) {
+                val task = taskRepository.getUnmanagedTask(taskid).firstOrNull()
+                updateData(task)
+            }
         }
 
+
         stopSelf()
 
         return START_STICKY
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.kt
index b6d7cdef5..958e92401 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.kt
@@ -10,6 +10,7 @@ import com.habitrpg.android.habitica.HabiticaBaseApplication
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.data.UserRepository
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.common.habitica.helpers.MarkdownParser
 import com.habitrpg.shared.habitica.models.tasks.TaskType
@@ -45,7 +46,7 @@ abstract class TaskListFactory internal constructor(
         if (!this::taskRepository.isInitialized) {
             return
         }
-        CoroutineScope(Dispatchers.Main + job).launch {
+        CoroutineScope(Dispatchers.Main + job).launch(ExceptionHandler.coroutine()) {
             val tasks = taskRepository.getTasks(taskType, null, emptyArray()).firstOrNull()?.filter { task ->
                 task.type == TaskType.TODO && !task.completed || task.isDisplayedActive
             } ?: return@launch
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListWidgetProvider.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListWidgetProvider.kt
index f12de930f..72bda08f9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListWidgetProvider.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListWidgetProvider.kt
@@ -12,8 +12,11 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.extensions.withImmutableFlag
 import com.habitrpg.android.habitica.extensions.withMutableFlag
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.helpers.ExceptionHandler
 import com.habitrpg.android.habitica.ui.activities.MainActivity
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 abstract class TaskListWidgetProvider : BaseWidgetProvider() {
@@ -44,14 +47,12 @@ abstract class TaskListWidgetProvider : BaseWidgetProvider() {
             val taskId = intent.getStringExtra(TASK_ID_ITEM)
 
             if (taskId != null) {
-                userRepository.getUserFlowable().firstElement().flatMap { user -> taskRepository.taskChecked(user, taskId, up = true, force = false, notifyFunc = null) }
-                    .subscribe(
-                        { taskDirectionData ->
-                            showToastForTaskDirection(context, taskDirectionData)
-                            AppWidgetManager.getInstance(context).notifyAppWidgetViewDataChanged(appWidgetId, R.id.list_view)
-                        },
-                        RxErrorHandler.handleEmptyError()
-                    )
+                MainScope().launch(ExceptionHandler.coroutine()) {
+                    val user = userRepository.getUser().firstOrNull()
+                    val response = taskRepository.taskChecked(user, taskId, up = true, force = false, notifyFunc = null)
+                    showToastForTaskDirection(context, response)
+                    AppWidgetManager.getInstance(context).notifyAppWidgetViewDataChanged(appWidgetId, R.id.list_view)
+                }
             }
         }
         super.onReceive(context, intent)
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImplTest.kt b/Habitica/src/test/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImplTest.kt
index 02905f207..bfa0ada14 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImplTest.kt
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImplTest.kt
@@ -81,10 +81,10 @@ class TaskRepositoryImplTest : WordSpec({
             every { apiClient.postTaskDirection(any(), "up") } returns Flowable.just(
                 TaskDirectionData()
             )
-            every { localRepository.getUser("") } returns Flowable.just(user)
+            every { localRepository.getUserFlowable("") } returns Flowable.just(user)
             repository.taskChecked(null, task, true, false, null)
             eventually(5000) {
-                localRepository.getUser("")
+                localRepository.getUserFlowable("")
             }
         }
         "does not update user for team tasks" {
diff --git a/build.gradle b/build.gradle
index 653c19d3f..2df4a4e19 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,25 +2,27 @@
 
 buildscript {
     ext {
-        target_sdk = 32
+        min_sdk = 21
+        target_sdk = 33
         app_version_name = ''
         app_version_code = 0
 
-
         amplitude_version = '3.35.1'
-        appcompat_version = '1.5.0'
+        appcompat_version = '1.5.1'
         coil_version = '2.1.0'
-        core_ktx_version = '1.8.0'
-        coroutines_version = '1.6.2'
+        compose_version = '1.3.0'
+        core_ktx_version = '1.9.0'
+        coroutines_version = '1.6.4'
         daggerhilt_version = '2.42'
         firebase_bom = '30.2.0'
-        kotlin_version = '1.7.10'
-        lifecycle_version = '2.5.0'
+        kotlin_version = '1.7.20'
+        lifecycle_version = '2.5.1'
         markwon_version = '4.6.2'
         moshi_version = '1.13.0'
+        navigation_version = '2.5.3'
         okhttp_version = '4.9.3'
-        play_wearables_version = '17.1.0'
-        play_auth_version = '20.2.0'
+        play_wearables_version = '18.0.0'
+        play_auth_version = '20.3.0'
         preferences_version = '1.2.0'
         realm_version = '1.0.2'
         retrofit_version = '2.9.0'
@@ -33,16 +35,16 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.3'
+        classpath 'com.android.tools.build:gradle:7.3.1'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
-        classpath 'com.google.gms:google-services:4.3.13'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.1'
+        classpath 'com.google.gms:google-services:4.3.14'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
         classpath "io.realm:realm-gradle-plugin:10.11.0"
         classpath("io.realm.kotlin:gradle-plugin:$realm_version")
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.19.0"
-        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.5.1"
-        classpath 'com.google.firebase:perf-plugin:1.4.1'
+        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_version"
+        classpath 'com.google.firebase:perf-plugin:1.4.2'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$daggerhilt_version"
     }
 }
diff --git a/common/build.gradle b/common/build.gradle
index 0a56516b6..ad3a8d9bb 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -4,11 +4,11 @@ plugins {
 }
 
 android {
-    compileSdk 32
+    compileSdk target_sdk
 
     defaultConfig {
-        minSdk 21
-        targetSdk 32
+        minSdk min_sdk
+        targetSdkVersion target_sdk
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -33,6 +33,7 @@ android {
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
+    namespace 'com.habitrpg.common.habitica'
 }
 
 dependencies {
diff --git a/common/src/main/AndroidManifest.xml b/common/src/main/AndroidManifest.xml
index 411eba234..a5918e68a 100644
--- a/common/src/main/AndroidManifest.xml
+++ b/common/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.habitrpg.common.habitica">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file
diff --git a/common/src/main/java/com/habitrpg/common/habitica/helpers/NumberAbbreviator.kt b/common/src/main/java/com/habitrpg/common/habitica/helpers/NumberAbbreviator.kt
index 7ffdc4647..11e29dfe4 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/helpers/NumberAbbreviator.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/helpers/NumberAbbreviator.kt
@@ -7,7 +7,7 @@ import java.text.DecimalFormat
 
 object NumberAbbreviator {
 
-    fun abbreviate(context: Context, number: Double, numberOfDecimals: Int = 2, minForAbbrevation: Int = 0): String {
+    fun abbreviate(context: Context?, number: Double, numberOfDecimals: Int = 2, minForAbbrevation: Int = 0): String {
         var usedNumber = number
         var counter = 0
         while (usedNumber >= 1000 && number >= minForAbbrevation) {
@@ -23,11 +23,11 @@ object NumberAbbreviator {
         return formatter.format(usedNumber)
     }
 
-    private fun abbreviationForCounter(context: Context, counter: Int): String = when (counter) {
-        1 -> context.getString(R.string.thousand_abbrev)
-        2 -> context.getString(R.string.million_abbrev)
-        3 -> context.getString(R.string.billion_abbrev)
-        4 -> context.getString(R.string.trillion_abbrev)
+    private fun abbreviationForCounter(context: Context?, counter: Int): String = when (counter) {
+        1 -> context?.getString(R.string.thousand_abbrev) ?: "k"
+        2 -> context?.getString(R.string.million_abbrev) ?: "m"
+        3 -> context?.getString(R.string.billion_abbrev) ?: "b"
+        4 -> context?.getString(R.string.trillion_abbrev) ?: "t"
         else -> ""
     }
 }
diff --git a/common/src/main/res/values/colors.xml b/common/src/main/res/values/colors.xml
index adef2cfa0..1488f6ea8 100644
--- a/common/src/main/res/values/colors.xml
+++ b/common/src/main/res/values/colors.xml
@@ -73,6 +73,8 @@
     <color name="gray_600">#edecee</color>
     <color name="gray_700">#f9f9f9</color>
 
+    <color name="gray_1_30">#4D1A181D</color>
+
     <color name="blue_1">#033f5e</color>
     <color name="teal_1">#005158</color>
     <color name="green_1">#005737</color>
@@ -83,7 +85,7 @@
     <color name="xpColor">@color/yellow_100</color>
     <color name="mpColor">@color/blue_100</color>
 
-    <color name="text_primary">@color/gray_10</color>
+    <color name="text_primary">@color/gray_50</color>
     <color name="text_secondary">@color/gray_100</color>
     <color name="text_ternary">@color/gray_200</color>
     <color name="text_quad">@color/gray_300</color>
diff --git a/detekt_baseline.xml b/detekt_baseline.xml
index ecff1cc8e..2c43e4deb 100644
--- a/detekt_baseline.xml
+++ b/detekt_baseline.xml
@@ -192,7 +192,7 @@
     <ID>UnusedPrivateMember:GuildFragment.kt$GuildFragment$group: Group?</ID>
     <ID>UnusedPrivateMember:LoginActivity.kt$LoginActivity$user: User</ID>
     <ID>UnusedPrivateMember:NotificationOpenHandler.kt$NotificationOpenHandler.Companion$private fun openQuestDetailSCreen()</ID>
-    <ID>UnusedPrivateMember:PurchaseDialog.kt$PurchaseDialog$val sub = maybe.flatMap { for (thisItem in it) { if (thisItem.key == item.key) { ownedCount += thisItem.numberOwned } } inventoryRepository.getOwnedMounts().firstElement() }.flatMap { for (mount in it) { if (mount.key?.contains(item.key) == true) { ownedCount += if (mount.owned) 1 else 0 } } inventoryRepository.getOwnedPets().firstElement() }.subscribe( { for (pet in it) { if (pet.key?.contains(item.key) == true) { ownedCount += if (pet.trained > 0) 1 else 0 } } if (calledResult) return@subscribe calledResult = true if (!shouldWarn) { onResult(-1) return@subscribe } val remaining = totalCount - ownedCount onResult(max(0, remaining)) }, RxErrorHandler.handleEmptyError(), { if (calledResult) return@subscribe calledResult = true if (!shouldWarn) { onResult(-1) return@subscribe } val remaining = totalCount - ownedCount onResult(max(0, remaining)) } )</ID>
+    <ID>UnusedPrivateMember:PurchaseDialog.kt$PurchaseDialog$val sub = maybe.flatMap { for (thisItem in it) { if (thisItem.key == item.key) { ownedCount += thisItem.numberOwned } } inventoryRepository.getOwnedMounts().firstElement() }.flatMap { for (mount in it) { if (mount.key?.contains(item.key) == true) { ownedCount += if (mount.owned) 1 else 0 } } inventoryRepository.getOwnedPets().firstElement() }.subscribe( { for (pet in it) { if (pet.key?.contains(item.key) == true) { ownedCount += if (pet.trained > 0) 1 else 0 } } if (calledResult) return@subscribe calledResult = true if (!shouldWarn) { onResult(-1) return@subscribe } val remaining = totalCount - ownedCount onResult(max(0, remaining)) }, ExceptionHandler.rx(), { if (calledResult) return@subscribe calledResult = true if (!shouldWarn) { onResult(-1) return@subscribe } val remaining = totalCount - ownedCount onResult(max(0, remaining)) } )</ID>
     <ID>UnusedPrivateMember:PurchaseDialog.kt$PurchaseDialog$val subscription = observable .doOnNext { val text = if (snackbarText[0].isNotEmpty()) { snackbarText[0] } else { context.getString(R.string.successful_purchase, shopItem.text) } val rightTextColor = when (item.currency) { "gold" -> ContextCompat.getColor(context, R.color.text_yellow) "gems" -> ContextCompat.getColor(context, R.color.text_green) "hourglasses" -> ContextCompat.getColor(context, R.color.text_brand) else -> 0 } ((application?.currentActivity?.get() ?: getActivity() ?: ownerActivity) as? SnackbarActivity)?.showSnackbar( content = text, rightIcon = priceLabel.compoundDrawables[0], rightTextColor = rightTextColor, rightText = "-" + priceLabel.text ) } .flatMap { userRepository.retrieveUser(withTasks = false, forced = true) } .flatMap { inventoryRepository.retrieveInAppRewards() } .subscribe({ if (item.isTypeGear || item.currency == "hourglasses") { onGearPurchased?.invoke(item) } }) { throwable -> if (throwable.javaClass.isAssignableFrom(retrofit2.HttpException::class.java)) { val error = throwable as retrofit2.HttpException if (error.code() == 401 &amp;&amp; shopItem.currency == "gems") { MainNavigationController.navigate(R.id.gemPurchaseActivity, bundleOf(Pair("openSubscription", false))) } } }</ID>
     <ID>UnusedPrivateMember:PurchaseHandler.kt$PurchaseHandler$purchase: Purchase</ID>
     <ID>UnusedPrivateMember:ScoreTaskLocallyInteractor.kt$ScoreTaskLocallyInteractor.Companion$direction: TaskDirection</ID>
diff --git a/fastlane/README.md b/fastlane/README.md
index 9db559d7a..f57928b5d 100644
--- a/fastlane/README.md
+++ b/fastlane/README.md
@@ -23,6 +23,14 @@ For _fastlane_ installation instructions, see [Installing _fastlane_](https://do
 
 Runs all the tests
 
+### android staffapk
+
+```sh
+[bundle exec] fastlane android staffapk
+```
+
+Build Staff APK
+
 ### android staff
 
 ```sh
diff --git a/fastlane/changelog.txt b/fastlane/changelog.txt
index 3eb9c4730..45b8abcd3 100644
--- a/fastlane/changelog.txt
+++ b/fastlane/changelog.txt
@@ -1,11 +1,10 @@
-New in 4.0.2:
+New in 4.0.3:
 -Habitica has a brand new WearOS app for smart watches!
+-Reminders for tasks done the previous day will show again
 -Group Plan subscribers can switch on displaying shared tasks from Settings
--Past To Do reminders will not constantly show anymore
 -Pet category labels show again
 -Newly designed Backgrounds section
 -Ability to filter, preview, and pin Backgrounds
 -New bottom sheet designs in Items, Pets & Mounts, and Filters
 -New Day Start Adjustment interface
 -Improvements to payment and subscription handling
-
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
index 5eb9e78bf..f06786270 100644
--- a/shared/build.gradle.kts
+++ b/shared/build.gradle.kts
@@ -54,10 +54,11 @@ kotlin {
 }
 
 android {
-    compileSdk = 32
+    compileSdk = 33
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     defaultConfig {
         minSdk = 21
-        targetSdk = 32
+        targetSdk = 33
     }
+    namespace = "com.habitrpg.shared.habitica"
 }
\ No newline at end of file
diff --git a/shared/src/androidMain/AndroidManifest.xml b/shared/src/androidMain/AndroidManifest.xml
index b7e9ba4e0..568741e54 100644
--- a/shared/src/androidMain/AndroidManifest.xml
+++ b/shared/src/androidMain/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.habitrpg.shared.habitica" />
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/version.properties b/version.properties
index 91578a429..be277252e 100644
--- a/version.properties
+++ b/version.properties
@@ -1,2 +1,2 @@
-NAME=4.0.2
-CODE=4510
+NAME=4.0.3
+CODE=4581
\ No newline at end of file
diff --git a/wearos/build.gradle b/wearos/build.gradle
index de91fee40..e3cb89504 100644
--- a/wearos/build.gradle
+++ b/wearos/build.gradle
@@ -88,6 +88,7 @@ android {
     buildFeatures {
         viewBinding true
     }
+    namespace 'com.habitrpg.android.habitica'
 }
 
 dependencies {
diff --git a/wearos/src/main/AndroidManifest.xml b/wearos/src/main/AndroidManifest.xml
index 09f409142..69db7d18d 100644
--- a/wearos/src/main/AndroidManifest.xml
+++ b/wearos/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.habitrpg.android.habitica">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />