diff --git a/common/src/main/java/org/dash/wallet/common/ui/ResourcesExt.kt b/common/src/main/java/org/dash/wallet/common/ui/ResourcesExt.kt
index 6747bd3b8e..c53504c15e 100644
--- a/common/src/main/java/org/dash/wallet/common/ui/ResourcesExt.kt
+++ b/common/src/main/java/org/dash/wallet/common/ui/ResourcesExt.kt
@@ -17,7 +17,12 @@
 
 package org.dash.wallet.common.ui
 
+import android.content.Context
+import android.graphics.Color
+import android.graphics.drawable.GradientDrawable
+import android.graphics.drawable.RippleDrawable
 import android.view.View
+import android.widget.Button
 import androidx.annotation.StyleRes
 import androidx.core.content.res.ResourcesCompat
 import org.dash.wallet.common.R
@@ -41,3 +46,96 @@ fun View.setRoundedRippleBackground(@StyleRes style: Int?) {
         )
     }
 }
+
+fun View.applyStyle(@StyleRes style: Int?) {
+    style?.let {
+        context.theme.applyStyle(style, true)
+    }
+}
+
+//fun View.setRoundedRippleBackgroundButtonStyle1(@StyleRes style: Int?) {
+//    style?.let {
+//        val theme = this.resources.newTheme().apply { applyStyle(style, true) }
+//
+//        // Extract the cornerRadius attribute
+////        val cornerRadiusAttr = intArrayOf(R.attr.cornerRadius)
+////        val cornerRadiusArray = theme.obtainStyledAttributes(cornerRadiusAttr)
+////        val cornerRadius = cornerRadiusArray.getDimension(0, 0f) // Default to 0 if not set
+////        cornerRadiusArray.recycle()
+//        val cornerRadius = 7.dpToPx(context).toFloat()
+//
+//        // Extract the titleTextColor attribute
+//        val titleTextColorAttr = intArrayOf(R.attr.titleTextColor)
+//        val textColorArray = theme.obtainStyledAttributes(titleTextColorAttr)
+//        val titleTextColor = textColorArray.getColor(0, Color.BLACK) // Default to black if not set
+//        textColorArray.recycle()
+//
+//        // Apply cornerRadius and titleTextColor as needed (e.g., to a button)
+//        val drawable = ResourcesCompat.getDrawable(
+//            this.resources,
+//            R.drawable.rounded_ripple_background,
+//            theme
+//        )
+//
+//        // Assuming rounded_ripple_background is a shape drawable that supports corner radius
+//        if (drawable is RippleDrawable) {
+//            // For the mask
+//            val maskDrawable = drawable.findDrawableByLayerId(android.R.id.mask) as? GradientDrawable
+//            maskDrawable?.cornerRadius = cornerRadius
+//
+//            // For the content shape (background)
+//            val contentDrawable = drawable.getDrawable(0) as? GradientDrawable
+//            contentDrawable?.cornerRadius = cornerRadius
+//        }
+//
+//        // Apply drawable as background and set titleTextColor
+//        this.background = drawable
+//        (this as? Button)?.setTextColor(titleTextColor)
+//    }
+//}
+//
+fun View.setRoundedRippleBackgroundButtonStyle(@StyleRes style: Int?, defaultCornerRadius: Int = 7) {
+    style?.let {
+        val theme = this.resources.newTheme().apply { applyStyle(style, true) }
+        val defaultCornerRadius = defaultCornerRadius.dpToPx(this.context)
+
+        // Resolve the cornerRadius and rippleColor attributes from the applied style
+        val attrs = intArrayOf(
+            R.attr.backgroundColor,
+            R.attr.titleTextColor
+        )
+
+        val typedArray = theme.obtainStyledAttributes(style, attrs)
+
+        // Extract the attributes from the typed array
+        val backgroundColor = typedArray.getColor(0, Color.TRANSPARENT)
+        val titleTextColor = typedArray.getColor(1, Color.BLACK) // Default to black if not set
+        typedArray.recycle()
+
+        // Apply the ripple drawable from your XML
+        val rippleDrawable = ResourcesCompat.getDrawable(
+            this.resources,
+            R.drawable.rounded_ripple_background, // Your ripple drawable
+            theme
+        ) as? RippleDrawable
+
+        rippleDrawable?.let { rd ->
+
+            // Modify the background color, corner radius, and stroke in the ripple's shape
+            val contentDrawable = rd.getDrawable(1) as? GradientDrawable
+            contentDrawable?.apply {
+                setColor(backgroundColor)
+                cornerRadius = defaultCornerRadius.dpToPx(context).toFloat()
+            }
+
+            // Set the ripple drawable as the background
+            this.background = rd
+        }
+        (this as? Button)?.setTextColor(titleTextColor)
+    }
+}
+
+// Utility function to convert dp to px for stroke width
+fun Int.dpToPx(context: Context): Int {
+    return (this * context.resources.displayMetrics.density).toInt()
+}
diff --git a/common/src/main/res/drawable/ic_x.xml b/common/src/main/res/drawable/ic_x.xml
new file mode 100644
index 0000000000..30f36a07a3
--- /dev/null
+++ b/common/src/main/res/drawable/ic_x.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="11dp"
+    android:height="12dp"
+    android:viewportWidth="11"
+    android:viewportHeight="12">
+  <path
+      android:pathData="M0.891,10.936C0.785,10.83 0.715,10.707 0.682,10.567C0.648,10.428 0.648,10.288 0.682,10.148C0.715,10.009 0.783,9.888 0.885,9.787L4.668,5.997L0.885,2.214C0.783,2.117 0.715,1.998 0.682,1.858C0.652,1.715 0.652,1.573 0.682,1.433C0.715,1.293 0.785,1.171 0.891,1.065C0.993,0.959 1.113,0.889 1.253,0.855C1.397,0.822 1.539,0.822 1.678,0.855C1.822,0.889 1.945,0.957 2.046,1.059L5.83,4.842L9.613,1.059C9.714,0.957 9.835,0.889 9.975,0.855C10.114,0.822 10.254,0.822 10.394,0.855C10.533,0.889 10.656,0.961 10.762,1.071C10.868,1.173 10.937,1.293 10.971,1.433C11.009,1.573 11.009,1.712 10.971,1.852C10.937,1.992 10.87,2.112 10.768,2.214L6.991,5.997L10.768,9.787C10.87,9.888 10.937,10.009 10.971,10.148C11.005,10.288 11.005,10.428 10.971,10.567C10.937,10.707 10.868,10.83 10.762,10.936C10.656,11.041 10.533,11.111 10.394,11.145C10.254,11.179 10.114,11.179 9.975,11.145C9.835,11.111 9.714,11.043 9.613,10.942L5.83,7.159L2.046,10.942C1.945,11.043 1.824,11.111 1.685,11.145C1.545,11.179 1.403,11.179 1.259,11.145C1.12,11.111 0.997,11.041 0.891,10.936Z"
+      android:fillColor="#B0B6BC"/>
+</vector>
diff --git a/common/src/main/res/values/colors.xml b/common/src/main/res/values/colors.xml
index 307611426c..635ba80aa9 100644
--- a/common/src/main/res/values/colors.xml
+++ b/common/src/main/res/values/colors.xml
@@ -122,4 +122,6 @@
     <color name="gray_300">#AAAEB3</color>
     <color name="gray_600">#5D5F61</color>
 
+    <color name="red">#EA3943</color>
+    <color name="red_0.05">#0DEA3943</color>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index e58879fff7..1130033d9b 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -112,4 +112,5 @@
 
     <!-- basic formats -->
     <string name="percent" translatable="false">%d%%</string>
+    <string name="two_lines_number_text" translatable="false">%d\n%s</string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values/styles.xml b/common/src/main/res/values/styles.xml
index da01902211..46f5b161d7 100644
--- a/common/src/main/res/values/styles.xml
+++ b/common/src/main/res/values/styles.xml
@@ -961,6 +961,87 @@
         <item name="android:theme">@style/PrimaryButtonTheme.Large.LightBlue</item>
     </style>
 
+    <style name="VoteButtonTheme">
+        <item name="cornerRadius">7dp</item>
+        <item name="titleTextColor">@color/white</item>
+        <item name="backgroundColor">@color/content_primary</item>
+        <item name="strokeColor">@color/content_primary</item>
+        <item name="rippleColor">@color/ripple_light</item>
+        <item name="disabledBackgroundColor">@color/disabled_button_bg</item>
+    </style>
+
+    <style name="VoteButton" parent="Widget.AppCompat.Button.Borderless">
+        <item name="fontFamily">@font/inter_semibold</item>
+        <item name="android:textColor">@color/button_text</item>
+        <item name="android:background">@drawable/rounded_ripple_background</item>
+        <item name="android:theme">@style/VoteButtonTheme</item>
+        <item name="android:textSize">12sp</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="android:paddingStart">8dp</item>
+        <item name="android:paddingEnd">8dp</item>
+        <item name="android:paddingTop">4dp</item>
+        <item name="android:paddingBottom">4dp</item>
+        <item name="android:minHeight">40dp</item>
+    </style>
+
+    <style name="Button.Vote" parent="Widget.AppCompat.Button.Borderless">
+        <item name="fontFamily">@font/inter_semibold</item>
+        <item name="android:textColor">@color/button_text</item>
+        <item name="android:background">@drawable/rounded_ripple_background</item>
+        <item name="android:theme">@style/VoteButtonTheme</item>
+        <item name="android:textSize">12sp</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="android:paddingStart">8dp</item>
+        <item name="android:paddingEnd">8dp</item>
+        <item name="android:paddingTop">4dp</item>
+        <item name="android:paddingBottom">4dp</item>
+        <item name="android:minHeight">40dp</item>
+    </style>
+
+    <style name="VoteButton.LightBlue">
+        <item name="backgroundColor">@color/dash_blue_0.05</item>
+        <item name="strokeColor">@android:color/transparent</item>
+        <item name="titleTextColor">@color/dash_blue</item>
+        <item name="rippleColor">@color/button_ripple_color</item>
+    </style>
+
+    <style name="Button.Vote.LightBlue">
+        <item name="android:theme">@style/VoteButton.LightBlue</item>
+    </style>
+
+    <style name="VoteButton.LightRed">
+        <item name="backgroundColor">@color/red_0.05</item>
+        <item name="strokeColor">@android:color/transparent</item>
+        <item name="titleTextColor">@color/red</item>
+        <item name="rippleColor">@color/button_ripple_color</item>
+    </style>
+
+    <style name="Button.Vote.LightRed">
+        <item name="android:theme">@style/VoteButton.LightRed</item>
+    </style>
+
+    <style name="VoteButton.Blue">
+        <item name="backgroundColor">@color/dash_blue</item>
+        <item name="strokeColor">@android:color/transparent</item>
+        <item name="titleTextColor">@color/dash_white</item>
+        <item name="rippleColor">@color/button_ripple_color</item>
+    </style>
+
+    <style name="Button.Vote.Blue">
+        <item name="android:theme">@style/VoteButton.Blue</item>
+    </style>
+
+    <style name="VoteButton.Red">
+        <item name="backgroundColor">@color/red</item>
+        <item name="strokeColor">@android:color/transparent</item>
+        <item name="titleTextColor">@color/dash_white</item>
+        <item name="rippleColor">@color/button_ripple_color</item>
+    </style>
+
+    <style name="Button.Vote.Red">
+        <item name="android:theme">@style/VoteButton.Red</item>
+    </style>
+
     <style name="Button.Primary.Small">
         <item name="android:textSize">13sp</item>
         <item name="android:minHeight">30dp</item>
diff --git a/wallet/AndroidManifest.xml b/wallet/AndroidManifest.xml
index 94e527ad9f..caba3de167 100644
--- a/wallet/AndroidManifest.xml
+++ b/wallet/AndroidManifest.xml
@@ -426,6 +426,12 @@
             android:exported="false"
             android:foregroundServiceType="connectedDevice" /-->
 
+        <!-- WorkManager -->
+        <service
+            android:name="androidx.work.impl.foreground.SystemForegroundService"
+            android:foregroundServiceType="dataSync"
+            android:exported="false" />
+
         <!-- Prompt Google Play services to install the backported photo picker module -->
         <!-- required to support Android 7 to 12 -->
         <service android:name="com.google.android.gms.metadata.ModuleDependencies" android:enabled="false" android:exported="false">
diff --git a/wallet/res/drawable-v21/selectable_round_corners_border_light.xml b/wallet/res/drawable-v21/selectable_round_corners_border_light.xml
new file mode 100644
index 0000000000..7104f03418
--- /dev/null
+++ b/wallet/res/drawable-v21/selectable_round_corners_border_light.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/button_ripple_light">
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="8dp" />
+            <solid android:color="@android:color/white" />
+            <stroke android:color="@color/button_ripple_light" android:width="1dp"/>
+        </shape>
+    </item>
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <corners android:radius="8dp" />
+            <solid android:color="@android:color/holo_red_dark" />
+        </shape>
+    </item>
+</ripple>
diff --git a/wallet/res/layout/fragment_add_voting_keys.xml b/wallet/res/layout/fragment_add_voting_keys.xml
index 7bcf001a80..2ca7731516 100644
--- a/wallet/res/layout/fragment_add_voting_keys.xml
+++ b/wallet/res/layout/fragment_add_voting_keys.xml
@@ -58,16 +58,7 @@
                 tools:itemCount="5"
                 tools:listitem="@layout/view_masternode_ip" />
 
-            <TextView
-                android:id="@+id/votes_cast_text"
-                style="@style/Overline.Secondary"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
-                android:gravity="center"
-                android:textAlignment="gravity"
-                tools:text="@string/multiple_votes_cast" />
-        </LinearLayout>
+            </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 
     <LinearLayout
@@ -81,7 +72,7 @@
         android:paddingEnd="20dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/submit_button">
+        app:layout_constraintBottom_toTopOf="@id/dont_ask_again_button">
 
         <ImageView
             android:layout_width="wrap_content"
@@ -98,6 +89,27 @@
             android:layout_height="wrap_content" />
     </LinearLayout>
 
+    <LinearLayout
+        android:id="@+id/dont_ask_again_button"
+        style="@style/Button.Tertiary.Large.Blue"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginHorizontal="15dp"
+        android:layout_marginBottom="10dp"
+        android:paddingEnd="20dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/submit_button">
+
+        <TextView
+            style="@style/Subtitle2.Blue"
+            android:textSize="15sp"
+            android:text="@string/dont_ask_again"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+    </LinearLayout>
+
     <Button
         android:id="@+id/submit_button"
         style="@style/Button.Primary.Large.Blue"
@@ -105,5 +117,21 @@
         android:layout_height="wrap_content"
         android:layout_margin="15dp"
         android:text="@string/submit"
-        app:layout_constraintBottom_toBottomOf="parent" />
+        app:layout_constraintBottom_toTopOf="@id/votes_cast_text" />
+
+    <TextView
+        android:id="@+id/votes_cast_text"
+        style="@style/Overline.Secondary"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        android:layout_marginHorizontal="15dp"
+        android:layout_marginBottom="15dp"
+        android:gravity="center"
+        android:textAlignment="gravity"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        tools:text="@string/multiple_votes_cast" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/wallet/res/layout/fragment_username_requests.xml b/wallet/res/layout/fragment_username_requests.xml
index 4261eb48e1..fb719f9da7 100644
--- a/wallet/res/layout/fragment_username_requests.xml
+++ b/wallet/res/layout/fragment_username_requests.xml
@@ -94,6 +94,16 @@
                 android:text="@string/username_voting_subtitle"
                 app:layout_constraintTop_toTopOf="parent" />
 
+            <TextView
+                android:id="@+id/subtitletwo"
+                style="@style/Body2.Secondary"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="15dp"
+                android:layout_marginTop="2dp"
+                android:text="@string/username_voting_subtitle_two"
+                app:layout_constraintTop_toBottomOf="@id/subtitle" />
+
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/filter_panel"
                 android:layout_width="match_parent"
@@ -102,7 +112,7 @@
                 android:layout_marginBottom="8dp"
                 android:layout_marginStart="15dp"
                 android:orientation="horizontal"
-                app:layout_constraintTop_toBottomOf="@id/subtitle">
+                app:layout_constraintTop_toBottomOf="@id/subtitletwo">
 
                 <TextView
                     android:id="@+id/filter_title"
diff --git a/wallet/res/layout/fragment_username_voting_info.xml b/wallet/res/layout/fragment_username_voting_info.xml
index 1ad573d016..ccdf0216de 100644
--- a/wallet/res/layout/fragment_username_voting_info.xml
+++ b/wallet/res/layout/fragment_username_voting_info.xml
@@ -129,6 +129,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="2dp"
                 android:text="@string/usernames_blocked_subtitle"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="@+id/blocked_title"
                 app:layout_constraintTop_toBottomOf="@+id/blocked_title" />
@@ -204,8 +205,8 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="63dp"
-                android:layout_marginTop="14dp"
                 android:text="@string/keep_your_passphrase_safe"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/wallet/res/layout/username_request_group_view.xml b/wallet/res/layout/username_request_group_view.xml
index 7405d7857d..0050fe4ed2 100644
--- a/wallet/res/layout/username_request_group_view.xml
+++ b/wallet/res/layout/username_request_group_view.xml
@@ -26,50 +26,108 @@
     style="@style/ViewRaised"
     tools:context="de.schildbach.wallet.ui.username.adapters.UsernameRequestGroupViewHolder">
 
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/header"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent">
     <TextView
         android:id="@+id/username"
         style="@style/Body2.Medium"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:paddingVertical="17dp"
+        android:paddingVertical="0dp"
         android:layout_marginStart="15dp"
+        app:layout_constraintBottom_toTopOf="@id/link_badge"
+        app:layout_constraintVertical_chainStyle="packed"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="John" />
 
+    <ImageView
+        android:id="@+id/link_badge"
+        android:layout_width="28dp"
+        android:layout_height="20dp"
+        android:src="@drawable/ic_link"
+        android:layout_marginEnd="3dp"
+        android:padding="3dp"
+        android:theme="@style/LightBlueBadgeTheme"
+        app:layout_constraintTop_toBottomOf="@id/username"
+        app:layout_constraintStart_toStartOf="@id/username"
+        app:layout_constraintBottom_toBottomOf="parent"/>
+
     <TextView
-        android:id="@+id/block_votes"
-        style="@style/Body2.Medium.Red"
-        android:layout_width="0dp"
+        android:id="@+id/link_included"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingVertical="17dp"
-        android:layout_marginStart="15dp"
-        app:layout_constraintStart_toEndOf="@id/username"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="(1s Blocks)" />
+        android:text="link included"
+        style="@style/Caption.Blue"
+        app:layout_constraintTop_toTopOf="@id/link_badge"
+        app:layout_constraintStart_toEndOf="@id/link_badge" />
+
+<!--    <TextView-->
+<!--        android:id="@+id/block_votes"-->
+<!--        style="@style/Body2.Medium.Red"-->
+<!--        android:layout_width="0dp"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:paddingVertical="17dp"-->
+<!--        android:layout_marginStart="15dp"-->
+<!--        app:layout_constraintStart_toEndOf="@id/username"-->
+<!--        app:layout_constraintTop_toTopOf="parent"-->
+<!--        tools:text="(1s Blocks)" />-->
 
     <TextView
         android:id="@+id/requests_amount"
         style="@style/Overline.Tertiary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="38dp"
-        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_marginEnd="0dp"
+        android:layout_marginStart="6dp"
+        app:layout_constraintStart_toEndOf="@id/username"
         app:layout_constraintTop_toTopOf="@id/username"
         app:layout_constraintBottom_toBottomOf="@id/username"
         tools:text="4 requests" />
 
+    <Button
+        android:id="@+id/blocks_button"
+        style="@style/Button.Vote.LightRed"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_marginVertical="5dp"
+        android:layout_marginHorizontal="8dp"
+        app:layout_constraintEnd_toStartOf="@id/approvals_button"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        tools:text="1\nBlock"
+        />
+
+    <Button
+        android:id="@+id/approvals_button"
+        style="@style/Button.Vote.LightBlue"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_marginVertical="5dp"
+        android:layout_marginHorizontal="10dp"
+        app:layout_constraintEnd_toStartOf="@id/chevron"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        tools:text="3\nApprovals"
+        />
+
     <ImageView
         android:id="@+id/chevron"
         android:layout_width="11dp"
         android:layout_height="11dp"
-        android:src="@drawable/ic_arrow_back"
+        android:src="@drawable/ic_chevron"
         android:rotation="270"
         android:layout_marginEnd="17dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/username"
         app:layout_constraintBottom_toBottomOf="@id/username" />
 
+    </androidx.constraintlayout.widget.ConstraintLayout>
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/requests_list"
         android:layout_width="match_parent"
@@ -78,7 +136,7 @@
         android:paddingBottom="6dp"
         android:overScrollMode="never"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:layout_constraintTop_toBottomOf="@id/username"
+        app:layout_constraintTop_toBottomOf="@id/header"
         tools:listitem="@layout/username_request_view"
         tools:itemCount="5" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/wallet/res/layout/username_request_view.xml b/wallet/res/layout/username_request_view.xml
index 329373ed3a..f107f02037 100644
--- a/wallet/res/layout/username_request_view.xml
+++ b/wallet/res/layout/username_request_view.xml
@@ -19,16 +19,19 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="55dp"
+    android:layout_height="wrap_content"
     android:clickable="true"
     android:focusable="true"
+    android:layout_marginHorizontal="4dp"
+    android:layout_marginVertical="4dp"
     android:background="?attr/selectableItemBackground"
     tools:context="de.schildbach.wallet.ui.username.adapters.UsernameRequestViewHolder">
 
     <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/info"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginStart="15dp"
+        android:background="@drawable/selectable_round_corners_border_light"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
@@ -37,6 +40,7 @@
             style="@style/Overline"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toTopOf="@id/link_badge"
@@ -64,34 +68,48 @@
             app:layout_constraintTop_toTopOf="@id/link_badge"
             app:layout_constraintStart_toEndOf="@id/link_badge" />
 
+        <Button
+            android:id="@+id/approvals_button"
+            style="@style/Button.Vote.LightBlue"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginHorizontal="8dp"
+            android:layout_marginVertical="5dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@id/info"
+            app:layout_constraintBottom_toBottomOf="@id/info"
+            tools:text="2\nApprovals"
+            />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <TextView
-        android:id="@+id/cancel_approval_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="10dp"
-        style="@style/Button.Tertiary.ExtraSmall"
-        android:text="@string/cancel_approval"
-        app:layout_constraintEnd_toStartOf="@id/vote_amount"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        />
+<!--    <TextView-->
+<!--        android:id="@+id/cancel_approval_button"-->
+<!--        android:layout_width="wrap_content"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:layout_marginEnd="10dp"-->
+<!--        style="@style/Button.Tertiary.ExtraSmall"-->
+<!--        android:text="@string/cancel_approval"-->
+<!--        app:layout_constraintEnd_toStartOf="@id/vote_amount"-->
+<!--        app:layout_constraintTop_toTopOf="parent"-->
+<!--        app:layout_constraintBottom_toBottomOf="parent"-->
+<!--        />-->
+
+
 
-    <TextView
-        android:id="@+id/vote_amount"
-        style="@style/Overline.Tertiary"
-        android:layout_width="0dp"
-        android:layout_height="20dp"
-        android:layout_marginEnd="15dp"
-        android:minWidth="20dp"
-        android:paddingHorizontal="7dp"
-        android:gravity="center"
-        android:textAlignment="gravity"
-        android:background="@drawable/rounded_background"
-        android:theme="@style/InactiveBadgeTheme"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        tools:text="10" />
+<!--    <TextView-->
+<!--        android:id="@+id/vote_amount"-->
+<!--        style="@style/Overline.Tertiary"-->
+<!--        android:layout_width="0dp"-->
+<!--        android:layout_height="20dp"-->
+<!--        android:layout_marginEnd="15dp"-->
+<!--        android:minWidth="20dp"-->
+<!--        android:paddingHorizontal="7dp"-->
+<!--        android:gravity="center"-->
+<!--        android:textAlignment="gravity"-->
+<!--        android:background="@drawable/rounded_background"-->
+<!--        android:theme="@style/InactiveBadgeTheme"-->
+<!--        app:layout_constraintEnd_toEndOf="parent"-->
+<!--        app:layout_constraintTop_toTopOf="parent"-->
+<!--        app:layout_constraintBottom_toBottomOf="parent"-->
+<!--        tools:text="10" />-->
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/wallet/res/layout/view_masternode_ip.xml b/wallet/res/layout/view_masternode_ip.xml
index dcb3a3343b..e5ce2e6fc4 100644
--- a/wallet/res/layout/view_masternode_ip.xml
+++ b/wallet/res/layout/view_masternode_ip.xml
@@ -14,28 +14,50 @@
   ~ You should have received a copy of the GNU General Public License
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_marginVertical="5dp"
     android:paddingHorizontal="15dp"
     android:paddingVertical="10dp"
     android:background="@drawable/rounded_background"
     android:theme="@style/SecondaryBackground">
-
-    <TextView
-        style="@style/Overline.Secondary"
-        android:layout_width="match_parent"
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/masternode_ip" />
+        android:orientation="vertical"
 
-    <TextView
-        android:id="@+id/ip_address"
-        style="@style/Body2"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="2dp"
-        tools:text="XXX.XXX.XX.X1" />
-</LinearLayout>
\ No newline at end of file
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent">
+
+        <TextView
+            style="@style/Overline.Secondary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/masternode_ip" />
+
+        <TextView
+            android:id="@+id/ip_address"
+            style="@style/Body2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            tools:text="XXX.XXX.XX.X1" />
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/remove_masternode"
+        android:layout_width="11dp"
+        android:layout_height="11dp"
+        android:padding="12dp"
+        android:layout_marginEnd="15dp"
+        android:background="@drawable/ic_x"
+        android:visibility="invisible"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/wallet/res/navigation/nav_voting.xml b/wallet/res/navigation/nav_voting.xml
index cce66977aa..f05381875a 100644
--- a/wallet/res/navigation/nav_voting.xml
+++ b/wallet/res/navigation/nav_voting.xml
@@ -100,8 +100,8 @@
             app:argType="string" />
 
         <argument
-            android:name="approve"
-            app:argType="boolean" />
+            android:name="vote"
+            app:argType="string" />
 
         <action
             android:id="@+id/votingKeyInput_to_addKeys"
@@ -123,8 +123,8 @@
             android:name="requestId"
             app:argType="string" />
 
-        <argument android:name="approve"
-            app:argType="boolean" />
+        <argument android:name="vote"
+            app:argType="string" />
 
         <action
             android:id="@+id/addKeys_to_votingKeyInput"
diff --git a/wallet/res/values/strings-dashpay.xml b/wallet/res/values/strings-dashpay.xml
index c81df69963..bdce7d94cd 100644
--- a/wallet/res/values/strings-dashpay.xml
+++ b/wallet/res/values/strings-dashpay.xml
@@ -268,7 +268,8 @@
     <string name="usernames_blocked_title">Some usernames can be blocked</string>
     <string name="usernames_blocked_subtitle">If enough of the network determines that a username is inappropriate, they can block it</string>
     <string name="username_voting">Username Voting</string>
-    <string name="username_voting_subtitle">As a masternode owner you can vote to approve requested usernames before they are created on the network..</string>
+    <string name="username_voting_subtitle">As a masternode owner you can vote to approve requested usernames before they are created on the network.</string>
+    <string name="username_voting_subtitle_two">You can block the creation of the usernames that you feel are inappropriate.</string>
     <string name="voting_duplicates_only_title">Default filter setting</string>
     <string name="voting_duplicates_only_message">The default filter shows only duplicate usernames that you have NOT voted on, but you can see all contested usernames by changing the filter</string>
     <string name="all">All</string>
@@ -295,7 +296,15 @@
         <item>I have not approved</item>
         <item>Has Blocked votes</item>
     </string-array>
-
+    <string name="unblock_button">Unblock</string>
+    <plurals name="block_vote_button">
+        <item quantity="one">Block</item>
+        <item quantity="other">Blocks</item>
+    </plurals>
+    <plurals name="approval_button">
+        <item quantity="one">Approval</item>
+        <item quantity="other">Approvals</item>
+    </plurals>
     <string name="block_vote_count">%d Block(s)</string>
     <string name="request_your_username">Create your username</string>
     <string name="request_your_hint">Please note that you will not be able to change it in the future</string>
@@ -315,6 +324,7 @@
     <string name="request_details">Request details</string>
     <string name="request_details_subtitle">Review the posting bellow to verify the ownership of this username</string>
     <string name="vote_to_approve">Vote to Approve</string>
+    <string name="vote_to_block">Vote to Block</string>
     <string name="identity">Identity</string>
     <string name="results">Results</string>
     <string name="link">Link</string>
@@ -333,13 +343,31 @@
     <string name="voting_key_hint">Masternode Voting Private Key</string>
     <string name="voting_key_input_error">You have entered an invalid key</string>
     <string name="voting_key_input_not_active_error">You have entered a key that is not associated to an active Masternode</string>
+    <string name="voting_key_input_already_present">You have already entered this masternode key</string>
+    <string name="voting_key_input_invalid_private_key_wrong_network_testnet">You have entered a key that is for testnet, but this is mainnet. It should look like this: %s</string>
+    <string name="voting_key_input_invalid_private_key_wrong_network_mainnet">You have entered a key that is for mainnet, but this is testnet. It should look like this: %s</string>
+    <string name="voting_key_input_invalid_private_key_address">You have entered an address key instead of a masternode voting private key. It should be in WIF format (%s)</string>
+    <string name="voting_key_input_invalid_private_key_private_key_hex">You have entered a key in hex format, but it should be in WIF format (%s)</string>
+    <string name="voting_key_input_invalid_private_key_public_key_hex">You have entered a key in hex format, but it should be in WIF format (%s)</string>
+    <string name="voting_key_input_invalid_private_key_too_short">You have entered a private key that is too short.  Here is an example (%s)</string>
+    <string name="voting_key_input_invalid_private_key_incorrect">You have entered a private key that with some incorrect characters.  Here is an example (%s)</string>
+    <string name="voting_key_input_invalid_private_key_invalid_char">You have entered a private key has an invalid character.  Here is an example (%s)</string>
+
     <string name="voting_key_add">Add your voting keys</string>
     <string name="voting_key_add_subtitle">The IP address(es) below are associated with this wallet</string>
     <string name="masternode_ip">Masternode IP address</string>
     <string name="multiple_votes_cast">%d votes will be cast as you have multiple voting keys stored in the wallet</string>
     <string name="add_masternode_key">Add Masternode Voting Key</string>
-    <string name="vote_submitted">Your vote was submitted</string>
-    <string name="vote_cancelled">Your vote was cancelled</string>
+    <string name="dont_ask_again">Don\'t ask me again</string>
+    <string name="vote_submitting">Submitting your vote for %s username</string>
+    <string name="vote_submitted">Voted for %s username</string>
+    <string name="cancel_submitting">Canceling your vote for %s username</string>
+    <string name="cancel_submitted">Canceled vote for %s username</string>
+    <string name="block_submitting">Blocking for %s username</string>
+    <string name="block_submitted">You blocked %s username</string>
+    <string name="vote_submitted_error">Error voting for %s username</string>
+    <string name="cancel_submitted_error">Error canceling vote for %s username</string>
+    <string name="block_submitted_error">Error blocking %s username</string>
     <string name="quick_vote">Quick Voting</string>
     <string name="quick_vote_subtitle">By tapping the \"Vote for All\" button, you will automatically vote for all of the filtered usernames (%d) that were submitted first</string>
     <string name="vote_for_all">Vote for All</string>
@@ -416,4 +444,6 @@
     <string name="mix_dash_mix">Mix Balance</string>
     <string name="mix_dash_title">Mix your Dash</string>
     <string name="mix_dash_message">To help prevent other people from seeing who you make payments to, it is recommended to mix your balance before you create your username.</string>
+    <string name="dash_private_key_mainnet" translatable="false">XKm5koXHMm7UrVV3ki2pbGA8yZztiSR2F9x6ucEyCSuqTHBMjJix</string>
+    <string name="dash_private_key_testnet" translatable="false">cUR2TrX4U6t6g9kRfDoBbwF2WRKBNjV3gK7HwTgQgmUUQCKXcT3N</string>
 </resources>
diff --git a/wallet/src/de/schildbach/wallet/database/dao/ImportedMasternodeKeyDao.kt b/wallet/src/de/schildbach/wallet/database/dao/ImportedMasternodeKeyDao.kt
index 15a96627f2..ee219c5adf 100644
--- a/wallet/src/de/schildbach/wallet/database/dao/ImportedMasternodeKeyDao.kt
+++ b/wallet/src/de/schildbach/wallet/database/dao/ImportedMasternodeKeyDao.kt
@@ -20,6 +20,7 @@ package de.schildbach.wallet.database.dao
 import androidx.room.*
 import de.schildbach.wallet.database.entity.ImportedMasternodeKey
 import kotlinx.coroutines.flow.Flow
+import org.bitcoinj.core.Sha256Hash
 
 // This table only stores imported masternode keys
 // Masternode keys that are managed by the "Masternode keys" screen are not
@@ -41,4 +42,10 @@ interface ImportedMasternodeKeyDao {
 
     @Query("DELETE FROM imported_masternode_keys")
     suspend fun clear()
+
+    @Query("DELETE FROM imported_masternode_keys WHERE proTxHash = :proTxHash")
+    suspend fun remove(proTxHash: Sha256Hash)
+
+    @Query("SELECT COUNT(*) > 0 FROM imported_masternode_keys WHERE proTxHash = :proTxHash")
+    suspend fun contains(proTxHash: Sha256Hash?): Boolean
 }
diff --git a/wallet/src/de/schildbach/wallet/database/dao/UsernameRequestDao.kt b/wallet/src/de/schildbach/wallet/database/dao/UsernameRequestDao.kt
index 0519bdecb1..b42a0c7092 100644
--- a/wallet/src/de/schildbach/wallet/database/dao/UsernameRequestDao.kt
+++ b/wallet/src/de/schildbach/wallet/database/dao/UsernameRequestDao.kt
@@ -76,4 +76,11 @@ interface UsernameRequestDao {
         """
     )
     suspend fun removeApproval(normalizedLabel: String)
+
+    @Query(
+        """
+        SELECT * FROM username_requests
+         """
+    )
+    suspend fun getAll(): List<UsernameRequest>
 }
diff --git a/wallet/src/de/schildbach/wallet/database/dao/UsernameVoteDao.kt b/wallet/src/de/schildbach/wallet/database/dao/UsernameVoteDao.kt
index 8b0322f3ce..db38599522 100644
--- a/wallet/src/de/schildbach/wallet/database/dao/UsernameVoteDao.kt
+++ b/wallet/src/de/schildbach/wallet/database/dao/UsernameVoteDao.kt
@@ -21,17 +21,26 @@ import androidx.room.*
 import de.schildbach.wallet.database.entity.UsernameVote
 import kotlinx.coroutines.flow.Flow
 
+/**
+ * For this table, username is normalized
+ */
 @Dao
 interface UsernameVoteDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insert(usernameVote: UsernameVote)
 
-    @Query("SELECT * FROM username_votes WHERE username = :username")
+    @Query("SELECT * FROM username_votes WHERE username = :username ORDER BY timestamp")
     suspend fun getVotes(username: String): List<UsernameVote>
 
-    @Query("SELECT * FROM username_votes WHERE username = :username")
+    @Query("SELECT * FROM username_votes WHERE username = :username ORDER BY timestamp")
     fun observeVotes(username: String): Flow<List<UsernameVote>>
 
     @Query("DELETE FROM username_votes")
     suspend fun clear()
+
+    @Query("DELETE FROM username_votes WHERE username == :username")
+    suspend fun remove(username: String)
+
+    @Query("SELECT * FROM username_votes")
+    suspend fun getAllVotes(): List<UsernameVote>
 }
diff --git a/wallet/src/de/schildbach/wallet/database/entity/UsernameRequest.kt b/wallet/src/de/schildbach/wallet/database/entity/UsernameRequest.kt
index b848d5cc7d..36f5ba1bd7 100644
--- a/wallet/src/de/schildbach/wallet/database/entity/UsernameRequest.kt
+++ b/wallet/src/de/schildbach/wallet/database/entity/UsernameRequest.kt
@@ -22,6 +22,9 @@ import androidx.room.PrimaryKey
 import de.schildbach.wallet.Constants
 import org.bitcoinj.core.NetworkParameters
 import java.util.concurrent.TimeUnit
+import org.bitcoinj.core.Base58
+import org.bitcoinj.core.Sha256Hash
+import org.dashj.platform.sdk.platform.Names
 
 @Entity(tableName = "username_requests")
 data class UsernameRequest(
@@ -40,7 +43,26 @@ data class UsernameRequest(
         val VOTING_PERIOD_MILLIS = if (Constants.NETWORK_PARAMETERS.id == NetworkParameters.ID_MAINNET) TimeUnit.DAYS.toMillis(14) else TimeUnit.MINUTES.toMillis(90)
         val SUBMIT_PERIOD_MILLIS = VOTING_PERIOD_MILLIS / 2
         fun getRequestId(identity: String, username: String): String {
-            return String.format("%s-%s", identity, username)
+            return String.format("%s-%s", identity, Names.normalizeString(username))
         }
+        fun block(username: String, normalizedLabel: String) = UsernameRequest(
+            "",
+            username,
+            normalizedLabel,
+            0L,
+            Base58.encode(Sha256Hash.ZERO_HASH.bytes),
+            null,
+            0,
+            0,
+            false
+        )
+    }
+
+    override fun equals(other: Any?): Boolean {
+        return other is UsernameRequest && requestId == other.requestId
+    }
+
+    override fun hashCode(): Int {
+        return requestId.hashCode()
     }
 }
diff --git a/wallet/src/de/schildbach/wallet/database/entity/UsernameVote.kt b/wallet/src/de/schildbach/wallet/database/entity/UsernameVote.kt
index c96d4cd885..21d10da73f 100644
--- a/wallet/src/de/schildbach/wallet/database/entity/UsernameVote.kt
+++ b/wallet/src/de/schildbach/wallet/database/entity/UsernameVote.kt
@@ -19,6 +19,7 @@ package de.schildbach.wallet.database.entity
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import org.dashj.platform.dpp.voting.ResourceVoteChoice
 
 @Entity(tableName = "username_votes")
 data class UsernameVote(
@@ -30,10 +31,23 @@ data class UsernameVote(
     val timestamp: Long = System.currentTimeMillis()
 ) {
     constructor(username: String, identity: String, type: String): this(0, username, identity, type)
+    constructor(username: String, identity: String, resourceVoteChoice: ResourceVoteChoice) : this(
+        0,
+        username,
+        identity,
+        getVoteString(resourceVoteChoice)
+    )
     companion object {
         const val APPROVE = "approve"
         const val LOCK = "lock"
         const val ABSTAIN = "abstain"
-        const val MAX_VOTES = 6
+        const val MAX_VOTES = 5 // max allowed by Platform for a masternode
+
+        fun getVoteString(resourceVoteChoice: ResourceVoteChoice) = when {
+            resourceVoteChoice.toString().startsWith("TowardsIdentity") -> UsernameVote.APPROVE
+            resourceVoteChoice.toString().lowercase() == "lock" -> UsernameVote.LOCK
+            resourceVoteChoice.toString().lowercase() == "abstain" -> UsernameVote.ABSTAIN
+            else -> error("unhandled vote type: $resourceVoteChoice")
+        }
     }
 }
diff --git a/wallet/src/de/schildbach/wallet/payments/SendCoinsTaskRunner.kt b/wallet/src/de/schildbach/wallet/payments/SendCoinsTaskRunner.kt
index 085b37f09c..16e18d02e1 100644
--- a/wallet/src/de/schildbach/wallet/payments/SendCoinsTaskRunner.kt
+++ b/wallet/src/de/schildbach/wallet/payments/SendCoinsTaskRunner.kt
@@ -78,7 +78,6 @@ class SendCoinsTaskRunner @Inject constructor(
     }
     private var coinJoinSend = false
     private val coroutineScope = CoroutineScope(Dispatchers.IO)
-    private var firebaseInstallationId: String = ""
     init {
         coinJoinConfig
             .observeMode()
diff --git a/wallet/src/de/schildbach/wallet/service/platform/PlatformBroadcastService.kt b/wallet/src/de/schildbach/wallet/service/platform/PlatformBroadcastService.kt
index 1d9648452b..02961d5c87 100644
--- a/wallet/src/de/schildbach/wallet/service/platform/PlatformBroadcastService.kt
+++ b/wallet/src/de/schildbach/wallet/service/platform/PlatformBroadcastService.kt
@@ -44,13 +44,17 @@ import org.slf4j.LoggerFactory
 import java.io.ByteArrayOutputStream
 import javax.inject.Inject
 
-
 interface PlatformBroadcastService {
     suspend fun broadcastUpdatedProfile(dashPayProfile: DashPayProfile, encryptionKey: KeyParameter): DashPayProfile
     suspend fun sendContactRequest(toUserId: String): DashPayContactRequest
     suspend fun sendContactRequest(toUserId: String, encryptionKey: KeyParameter): DashPayContactRequest
     suspend fun broadcastIdentityVerify(username: String, url: String, encryptionKey: KeyParameter?): IdentityVerifyDocument
-    suspend fun broadcastUsernameVotes(usernames: List<String>, resourceVoteChoices: List<ResourceVoteChoice>, masternodeKeys: List<ByteArray>, encryptionKey: KeyParameter?): List<Vote>
+    suspend fun broadcastUsernameVotes(
+        usernames: List<String>,
+        resourceVoteChoices: List<ResourceVoteChoice>,
+        masternodeKeys: List<ByteArray>,
+        encryptionKey: KeyParameter?
+    ): List<Triple<ResourceVoteChoice, Vote?, Exception?>>
 }
 
 class PlatformDocumentBroadcastService @Inject constructor(
@@ -58,12 +62,12 @@ class PlatformDocumentBroadcastService @Inject constructor(
     val platformRepo: PlatformRepo,
     val analytics: AnalyticsService,
     val walletDataProvider: WalletDataProvider,
-    val platformSyncService: PlatformSyncService) : PlatformBroadcastService {
-
+    val platformSyncService: PlatformSyncService
+) : PlatformBroadcastService {
     companion object {
         private val log: Logger = LoggerFactory.getLogger(PlatformDocumentBroadcastService::class.java)
     }
-    
+
     @Throws(Exception::class)
     override suspend fun sendContactRequest(toUserId: String): DashPayContactRequest {
         if (walletDataProvider.wallet!!.isEncrypted) {
@@ -132,9 +136,9 @@ class PlatformDocumentBroadcastService @Inject constructor(
         resourceVoteChoices: List<ResourceVoteChoice>,
         masternodeKeys: List<ByteArray>,
         encryptionKey: KeyParameter?
-    ): List<Vote> {
+    ): List<Triple<ResourceVoteChoice, Vote?, Exception?>> {
         Preconditions.checkArgument(usernames.size == resourceVoteChoices.size)
-        val votes = arrayListOf<Vote>()
+        val votes = arrayListOf<Triple<ResourceVoteChoice, Vote?, Exception?>>()
         masternodeKeys.forEach { masternodeKeyBytes ->
             // determine identity
             val masternodeKey = ECKey.fromPrivate(masternodeKeyBytes)
@@ -151,17 +155,21 @@ class PlatformDocumentBroadcastService @Inject constructor(
 
                     usernames.forEachIndexed { index, username ->
                         val resourceVoteChoice = resourceVoteChoices[index]
-                        val vote = platform.names.broadcastVote(
-                            resourceVoteChoice,
-                            username,
-                            masternode.proTxHash,
-                            votingIdentityPublicKey,
-                            SimpleSignerCallback(
-                                mapOf(votingIdentityPublicKey to masternodeKey),
-                                encryptionKey
+                        try {
+                            val vote = platform.names.broadcastVote(
+                                resourceVoteChoice,
+                                username,
+                                masternode.proTxHash,
+                                votingIdentityPublicKey,
+                                SimpleSignerCallback(
+                                    mapOf(votingIdentityPublicKey to masternodeKey),
+                                    encryptionKey
+                                )
                             )
-                        )
-                        votes.add(vote)
+                            votes.add(Triple(resourceVoteChoice, vote, null))
+                        } catch (e: Exception) {
+                            votes.add(Triple(resourceVoteChoice, null, e))
+                        }
                     }
                 } catch (e: Exception) {
                     log.info("broadcast username vote failed:", e)
diff --git a/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt b/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt
index 137be316d3..f2b3741d18 100644
--- a/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt
+++ b/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt
@@ -34,6 +34,7 @@ import de.schildbach.wallet.database.dao.InvitationsDao
 import de.schildbach.wallet.database.dao.TransactionMetadataChangeCacheDao
 import de.schildbach.wallet.database.dao.TransactionMetadataDocumentDao
 import de.schildbach.wallet.database.dao.UsernameRequestDao
+import de.schildbach.wallet.database.dao.UsernameVoteDao
 import de.schildbach.wallet.database.entity.BlockchainIdentityConfig
 import de.schildbach.wallet.database.entity.BlockchainIdentityData
 import de.schildbach.wallet.database.entity.DashPayContactRequest
@@ -101,6 +102,7 @@ interface PlatformSyncService {
     suspend fun updateContactRequests()
     fun postUpdateBloomFilters()
     suspend fun updateUsernameRequestsWithVotes()
+    suspend fun updateUsernameRequestWithVotes(username: String)
     suspend fun checkUsernameVotingStatus()
 
     fun addContactsUpdatedListener(listener: OnContactsUpdated)
@@ -129,6 +131,7 @@ class PlatformSynchronizationService @Inject constructor(
     private val dashPayContactRequestDao: DashPayContactRequestDao,
     private val invitationsDao: InvitationsDao,
     private val usernameRequestDao: UsernameRequestDao,
+    private val usernameVoteDao: UsernameVoteDao,
     private val identityConfig: BlockchainIdentityConfig
 ) : PlatformSyncService {
 
@@ -230,8 +233,8 @@ class PlatformSynchronizationService @Inject constructor(
                     val timeWindow = UsernameRequest.VOTING_PERIOD_MILLIS
                     if (System.currentTimeMillis() - blockchainIdentityData.votingPeriodStart!! >= timeWindow) {
                         val resource = platformRepo.getUsername(blockchainIdentityData.username!!)
-                        if (resource.status == Status.SUCCESS) {
-                            val domainDocument = DomainDocument(resource.data!!)
+                        if (resource.status == Status.SUCCESS && resource.data != null) {
+                            val domainDocument = DomainDocument(resource.data)
                             if (domainDocument.dashUniqueIdentityId == blockchainIdentityData.identity?.id) {
                                 blockchainIdentityData.creationState =
                                     BlockchainIdentityData.CreationState.DONE_AND_DISMISS
@@ -376,7 +379,6 @@ class PlatformSynchronizationService @Inject constructor(
         } finally {
             updatingContacts.set(false)
 
-
             counterForReport++
             if (counterForReport % 8 == 0) {
                 // record the report to the logs every 2 minutes
@@ -1049,7 +1051,116 @@ class PlatformSynchronizationService @Inject constructor(
         log.info("publishing updates to tx metadata items complete")
     }
 
+    // uses get_vote_polls to get active vote polls, but must check remaining
+    // items in the username_requests table and remove them
     override suspend fun updateUsernameRequestsWithVotes() {
+        checkUsernameVotingStatus()
+        log.info("updateUsernameRequestsWithVotes starting")
+        try {
+            log.info("updateUsernameRequestsWithVotes: getCurrentVotePolls start")
+            val votePolls = platform.platform.names.getCurrentVotePolls()
+            log.info("updateUsernameRequestsWithVotes: getCurrentVotePolls end")
+            // usernameRequestDao.clear()
+            // val myIdentifier = platformRepo.blockchainIdentity.uniqueIdentifier
+            val currentRequestList = usernameRequestDao.getAll().toMutableList()
+            val currentUsernames = arrayListOf<String>()
+            for (votePoll in votePolls) {
+                try {
+                    val name :String? = when (votePoll) {
+                        is ContestedDocumentResourceVotePoll -> {
+                            when (votePoll.indexValues[1]) {
+                                is String -> votePoll.indexValues[1] as String
+                                is PlatformValue -> {
+                                    val value = votePoll.indexValues[1] as PlatformValue
+                                    when (value.tag) {
+                                        PlatformValue.Tag.Text -> value.text
+                                        else -> null
+                                    }
+                                }
+                                else -> null
+                            }
+                        }
+                        else -> null
+                    }
+
+                    name?.let { normalizedLabel ->
+                        val voteContender = platformRepo.getVoteContenders(normalizedLabel)
+
+                        voteContender.map.forEach { (identifier, contender) ->
+
+                            if (voteContender.winner.isEmpty) {
+                                val contestedDocument = contender.seralizedDocument?.let { serialized ->
+                                    DomainDocument(
+                                        platform.platform.names.deserialize(serialized)
+                                    )
+                                }
+
+                                if (contestedDocument != null) {
+                                    val identityVerifyDocument = IdentityVerify(platform.platform).get(identifier, name)
+
+                                    val requestId = UsernameRequest.getRequestId(identifier.toString(), normalizedLabel)
+                                    val previousUsernameRequest = usernameRequestDao.getRequest(requestId)
+
+                                    val usernameRequest = UsernameRequest(
+                                        requestId = requestId,
+                                        username = contestedDocument.label,
+                                        normalizedLabel = name,
+                                        createdAt = contestedDocument.createdAt ?: -1L,
+                                        identity = identifier.toString(),
+                                        link = identityVerifyDocument?.url,
+                                        votes = contender.votes,
+                                        lockVotes = voteContender.lockVoteTally,
+                                        isApproved = previousUsernameRequest?.isApproved ?: false
+                                    )
+                                    usernameRequestDao.insert(usernameRequest)
+                                    currentRequestList.remove(usernameRequest)
+                                    currentUsernames.add(usernameRequest.normalizedLabel)
+                                } else {
+                                    // voting is complete
+                                    usernameRequestDao.remove(
+                                        UsernameRequest.getRequestId(identifier.toString(), name)
+                                    )
+                                    // remove related votes
+                                    usernameVoteDao.remove(name)
+                                }
+                            } else {
+                                // there is a winner
+                                usernameRequestDao.remove(
+                                    UsernameRequest.getRequestId(identifier.toString(), name)
+                                )
+                                // remove related votes
+                                usernameVoteDao.remove(name)
+                            }
+                        }
+                    }
+                } catch (e: Exception) {
+                    log.warn("problem getting vote polls", e)
+                }
+            }
+
+            // check the remaining items to ensure voting has ended
+            currentRequestList.forEach { request ->
+                val voteContender = platformRepo.getVoteContenders(request.normalizedLabel)
+                if (voteContender.winner.isPresent) {
+                    usernameRequestDao.remove(request.requestId)
+                }
+                // remove related votes
+                usernameVoteDao.remove(request.normalizedLabel)
+            }
+            // check votes and remove those from previous vote polls
+            usernameVoteDao.getAllVotes().forEach { vote ->
+                if (!currentUsernames.contains(vote.username)) {
+                    usernameVoteDao.remove(vote.username)
+                }
+            }
+        } catch (e: Exception) {
+            log.info("problem obtaining votes:", e)
+        } finally {
+            log.info("updateUsernameRequestsWithVotes complete")
+        }
+    }
+
+    /*override*/ suspend fun updateUsernameRequestsWithVotes_old() {
         checkUsernameVotingStatus()
         try {
             val contestedNames = platform.platform.names.getContestedNames()
@@ -1066,30 +1177,35 @@ class PlatformSynchronizationService @Inject constructor(
                                 platform.platform.names.deserialize(serialized)
                             )
                         }
-
-                        if (contestedDocument != null) {
-                            val identityVerifyDocument = IdentityVerify(platform.platform).get(identifier, name)
-
-                            val requestId = UsernameRequest.getRequestId(identifier.toString(), name)
-                            val previousUsernameRequest = usernameRequestDao.getRequest(requestId)
-
-                            val usernameRequest = UsernameRequest(
-                                requestId = requestId,
-                                username = contestedDocument.label,
-                                normalizedLabel = name,
-                                createdAt = contestedDocument.createdAt ?: -1L,
-                                identity = identifier.toString(),
-                                link = identityVerifyDocument?.url,
-                                votes = contender.votes,
-                                lockVotes = voteContender.lockVoteTally,
-                                isApproved = previousUsernameRequest?.isApproved ?: false
-                            )
-                            usernameRequestDao.insert(usernameRequest)
+                        val hasWinner = voteContender.winner.isPresent
+
+                        if (!hasWinner) {
+                            if (contestedDocument != null) {
+                                val identityVerifyDocument = IdentityVerify(platform.platform).get(identifier, name)
+
+                                val requestId = UsernameRequest.getRequestId(identifier.toString(), name)
+                                val previousUsernameRequest = usernameRequestDao.getRequest(requestId)
+
+                                val usernameRequest = UsernameRequest(
+                                    requestId = requestId,
+                                    username = contestedDocument.label,
+                                    normalizedLabel = name,
+                                    createdAt = contestedDocument.createdAt ?: -1L,
+                                    identity = identifier.toString(),
+                                    link = identityVerifyDocument?.url,
+                                    votes = contender.votes,
+                                    lockVotes = voteContender.lockVoteTally,
+                                    isApproved = previousUsernameRequest?.isApproved ?: false
+                                )
+                                usernameRequestDao.insert(usernameRequest)
+                            }
                         } else {
                             // voting is complete
                             usernameRequestDao.remove(
                                 UsernameRequest.getRequestId(identifier.toString(), name)
                             )
+                            // remove related votes
+                            usernameVoteDao.remove(name)
                         }
                     }
                 } catch(e: Exception) {
@@ -1101,6 +1217,55 @@ class PlatformSynchronizationService @Inject constructor(
         }
     }
 
+    /**
+     * update databases for a single username (normalized)
+     */
+    override suspend fun updateUsernameRequestWithVotes(name: String) {
+        try {
+            val voteContender = platformRepo.getVoteContenders(name)
+
+            voteContender.map.forEach { (identifier, contender) ->
+                val contestedDocument = contender.seralizedDocument?.let { serialized ->
+                    DomainDocument(
+                        platform.platform.names.deserialize(serialized)
+                    )
+                }
+                val hasWinner = voteContender.winner.isPresent
+
+                if (!hasWinner) {
+                    if (contestedDocument != null) {
+                        val identityVerifyDocument = IdentityVerify(platform.platform).get(identifier, name)
+
+                        val requestId = UsernameRequest.getRequestId(identifier.toString(), name)
+                        val previousUsernameRequest = usernameRequestDao.getRequest(requestId)
+
+                        val usernameRequest = UsernameRequest(
+                            requestId = requestId,
+                            username = contestedDocument.label,
+                            normalizedLabel = name,
+                            createdAt = contestedDocument.createdAt ?: -1L,
+                            identity = identifier.toString(),
+                            link = identityVerifyDocument?.url,
+                            votes = contender.votes,
+                            lockVotes = voteContender.lockVoteTally,
+                            isApproved = previousUsernameRequest?.isApproved ?: false
+                        )
+                        usernameRequestDao.insert(usernameRequest)
+                    }
+                } else {
+                    // voting is complete
+                    usernameRequestDao.remove(
+                        UsernameRequest.getRequestId(identifier.toString(), name)
+                    )
+                    // remove related votes
+                    usernameVoteDao.remove(name)
+                }
+            }
+        } catch (e: Exception) {
+            log.info("problem obtaining votes for {}:", name, e)
+        }
+    }
+
     override suspend fun triggerPreBlockDownloadComplete() {
         finishPreBlockDownload()
     }
diff --git a/wallet/src/de/schildbach/wallet/ui/dashpay/utils/DashPayConfig.kt b/wallet/src/de/schildbach/wallet/ui/dashpay/utils/DashPayConfig.kt
index 274560ce61..3dfadaa624 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/utils/DashPayConfig.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/utils/DashPayConfig.kt
@@ -53,6 +53,8 @@ open class DashPayConfig @Inject constructor(
         val HAS_DASH_PAY_INFO_SCREEN_BEEN_SHOWN = booleanPreferencesKey("has_dash_pay_info_screen_been_shown")
         val VOTING_INFO_SHOWN = booleanPreferencesKey("voting_info_shown")
         val MIX_DASH_SHOWN = booleanPreferencesKey("mix_dash_shown")
+        val KEYS_DONT_ASK_AGAIN = booleanPreferencesKey("dont_ask_again_for_keys")
+        val FIRST_TIME_VOTING = booleanPreferencesKey("first_time_voting")
     }
 
     open suspend fun areNotificationsDisabled(): Boolean {
diff --git a/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesOperation.kt b/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesOperation.kt
index 167abd709c..120db3ed67 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesOperation.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesOperation.kt
@@ -19,53 +19,114 @@ package de.schildbach.wallet.ui.dashpay.work
 
 import android.annotation.SuppressLint
 import android.app.Application
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.liveData
+import androidx.lifecycle.switchMap
 import androidx.work.*
 import de.schildbach.wallet.Constants
+import de.schildbach.wallet.livedata.Resource
 import de.schildbach.wallet.security.SecurityGuard
 import org.bitcoinj.core.ECKey
 import org.dashj.platform.dpp.voting.ResourceVoteChoice
 import org.slf4j.LoggerFactory
 
 class BroadcastUsernameVotesOperation(val application: Application) {
-
     class BroadcastUsernameVotesOperationException(message: String) : java.lang.Exception(message)
 
     companion object {
+        var lastTimestamp: Long = System.currentTimeMillis()
         private val log = LoggerFactory.getLogger(BroadcastUsernameVotesOperation::class.java)
 
         private const val WORK_NAME = "BroadcastUsernameVotes.WORK#"
 
-        fun uniqueWorkName(usernames: String) = WORK_NAME + usernames
+        fun uniqueWorkName(usernames: String) = "$WORK_NAME$usernames-${System.currentTimeMillis()}"
+
+        fun allOperationsStatus(application: Application): LiveData<MutableMap<String, Resource<WorkInfo>>> {
+            val workManager: WorkManager = WorkManager.getInstance(application)
+            return workManager.getWorkInfosByTagLiveData(BroadcastUsernameVotesWorker::class.qualifiedName!!).switchMap {
+                return@switchMap liveData {
+                    if (it.isNullOrEmpty()) {
+                        return@liveData
+                    }
+
+                    val result = mutableMapOf<String, Resource<WorkInfo>>()
+                    it.filter { workInfo ->
+                        val timestampTag = workInfo.tags.firstOrNull { it.startsWith("timestamp:") }
+                        timestampTag?.let {
+                            val timestamp = it.removePrefix("timestamp:").toLongOrNull()
+                            timestamp != null && timestamp > lastTimestamp
+                        } ?: false
+                    }.forEach { workInfo ->
+                        var toUserId = ""
+                        workInfo.tags.forEach { tag ->
+                            if (tag.startsWith("usernames:")) {
+                                toUserId = tag.replace("usernames:", "")
+                            }
+                        }
+                        result[toUserId] = convertState(workInfo)
+                    }
+                    emit(result)
+                }
+            }
+        }
+
+        private fun convertState(workInfo: WorkInfo): Resource<WorkInfo> {
+            return when (workInfo.state) {
+                WorkInfo.State.SUCCEEDED -> {
+                    Resource.success(workInfo)
+                }
+                WorkInfo.State.FAILED -> {
+                    val errorMessage = BaseWorker.extractError(workInfo.outputData)
+                    if (errorMessage != null) {
+                        Resource.error(errorMessage, workInfo)
+                    } else {
+                        Resource.error(Exception(), workInfo)
+                    }
+                }
+                WorkInfo.State.CANCELLED -> {
+                    Resource.canceled(workInfo)
+                }
+                else -> {
+                    Resource.loading(workInfo)
+                }
+            }
+        }
     }
 
     private val workManager: WorkManager = WorkManager.getInstance(application)
 
-    /**
-     * Gets the list of all BroadcastUsernameVotesOperation WorkInfo's
-     */
-    val allOperationsData = workManager.getWorkInfosByTagLiveData(BroadcastUsernameVotesWorker::class.qualifiedName!!)
+//    /**
+//     * Gets the list of all BroadcastUsernameVotesOperation WorkInfo's
+//     */
+//    val allOperationsLiveData = workManager.getWorkInfosByTagLiveData(BroadcastUsernameVotesWorker::class.qualifiedName!!)
 
     @SuppressLint("EnqueueWork")
-    fun create(usernames: List<String>, voteChoices: List<ResourceVoteChoice>, masternodeKeys: List<ByteArray>): WorkContinuation {
-
+    fun create(
+        usernames: List<String>,
+        voteChoices: List<ResourceVoteChoice>,
+        masternodeKeys: List<ByteArray>
+    ): WorkContinuation {
         val password = SecurityGuard().retrievePassword()
         val verifyIdentityWorker = OneTimeWorkRequestBuilder<BroadcastUsernameVotesWorker>()
-                .setInputData(
-                    workDataOf(
-                        BroadcastUsernameVotesWorker.KEY_PASSWORD to password,
-                        BroadcastUsernameVotesWorker.KEY_USERNAMES to usernames.toTypedArray(),
-                        BroadcastUsernameVotesWorker.KEY_VOTE_CHOICES to voteChoices.map { it.toString() }.toTypedArray(),
-                        BroadcastUsernameVotesWorker.KEY_MASTERNODE_KEYS to masternodeKeys.map {
-                            ECKey.fromPrivate(it).getPrivateKeyAsWiF(Constants.NETWORK_PARAMETERS)
-                        }.toTypedArray()
-                    )
+            .setInputData(
+                workDataOf(
+                    BroadcastUsernameVotesWorker.KEY_PASSWORD to password,
+                    BroadcastUsernameVotesWorker.KEY_USERNAMES to usernames.toTypedArray(),
+                    BroadcastUsernameVotesWorker.KEY_VOTE_CHOICES to voteChoices.map { it.toString() }.toTypedArray(),
+                    BroadcastUsernameVotesWorker.KEY_MASTERNODE_KEYS to masternodeKeys.map {
+                        ECKey.fromPrivate(it).getPrivateKeyAsWiF(Constants.NETWORK_PARAMETERS)
+                    }.toTypedArray()
                 )
-                .addTag("usernames:$usernames")
-                .build()
+            )
+            .addTag("usernames:$usernames")
+            .addTag("timestamp:${System.currentTimeMillis()}") // Add timestamp as a tag
+            .build()
         log.info("creating BroadcastUsernameVotesOperation({}, {})", usernames, voteChoices)
         return WorkManager.getInstance(application)
-                .beginUniqueWork(uniqueWorkName(usernames.joinToString(",")),
-                    ExistingWorkPolicy.KEEP,
-                    verifyIdentityWorker)
+            .beginUniqueWork(
+                uniqueWorkName(usernames.joinToString(",")),
+                ExistingWorkPolicy.KEEP,
+                verifyIdentityWorker
+            )
     }
 }
\ No newline at end of file
diff --git a/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesWorker.kt b/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesWorker.kt
index 9034ab50d6..9f6eed9025 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesWorker.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesWorker.kt
@@ -18,25 +18,30 @@ package de.schildbach.wallet.ui.dashpay.work
 
 import android.content.Context
 import androidx.hilt.work.HiltWorker
-import androidx.work.Data
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
-import com.bumptech.glide.load.engine.Resource
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import de.schildbach.wallet.Constants
-import de.schildbach.wallet.WalletApplication
+import de.schildbach.wallet.database.dao.UsernameRequestDao
+import de.schildbach.wallet.database.dao.UsernameVoteDao
+import de.schildbach.wallet.database.entity.UsernameRequest
+import de.schildbach.wallet.database.entity.UsernameVote
 import de.schildbach.wallet.service.platform.PlatformBroadcastService
 import de.schildbach.wallet.service.platform.PlatformSyncService
-import de.schildbach.wallet.ui.dashpay.PlatformRepo
 import org.bitcoinj.core.DumpedPrivateKey
 import org.bitcoinj.crypto.KeyCrypterException
 import org.bouncycastle.crypto.params.KeyParameter
 import org.dash.wallet.common.WalletDataProvider
 import org.dash.wallet.common.services.analytics.AnalyticsConstants
 import org.dash.wallet.common.services.analytics.AnalyticsService
+import org.dashj.platform.dpp.identifier.Identifier
+import org.dashj.platform.dpp.voting.ContestedDocumentResourceVotePoll
+import org.dashj.platform.dpp.voting.ResourceVote
 import org.dashj.platform.dpp.voting.ResourceVoteChoice
-import org.dashj.platform.sdk.ContestedDocumentResourceVotePoll
+import org.dashj.platform.dpp.voting.TowardsIdentity
+import org.dashj.platform.dpp.voting.Vote
+import org.dashj.platform.sdk.PlatformValue
 import org.slf4j.LoggerFactory
 
 @HiltWorker
@@ -46,9 +51,10 @@ class BroadcastUsernameVotesWorker @AssistedInject constructor(
     val analytics: AnalyticsService,
     val platformBroadcastService: PlatformBroadcastService,
     val platformSyncService: PlatformSyncService,
-    val walletDataProvider: WalletDataProvider
+    val walletDataProvider: WalletDataProvider,
+    val usernameRequestDao: UsernameRequestDao,
+    val usernameVoteDao: UsernameVoteDao
 ) : BaseWorker(context, parameters) {
-
     companion object {
         private val log = LoggerFactory.getLogger(BroadcastUsernameVotesWorker::class.java)
 
@@ -68,6 +74,7 @@ class BroadcastUsernameVotesWorker @AssistedInject constructor(
         val masternodeKeys = inputData.getStringArray(KEY_MASTERNODE_KEYS)
             ?: return Result.failure(workDataOf(KEY_ERROR_MESSAGE to "missing KEY_MASTERNODE_KEYS parameter"))
 
+        // TODO: add decryption later?
         val encryptionKey: KeyParameter
         try {
             encryptionKey = walletDataProvider.wallet!!.keyCrypter!!.deriveKey(password)
@@ -78,31 +85,177 @@ class BroadcastUsernameVotesWorker @AssistedInject constructor(
         }
 
         return try {
-            log.info("creating BroadcastUsernameVotesWorker({}, {})", usernames, voteChoices)
+            log.info("executing BroadcastUsernameVotesWorker({}, {})", usernames, voteChoices)
+            log.info("voting BroadcastUsernameVotesWorker({}, {})", usernames, voteChoices)
 
-            val votes = platformBroadcastService.broadcastUsernameVotes(
+            // comment this out for now
+            val votingResults = platformBroadcastService.broadcastUsernameVotes(
                 usernames.toList(),
                 voteChoices.map { ResourceVoteChoice.from(it) },
                 masternodeKeys.map { DumpedPrivateKey.fromBase58(Constants.NETWORK_PARAMETERS, it).key.privKeyBytes },
                 encryptionKey
             )
+            log.info("voted BroadcastUsernameVotesWorker({}, {})", usernames, voteChoices)
+            // mock the voting results
+//            val votingResults = arrayListOf<Triple<ResourceVoteChoice, Vote?, Exception?>>()
+//            usernames.forEachIndexed { i, username ->
+//                votingResults.add(
+//                    Triple(
+//                        ResourceVoteChoice.from(voteChoices[i]),
+//                        Vote(
+//                            ResourceVote(
+//                                ResourceVoteChoice.from(voteChoices[i]),
+//                                ContestedDocumentResourceVotePoll(
+//                                    SystemIds.dpnsDataContractId,
+//                                    "domain",
+//                                    "parentDomainAndLabel",
+//                                    listOf("dash", username)
+//                                )
+//                            )
+//                        ),
+//                        null
+//                    )
+//                )
+//            }
             // this will update the DB and trigger observers
-            platformSyncService.updateUsernameRequestsWithVotes()
+            // this is taking too long...
+            //platformSyncService.updateUsernameRequestsWithVotes()
+
+            // update local database
             analytics.logEvent(AnalyticsConstants.UsernameVoting.VOTE_SUCCESS, mapOf())
-            Result.success(
-                workDataOf(
-                    KEY_USERNAMES to if(votes.isNotEmpty()) {
-                        votes.map { (it.resourceVote.votePoll as? ContestedDocumentResourceVotePoll)?.index_values?.get(1) ?: "null" }.toTypedArray()
-                    } else {
-                        listOf("").toTypedArray()
-                    },
-                )
-            )
+            val arrayOfnames: Array<String> = votingResults.map {
+                val item = ((it.second?.resourceVote?.votePoll as? ContestedDocumentResourceVotePoll)?.indexValues?.get(1) ?: "null")
+                when (item) {
+                    is PlatformValue -> {
+                        when (item.tag) {
+                            PlatformValue.Tag.Text -> item.text
+                            else -> item.toString()
+                        }
+                    }
+                    is String -> item
+                    else -> item.toString()
+                }
+            }.toSet().toTypedArray()
+            val votes = hashMapOf<String, UsernameVote>()
+            votingResults.forEach {
+                when (val votePoll = it.second?.resourceVote?.votePoll as? ContestedDocumentResourceVotePoll) {
+                    is ContestedDocumentResourceVotePoll -> {
+                        val normalizedLabel = when (val item = votePoll?.indexValues?.get(1)) {
+                            is PlatformValue -> {
+                                when (item.tag) {
+                                    PlatformValue.Tag.Text -> item.text
+                                    else -> null
+                                }
+                            }
+                            is String -> item
+                            else -> null
+                        }
+                        val identity = when (it.first) {
+                            is TowardsIdentity -> {
+                                (it.first as TowardsIdentity).identifier
+                            }
+                            else -> null
+                        }
+                        votes[normalizedLabel!!] = UsernameVote(normalizedLabel, identity.toString(), it.first)
+                    }
+                }
+            }
+            votes.forEach { (_, usernameVote) ->
+                updateUsernameVotes(usernameVote)
+            }
+            val errorCount = votingResults.count { it.third != null }
+            when (errorCount) {
+                0 -> {
+                    // all were successful
+                    log.info("all votes succeeded: total submitted {}", errorCount, votingResults.size)
+                    Result.success(
+                        workDataOf(
+                            KEY_USERNAMES to if (votingResults.isNotEmpty()) {
+                                arrayOfnames
+                            } else {
+                                listOf("").toTypedArray()
+                            },
+                            KEY_VOTE_CHOICES to votingResults.map {
+                                it.first.toString()
+                            }.toTypedArray()
+                        )
+                    )
+                }
+                votingResults.size -> {
+                    // all have failed
+                    log.error("all votes failed: errors: {} vs total submitted {}", errorCount, votingResults.size)
+                    // java.lang.Exception: Attempted to unwrap a Failure: Dapi client error: Transport(Status { code: InvalidArgument, message: "Masternode vote is already present for masternode EbitFAjpGsuf7qKPpsQMZw2ZKZ8rs2S1PdqKvYA8J2Ux voting for ContestedDocumentResourceVotePoll(ContestedDocumentResourceVotePoll { contract_id: GWRSAVFMjXx8HpQFaNJMqBV7MBgMK4br5UESsB4S31Ec, document_type_name: domain, index_name: parentNameAndLabel, index_values: [string dash, string test-1101] })", metadata: MetadataMap { headers: {"drive-error-data-bin": "oW9zZXJpYWxpemVkRXJyb3KYbwIYKxjKDQkQABgqGO0YuRh/GLMDGOkYexgdGLEVGIMYvhhiGLMY2xiLGGEYRxj/GKgYSxiYGDAYnxjOGHEAGOYYaBjGGFkYrxhmGK4Y4RjnGCwYGBhtGN4YexhbGH4KGB0YcRgqCRjEDRhXGCEY9hgiGL8YUxjFGDEYVQYYZBhvGG0YYRhpGG4SGHAYYRhyGGUYbhh0GE4YYRhtGGUYQRhuGGQYTBhhGGIYZRhsAhIEGGQYYRhzGGgSCRh0GGUYcxh0GC0YMRgxGDAYMQ==", "code": "40304", "grpc-accept-encoding": "identity", "grpc-encoding": "identity", "content-type": "application/grpc+proto", "date": "Mon, 28 Oct 2024 22:27:37 GMT", "x-envoy-upstream-service-time": "55", "server": "envoy"} }, source: None }, Address { ban_count: 0, banned_until: None, uri: https://52.89.154.48:1443/ })
+                    votingResults.forEach {
+                        it.third?.let { e ->
+                            log.error("error with vote: {}", it.first, e)
+                        }
+                    }
+                    Result.failure(
+                        workDataOf(
+                            KEY_USERNAMES to if (votingResults.isNotEmpty()) {
+                                arrayOfnames
+                            } else {
+                                listOf("").toTypedArray()
+                            },
+                            KEY_VOTE_CHOICES to votingResults.map {
+                                it.first.toString()
+                            }.toTypedArray()
+                        )
+                    )
+                }
+                else -> {
+                    // some have failed, how can we report this?
+                    log.error("not all votes succeeeded: errors: {} vs total submitted {}", errorCount, votingResults.size)
+                    votingResults.forEach {
+                        it.third?.let { e ->
+                            log.error("error with vote: {}", it.first, e)
+                        }
+                    }
+                    Result.success(
+                        workDataOf(
+                            KEY_USERNAMES to usernames,
+                            KEY_VOTE_CHOICES to voteChoices
+                        )
+                    )
+                }
+            }
         } catch (ex: Exception) {
             analytics.logEvent(AnalyticsConstants.UsernameVoting.VOTE_ERROR, mapOf())
             analytics.logError(ex, "Username Voting: failed to broadcast votes")
-            Result.failure(workDataOf(
-                    KEY_ERROR_MESSAGE to formatExceptionMessage("broadcast username vote", ex)))
+            Result.failure(
+                workDataOf(
+                    KEY_ERROR_MESSAGE to formatExceptionMessage("broadcast username vote", ex),
+                    KEY_USERNAMES to usernames,
+                    KEY_VOTE_CHOICES to voteChoices
+                )
+            )
+        } finally {
+            log.info("finshed BroadcastUsernameVotesWorker({}, {})", usernames, voteChoices)
         }
     }
+
+    private suspend fun updateUsernameVotes(
+        normalizedLabel: String,
+        identity: Identifier?,
+        keyCount: Int,
+        voteType: ResourceVoteChoice
+    ) {
+        // usernameRequestDao.removeApproval(request.username)
+        // usernameRequestDao.update(request.copy(votes = request.votes + keyCount, isApproved = true))
+        usernameVoteDao.insert(
+            UsernameVote(
+                normalizedLabel,
+                identity?.toString() ?: "",
+                voteType
+            )
+        )
+    }
+
+    private suspend fun updateUsernameVotes(
+        vote: UsernameVote
+    ) {
+        // usernameRequestDao.removeApproval(request.username)
+        // usernameRequestDao.update(request.copy(votes = request.votes + keyCount, isApproved = true))
+        usernameVoteDao.insert(vote)
+    }
 }
\ No newline at end of file
diff --git a/wallet/src/de/schildbach/wallet/ui/username/AddVotingKeysFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/AddVotingKeysFragment.kt
index b6d9d2cca9..804853398a 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/AddVotingKeysFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/AddVotingKeysFragment.kt
@@ -2,19 +2,31 @@ package de.schildbach.wallet.ui.username
 
 import android.os.Bundle
 import android.view.View
+import androidx.core.view.isGone
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
+import de.schildbach.wallet.database.entity.UsernameVote
 import de.schildbach.wallet.ui.username.adapters.IPAddressAdapter
 import de.schildbach.wallet.ui.username.utils.votingViewModels
 import de.schildbach.wallet_test.R
 import de.schildbach.wallet_test.databinding.FragmentAddVotingKeysBinding
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.dash.wallet.common.ui.setRoundedRippleBackground
 import org.dash.wallet.common.ui.viewBinding
 import org.dash.wallet.common.util.observe
 import org.dash.wallet.common.util.safeNavigate
+import org.slf4j.LoggerFactory
+import java.util.logging.Logger
 
 class AddVotingKeysFragment : Fragment(R.layout.fragment_add_voting_keys) {
+    companion object {
+        private val log = LoggerFactory.getLogger(AddVotingKeysFragment::class.java)
+    }
     private val binding by viewBinding(FragmentAddVotingKeysBinding::bind)
     private val viewModel by votingViewModels<UsernameRequestsViewModel>()
     private val args by navArgs<AddVotingKeysFragmentArgs>()
@@ -26,30 +38,47 @@ class AddVotingKeysFragment : Fragment(R.layout.fragment_add_voting_keys) {
             findNavController().popBackStack()
         }
 
+        viewModel.masternodes.observe(viewLifecycleOwner) {
+            binding.submitButton.isEnabled = it.isNotEmpty()
+        }
         binding.submitButton.setRoundedRippleBackground(
-            if (!args.approve) R.style.PrimaryButtonTheme_Large_Red else R.style.PrimaryButtonTheme_Large_Blue
+            if (args.vote != UsernameVote.APPROVE) R.style.PrimaryButtonTheme_Large_Red else R.style.PrimaryButtonTheme_Large_Blue
         )
         binding.submitButton.setOnClickListener {
-            if (args.approve) {
-                viewModel.vote(args.requestId)
-            } else {
-                viewModel.block(args.requestId)
-            }
+            viewModel.submitVote(args.requestId, args.vote)
             findNavController().popBackStack(R.id.usernameRequestsFragment, false)
         }
 
         binding.addKeyButton.setOnClickListener {
-            safeNavigate(AddVotingKeysFragmentDirections.addKeysToVotingKeyInput(args.requestId, args.approve))
+            safeNavigate(AddVotingKeysFragmentDirections.addKeysToVotingKeyInput(args.requestId, args.vote))
         }
 
-        val adapter = IPAddressAdapter()
+        val adapter = IPAddressAdapter() { masternodeIP ->
+            log.info("removing masternode: {}", masternodeIP)
+            viewModel.removeMasternode(masternodeIP)
+        }
         binding.ipAddresses.adapter = adapter
 
         viewModel.masternodes.observe(viewLifecycleOwner) {
-            adapter.submitList(it.map { masternode->
-                masternode.address
-            })
+            log.info("updating masternode list: {}", it.map { mn -> mn.address })
+            adapter.submitList(
+                it.map { masternode ->
+                    masternode.address
+                }
+            )
             binding.votesCastText.text = getString(R.string.multiple_votes_cast, it.size)
         }
+
+        binding.dontAskAgainButton.setOnClickListener {
+            lifecycleScope.launch(Dispatchers.IO) {
+                viewModel.setDontAskAgain()
+            }
+            binding.dontAskAgainButton.isVisible = false
+        }
+        lifecycleScope.launch {
+            val isFirstTime = withContext(Dispatchers.IO) { viewModel.isFirstTimeVoting() }
+            binding.dontAskAgainButton.isVisible = !isFirstTime
+            viewModel.setSecondTimeVoting()
+        }
     }
 }
diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestDetailsFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestDetailsFragment.kt
index 57497755aa..c075292cf2 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestDetailsFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestDetailsFragment.kt
@@ -54,13 +54,13 @@ class UsernameRequestDetailsFragment : Fragment(R.layout.fragment_username_reque
                 if (request.isApproved) R.string.cancel_approval else R.string.vote_to_approve
             )
 
-            viewModel.observeVotesCount(request.username).observe(viewLifecycleOwner) { myVoteCount ->
+            viewModel.observeVotesCount(request.normalizedLabel).observe(viewLifecycleOwner) { myVoteCount ->
                 binding.voteButton.isEnabled = (myVoteCount < UsernameVote.MAX_VOTES)
             }
 
             binding.voteButton.setOnClickListener {
                 lifecycleScope.launch {
-                    val usernameVotes = viewModel.getVotes(request.username)
+                    val usernameVotes = viewModel.getVotes(request.normalizedLabel)
                     when {
                         (usernameVotes.size == UsernameVote.MAX_VOTES - 1) -> {
                             AdaptiveDialog.create(
@@ -71,7 +71,7 @@ class UsernameRequestDetailsFragment : Fragment(R.layout.fragment_username_reque
                                 getString(R.string.button_ok)
                             ).show(requireActivity()) {
                                 if (it == true) {
-                                    doVote(request)
+                                    lifecycleScope.launch { doVote(request) }
                                 }
                             }
                         }
@@ -81,13 +81,13 @@ class UsernameRequestDetailsFragment : Fragment(R.layout.fragment_username_reque
                             AdaptiveDialog.create(
                                 icon = null,
                                 getString(R.string.username_vote_none_left),
-                                getString(R.string.username_vote_none_left_message),
+                                getString(R.string.username_vote_none_left_message, UsernameVote.MAX_VOTES),
                                 getString(R.string.button_ok)
                             ).showAsync(requireActivity())
                         }
 
                         else -> {
-                            doVote(request)
+                            lifecycleScope.launch { doVote(request) }
                         }
                     }
                 }
@@ -97,26 +97,31 @@ class UsernameRequestDetailsFragment : Fragment(R.layout.fragment_username_reque
         viewModel.selectUsernameRequest(args.requestId)
     }
 
-    private fun doVote(request: UsernameRequest) {
-        if (request.isApproved) {
-            viewModel.revokeVote(args.requestId)
-            findNavController().popBackStack(R.id.usernameRequestsFragment, false)
-        } else {
+    private suspend fun doVote(request: UsernameRequest) {
+        val lastVote = viewModel.getVotes(request.normalizedLabel).lastOrNull()
+        val voteType = when {
+            lastVote == null -> UsernameVote.APPROVE
+            lastVote.type == UsernameVote.APPROVE && lastVote.identity == request.identity -> UsernameVote.ABSTAIN
+            else -> UsernameVote.APPROVE
+        }
+        if (viewModel.shouldMaybeAskForMoreKeys()) {
             if (viewModel.keysAmount > 0) {
                 safeNavigate(
                     UsernameRequestDetailsFragmentDirections.detailsToAddKeys(
                         args.requestId,
-                        true
+                        voteType
                     )
                 )
             } else {
                 safeNavigate(
                     UsernameRequestDetailsFragmentDirections.detailsToVotingKeyInput(
                         args.requestId,
-                        true
+                        voteType
                     )
                 )
             }
+        } else {
+            viewModel.submitVote(request.requestId, voteType)
         }
     }
 }
diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
index 2380408f13..e83c173fd8 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
@@ -30,6 +30,8 @@ import dagger.hilt.android.AndroidEntryPoint
 import de.schildbach.wallet.Constants
 import de.schildbach.wallet.database.entity.UsernameRequest
 import de.schildbach.wallet.database.entity.UsernameVote
+import de.schildbach.wallet.livedata.Status
+import de.schildbach.wallet.ui.dashpay.work.BroadcastUsernameVotesWorker
 import de.schildbach.wallet.ui.username.adapters.UsernameRequestGroupAdapter
 import de.schildbach.wallet.ui.username.adapters.UsernameRequestGroupView
 import de.schildbach.wallet.ui.username.utils.votingViewModels
@@ -43,9 +45,17 @@ import org.dash.wallet.common.ui.viewBinding
 import org.dash.wallet.common.util.KeyboardUtil
 import org.dash.wallet.common.util.observe
 import org.dash.wallet.common.util.safeNavigate
+import org.dashj.platform.dpp.voting.AbstainVoteChoice
+import org.dashj.platform.dpp.voting.LockVoteChoice
+import org.dashj.platform.dpp.voting.ResourceVoteChoice
+import org.dashj.platform.dpp.voting.TowardsIdentity
+import org.slf4j.LoggerFactory
 
 @AndroidEntryPoint
 class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
+    companion object {
+        private val log = LoggerFactory.getLogger(UsernameRequestsFragment::class.java)
+    }
     private val viewModel by votingViewModels<UsernameRequestsViewModel>()
     private val binding by viewBinding(FragmentUsernameRequestsBinding::bind)
     private var itemList = listOf<UsernameRequestGroupView>()
@@ -64,46 +74,46 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
         binding.filterBtn.setOnClickListener {
             safeNavigate(UsernameRequestsFragmentDirections.requestsToFilters())
         }
-        val adapter = UsernameRequestGroupAdapter { request ->
-            lifecycleScope.launch {
-                if (request.requestId != "") {
-                    viewModel.logEvent(AnalyticsConstants.UsernameVoting.DETAILS)
-                    safeNavigate(UsernameRequestsFragmentDirections.requestsToDetails(request.requestId))
-                } else {
-                    val usernameVotes = viewModel.getVotes(request.username)
-                    when {
-                        (usernameVotes.size == UsernameVote.MAX_VOTES - 1) -> {
-                            if (AdaptiveDialog.create(
-                                    icon = null,
-                                    getString(R.string.username_vote_one_left),
-                                    getString(R.string.username_vote_one_left_message, UsernameVote.MAX_VOTES - 1),
-                                    getString(R.string.cancel),
-                                    getString(R.string.button_ok)
-                                ).showAsync(requireActivity()) == true
-                            ) {
-                                doBlockVote(request)
-                            }
-                        }
-
-                        // NOT IN THE DESIGN
-                        usernameVotes.size == UsernameVote.MAX_VOTES -> {
-                            AdaptiveDialog.create(
-                                icon = null,
-                                "No votes left",
-                                "You cannot submit anymore votes on this username",
-                                getString(R.string.button_ok)
-                            ).show(requireActivity()) {
-                                // do nothing
-                            }
-                        }
-
-                        else -> {
-                            doBlockVote(request)
-                        }
+        val adapter = UsernameRequestGroupAdapter(
+            { request -> //performVote(request)
+                lifecycleScope.launch {
+                    if (request.requestId != "") {
+                        viewModel.logEvent(AnalyticsConstants.UsernameVoting.DETAILS)
+                        safeNavigate(UsernameRequestsFragmentDirections.requestsToDetails(request.requestId))
+                    } else {
+                        performVote(request)
+//                        when {
+//                            (usernameVotes.size == UsernameVote.MAX_VOTES - 1) -> {
+//                                if (AdaptiveDialog.create(
+//                                        icon = null,
+//                                        getString(R.string.username_vote_one_left),
+//                                        getString(R.string.username_vote_one_left_message, UsernameVote.MAX_VOTES - 1),
+//                                        getString(R.string.cancel),
+//                                        getString(R.string.button_ok)
+//                                    ).showAsync(requireActivity()) == true
+//                                ) {
+//                                    doBlockVote(request)
+//                                }
+//                            }
+//                            usernameVotes.size == UsernameVote.MAX_VOTES -> {
+//                                AdaptiveDialog.create(
+//                                    icon = null,
+//                                    "No votes left",
+//                                    "You cannot submit anymore votes on this username",
+//                                    getString(R.string.button_ok)
+//                                ).show(requireActivity()) {
+//                                    // do nothing
+//                                }
+//                            }
+//                            else -> {
+//                                doBlockVote(request)
+//                            }
+//                        }
                     }
                 }
-            }
-        }
+            },
+            { request -> performVote(request) }
+        )
         binding.requestGroups.adapter = adapter
 
         binding.search.setOnFocusChangeListener { _, isFocused ->
@@ -139,21 +149,22 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
             binding.appliedFiltersPanel.isVisible = !viewModel.filterState.value.isDefault() && !isShown
         }
 
-        viewModel.uiState.observe(viewLifecycleOwner) { state ->
+        viewModel.                                                                                                              uiState.observe(viewLifecycleOwner) { state ->
             if (state.showFirstTimeInfo) {
                 showFirstTimeInfo()
             }
 
             setState(state.filteredUsernameRequests)
             setList(adapter, state.filteredUsernameRequests)
+            //setVotes(state.votes)
 
-            if (state.voteSubmitted) {
-                showVoteIndicator(binding, false)
-            }
-
-            if (state.voteCancelled) {
-                showVoteIndicator(binding, true)
-            }
+//            if (state.voteSubmitted) {
+//                showVoteIndicator(binding, false)
+//            }
+//
+//            if (state.voteCancelled) {
+//                showVoteIndicator(binding, true)
+//            }
         }
 
         viewModel.filterState.observe(viewLifecycleOwner) { state ->
@@ -166,19 +177,139 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
                 populateAppliedFilters(state)
             }
         }
+
+        viewModel.voteSubmissionLiveData.observe(viewLifecycleOwner) { voteData ->
+            log.info("vote data: {}", voteData)
+            voteData.forEach { (t, u) ->
+                try {
+                    val usernames =
+                        u.data?.outputData?.getStringArray(BroadcastUsernameVotesWorker.KEY_USERNAMES)?.toList()
+                    val votes =
+                        u.data?.outputData?.getStringArray(BroadcastUsernameVotesWorker.KEY_VOTE_CHOICES)?.toList()
+                    when (u.status) {
+                        Status.LOADING -> {
+                            log.info("  loading: {} {}", t, u.data?.outputData)
+                            //showVoteIndicator(binding, votes, usernames, u.status)
+                        }
+
+                        Status.SUCCESS -> {
+                            log.info("  success: {} {}", t, u.data?.outputData)
+                            showVoteIndicator(binding, votes!!, usernames!!, u.status)
+                        }
+
+                        Status.ERROR -> {
+                            log.info("  error: {} {}", t, u.data?.outputData)
+                            showVoteIndicator(binding, votes!!, usernames!!, u.status)
+                        }
+
+                        Status.CANCELED -> {
+                            log.info("  error: {} {}", t, u.data?.outputData)
+                        }
+                    }
+                } catch (e: Exception) {
+                    log.error("error processing vote information", e)
+                }
+            }
+        }
     }
 
-    private fun doBlockVote(it: UsernameRequest) {
+    private fun performVote(request: UsernameRequest) {
+        lifecycleScope.launch {
+            // handle voting
+            val blockVote = request.requestId == ""
+            val usernameVotes = viewModel.getVotes(request.username)
+            when {
+                (usernameVotes.size == UsernameVote.MAX_VOTES - 1) -> {
+                    if (AdaptiveDialog.create(
+                            icon = null,
+                            getString(R.string.username_vote_one_left),
+                            getString(R.string.username_vote_one_left_message, UsernameVote.MAX_VOTES - 1),
+                            getString(R.string.cancel),
+                            getString(R.string.button_ok)
+                        ).showAsync(requireActivity()) == true
+                    ) {
+                        if (blockVote) {
+                            doBlockVote(request)
+                        } else {
+                            doVote(request)
+                        }
+                    }
+                }
+
+                usernameVotes.size == UsernameVote.MAX_VOTES -> {
+                    AdaptiveDialog.create(
+                        icon = null,
+                        getString(R.string.username_vote_none_left),
+                        getString(R.string.username_vote_none_left_message, UsernameVote.MAX_VOTES),
+                        getString(R.string.button_ok)
+                    ).show(requireActivity()) {
+                        // do nothing
+                    }
+                }
+
+                else -> {
+                    if (blockVote) {
+                        doBlockVote(request)
+                    } else {
+                        doVote(request)
+                    }
+                }
+            }
+        }
+    }
+
+    private suspend fun doBlockVote(request: UsernameRequest) {
         // perform block vote
-        if (viewModel.keysAmount > 0) {
-            safeNavigate(
-                UsernameRequestsFragmentDirections.requestsToAddVotingKeysFragment(
-                    it.normalizedLabel,
-                    false
+        val vote = when (viewModel.getVotes(request.normalizedLabel).lastOrNull()?.type) {
+            UsernameVote.LOCK -> UsernameVote.ABSTAIN
+            else -> UsernameVote.LOCK
+        }
+        if (viewModel.shouldMaybeAskForMoreKeys()) {
+            if (viewModel.keysAmount > 0) {
+                safeNavigate(
+                    UsernameRequestsFragmentDirections.requestsToAddVotingKeysFragment(
+                        request.normalizedLabel,
+                        vote
+                    )
+                )
+            } else {
+                safeNavigate(
+                    UsernameRequestsFragmentDirections.requestsToVotingKeyInputFragment(
+                        request.requestId,
+                        vote
+                    )
+                )
+            }
+        } else {
+            viewModel.submitVote(request.requestId, vote)
+        }
+    }
+
+    private suspend fun doVote(request: UsernameRequest) {
+        val lastVote = viewModel.getVotes(request.normalizedLabel).lastOrNull()
+        val voteType = when {
+            lastVote == null -> UsernameVote.APPROVE
+            lastVote.type == UsernameVote.APPROVE && lastVote.identity == request.identity -> UsernameVote.ABSTAIN
+            else -> UsernameVote.APPROVE
+        }
+        if (viewModel.shouldMaybeAskForMoreKeys()) {
+            if (viewModel.keysAmount > 0) {
+                safeNavigate(
+                    UsernameRequestsFragmentDirections.requestsToAddVotingKeysFragment(
+                        request.requestId,
+                        voteType
+                    )
+                )
+            } else {
+                safeNavigate(
+                    UsernameRequestsFragmentDirections.requestsToVotingKeyInputFragment(
+                        request.requestId,
+                        voteType
+                    )
                 )
-            )
+            }
         } else {
-            safeNavigate(UsernameRequestsFragmentDirections.requestsToVotingKeyInputFragment(it.requestId, false))
+            viewModel.submitVote(request.requestId, voteType)
         }
     }
     private fun showFirstTimeInfo() {
@@ -215,6 +346,10 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
         binding.requestGroups.scrollToPosition(scrollPosition)
     }
 
+//    private fun setVotes(adapter: UsernameRequestGroupAdapter, votes: List<UsernameVote>) {
+//        adapter.updateVotes(votes)
+//    }
+
     private fun filterByQuery(items: List<UsernameRequestGroupView>, query: String?): List<UsernameRequestGroupView> {
         if (query.isNullOrEmpty()) {
             return items
@@ -242,8 +377,46 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
         binding.filteredByTxt.text = appliedFilterNames.joinToString(", ")
     }
 
-    private fun showVoteIndicator(binding: FragmentUsernameRequestsBinding, isCancelled: Boolean) {
-        binding.voteSubmittedTxt.text = getString(if (isCancelled) R.string.vote_cancelled else R.string.vote_submitted)
+    private fun showVoteIndicator(
+        binding: FragmentUsernameRequestsBinding,
+        votes: List<String>,
+        usernames: List<String>,
+        status: Status
+    ) {
+        if (votes.isEmpty()) {
+            return
+        }
+        val resourceVoteChoice = ResourceVoteChoice.from(votes.first())
+        val isCancelled = resourceVoteChoice == AbstainVoteChoice()
+        val username = if (usernames.size > 1) getString(R.string.quick_vote) else usernames.first()
+        viewModel.updateBroadcastVotesTimestamp()
+        viewModel.updateUsernameRequestsWithVotes()
+        if (viewModel.currentVote?.any { usernames.contains(it.username) } == true) {
+            log.info("vote, there is not match for {}", usernames)
+            //return
+        }
+        val toastText = when (status) {
+            Status.SUCCESS -> when (resourceVoteChoice) {
+                is AbstainVoteChoice -> getString(R.string.cancel_submitted, username)
+                is LockVoteChoice -> getString(R.string.block_submitted, username)
+                is TowardsIdentity -> getString(R.string.vote_submitted, username)
+                else -> error("invalid vote choice: $resourceVoteChoice")
+            }
+            Status.LOADING -> when (resourceVoteChoice) {
+                is AbstainVoteChoice -> getString(R.string.cancel_submitting, username)
+                is LockVoteChoice -> getString(R.string.block_submitting, username)
+                is TowardsIdentity -> getString(R.string.vote_submitting, username)
+                else -> error("invalid vote choice: $resourceVoteChoice")
+            }
+            Status.ERROR -> when (resourceVoteChoice) {
+                is AbstainVoteChoice -> getString(R.string.cancel_submitted_error, username)
+                is LockVoteChoice -> getString(R.string.block_submitted_error, username)
+                is TowardsIdentity -> getString(R.string.vote_submitted_error, username)
+                else -> error("invalid vote choice: $resourceVoteChoice")
+            }
+            Status.CANCELED -> return
+        }
+        binding.voteSubmittedTxt.text = toastText
         binding.voteSubmittedIcon.isVisible = !isCancelled
         binding.voteSubmittedIndicator.alpha = 0f
         binding.voteSubmittedIndicator.isVisible = true
diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
index fc6f57d56f..17e7572c75 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
@@ -49,11 +49,13 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import org.bitcoinj.core.Address
 import org.bitcoinj.core.AddressFormatException
 import org.bitcoinj.core.Base58
 import org.bitcoinj.core.DumpedPrivateKey
 import org.bitcoinj.core.ECKey
 import org.bitcoinj.core.KeyId
+import org.bitcoinj.core.Utils
 import org.bitcoinj.evolution.SimplifiedMasternodeListManager
 import org.bitcoinj.wallet.AuthenticationKeyChain
 import org.bitcoinj.wallet.authentication.AuthenticationKeyStatus
@@ -64,13 +66,27 @@ import org.dash.wallet.common.services.analytics.AnalyticsService
 import org.dashj.platform.dpp.identifier.Identifier
 import org.dashj.platform.dpp.voting.ResourceVoteChoice
 import org.dashj.platform.sdk.platform.Names
+import java.net.InetSocketAddress
 import java.util.UUID
 import javax.inject.Inject
 import kotlin.math.min
 import kotlin.random.Random
 
+enum class InvalidKeyType {
+    WRONG_NETWORK,
+    ADDRESS,
+    PUBLIC_KEY_HEX,
+    PRIVATE_KEY_HEX,
+    NOT_INVALID,
+    CHARACTER,
+    SHORT,
+    CHECKSUM,
+    UNKNOWN
+}
+
 data class UsernameRequestsUIState(
     val filteredUsernameRequests: List<UsernameRequestGroupView> = listOf(),
+    val usernameVotes: Map<String, List<UsernameVote>> = mapOf(),
     val showFirstTimeInfo: Boolean = false,
     val voteSubmitted: Boolean = false,
     val voteCancelled: Boolean = false
@@ -102,6 +118,7 @@ class UsernameRequestsViewModel @Inject constructor(
     private val walletApplication: WalletApplication,
     private val analytics: AnalyticsService
 ): ViewModel() {
+    var currentVote: ArrayList<UsernameVote>? = null
     private val workerJob = SupervisorJob()
     private val viewModelWorkerScope = CoroutineScope(Dispatchers.IO + workerJob)
 
@@ -135,11 +152,14 @@ class UsernameRequestsViewModel @Inject constructor(
     val keysAmount: Int
         get() = masternodes.value.size
 
+    val voteSubmissionLiveData = BroadcastUsernameVotesOperation.allOperationsStatus(walletApplication)
+
     init {
         dashPayConfig.observe(DashPayConfig.VOTING_INFO_SHOWN)
             .onEach { isShown -> _uiState.update { it.copy(showFirstTimeInfo = isShown != true) } }
             .launchIn(viewModelScope)
 
+
         _filterState.flatMapLatest {
             observeUsernames()
                 .map { duplicates ->
@@ -182,7 +202,6 @@ class UsernameRequestsViewModel @Inject constructor(
             if ((it.type == AuthenticationKeyChain.KeyChainType.MASTERNODE_VOTING ||
                 it.type == AuthenticationKeyChain.KeyChainType.MASTERNODE_OWNER) &&
                 it.status == AuthenticationKeyStatus.CURRENT) {
-
                 val entries = masternodeListManager.listAtChainTip.getMasternodesByVotingKey(KeyId.fromBytes(it.key.pubKeyHash))
                 entries.forEach { masternode ->
                     importedMasternodeKeyDao.insert(
@@ -205,11 +224,11 @@ class UsernameRequestsViewModel @Inject constructor(
     }
 
     suspend fun getVotes(username: String): List<UsernameVote> {
-        return usernameVoteDao.getVotes(username)
+        return usernameVoteDao.getVotes(Names.normalizeString(username))
     }
 
     fun observeVotesCount(username: String): Flow<Int> {
-        return usernameVoteDao.observeVotes(username).flatMapLatest { flowOf(it.size) }
+        return usernameVoteDao.observeVotes(Names.normalizeString(username)).flatMapLatest { flowOf(it.size) }
     }
 
     fun applyFilters(
@@ -237,7 +256,7 @@ class UsernameRequestsViewModel @Inject constructor(
             return
         }
         logEvent(AnalyticsConstants.UsernameVoting.VOTE)
-        viewModelScope.launch {
+        viewModelScope.launch(Dispatchers.IO) {
             usernameRequestDao.getRequest(requestId)?.let { request ->
                 BroadcastUsernameVotesOperation(walletApplication).create(
                     listOf(request.normalizedLabel),
@@ -247,14 +266,21 @@ class UsernameRequestsViewModel @Inject constructor(
 
                 usernameRequestDao.removeApproval(request.username)
                 usernameRequestDao.update(request.copy(votes = request.votes + keysAmount, isApproved = true))
-                _uiState.update { it.copy(voteSubmitted = true) }
-                usernameVoteDao.insert(
+//                usernameVoteDao.insert(
+//                    UsernameVote(
+//                        request.normalizedLabel,
+//                        request.identity,
+//                        UsernameVote.APPROVE
+//                    )
+//                )
+                currentVote = arrayListOf(
                     UsernameVote(
-                        request.username,
+                        request.normalizedLabel,
                         request.identity,
                         UsernameVote.APPROVE
                     )
                 )
+                _uiState.update { it.copy(voteSubmitted = true) }
             }
         }
     }
@@ -264,7 +290,7 @@ class UsernameRequestsViewModel @Inject constructor(
             return
         }
         logEvent(AnalyticsConstants.UsernameVoting.VOTE_CANCEL)
-        viewModelScope.launch {
+        viewModelScope.launch(Dispatchers.IO) {
             usernameRequestDao.getRequest(requestId)?.let { request ->
                 BroadcastUsernameVotesOperation(walletApplication).create(
                     listOf(request.normalizedLabel),
@@ -272,14 +298,21 @@ class UsernameRequestsViewModel @Inject constructor(
                     masternodes.value.map { it.votingPrivateKey }
                 ).enqueue()
                 usernameRequestDao.update(request.copy(votes = request.votes - keysAmount, isApproved = false))
-                _uiState.update { it.copy(voteCancelled = true) }
-                usernameVoteDao.insert(
+//                usernameVoteDao.insert(
+//                    UsernameVote(
+//                        request.normalizedLabel,
+//                        request.identity,
+//                        UsernameVote.ABSTAIN
+//                    )
+//                )
+                currentVote = arrayListOf(
                     UsernameVote(
-                        request.username,
-                        request.identity,
+                        request.normalizedLabel,
+                        "",
                         UsernameVote.ABSTAIN
                     )
                 )
+                _uiState.update { it.copy(voteCancelled = true) }
             }
         }
     }
@@ -289,7 +322,7 @@ class UsernameRequestsViewModel @Inject constructor(
             return
         }
 
-        viewModelScope.launch {
+        viewModelScope.launch(Dispatchers.IO) {
             val filteredRequests = _uiState.value.filteredUsernameRequests
             val requestIds = filteredRequests.flatMap {
                 it.requests
@@ -362,6 +395,17 @@ class UsernameRequestsViewModel @Inject constructor(
         }
     }
 
+    /**
+     * returns true if we have all masternodes for this voting key
+     */
+    suspend fun hasKey(key: ECKey): Boolean {
+        val entries = masternodeListManager.listAtChainTip.getMasternodesByVotingKey(KeyId.fromBytes(key.pubKeyHash))
+        val count = entries.count {
+            importedMasternodeKeyDao.contains(it.proTxHash)
+        }
+        return entries.size != count
+    }
+
     private fun observeUsernames(): Flow<List<UsernameRequest>> {
         return if (_filterState.value.onlyDuplicates) {
             usernameRequestDao.observeDuplicates(_filterState.value.onlyLinks)
@@ -507,27 +551,133 @@ class UsernameRequestsViewModel @Inject constructor(
             return
         }
         logEvent(AnalyticsConstants.UsernameVoting.BLOCK)
-        viewModelScope.launch {
-           // usernameRequestDao.getRequest(requestId)?.let { request ->
-                BroadcastUsernameVotesOperation(walletApplication).create(
-                    listOf(username),
-                    listOf(ResourceVoteChoice.lock()),
-                    masternodes.value.map { it.votingPrivateKey }
-                ).enqueue()
-                //usernameRequestDao.update(request.copy(lockVotes = request.lockVotes + keysAmount, isApproved = true))
-                _uiState.update { it.copy(voteSubmitted = true) }
-                usernameVoteDao.insert(
-                    UsernameVote(
-                        username,
-                        "",
-                        UsernameVote.LOCK
-                    )
+        viewModelScope.launch(Dispatchers.IO) {
+            BroadcastUsernameVotesOperation(walletApplication).create(
+                listOf(username),
+                listOf(ResourceVoteChoice.lock()),
+                masternodes.value.map { it.votingPrivateKey }
+            ).enqueue()
+            //usernameRequestDao.update(request.copy(lockVotes = request.lockVotes + keysAmount, isApproved = true))
+
+            // TODO: put after actually submitting a vote
+//            usernameVoteDao.insert(
+//                UsernameVote(
+//                    Names.normalizeString(username),
+//                    "",
+//                    UsernameVote.LOCK
+//                )
+//            )
+            currentVote = arrayListOf(
+                UsernameVote(
+                    Names.normalizeString(username),
+                    "",
+                    UsernameVote.LOCK
                 )
-            }
-        //}
+            )
+            _uiState.update { it.copy(voteSubmitted = true) }
+        }
     }
 
     fun logEvent(event: String) {
         analytics.logEvent(event, mapOf())
     }
+
+    fun submitVote(requestId: String, vote: String) {
+        when (vote) {
+            UsernameVote.APPROVE -> vote(requestId)
+            UsernameVote.LOCK -> block(requestId)
+            UsernameVote.ABSTAIN -> revokeVote(requestId)
+        }
+    }
+
+    fun setDontAskAgain() {
+        viewModelScope.launch(Dispatchers.IO) {
+            dashPayConfig.set(DashPayConfig.KEYS_DONT_ASK_AGAIN, true)
+        }
+    }
+
+    suspend fun shouldMaybeAskForMoreKeys() = !(dashPayConfig.get(DashPayConfig.KEYS_DONT_ASK_AGAIN) ?: false)
+
+    suspend fun setSecondTimeVoting() {
+        dashPayConfig.set(DashPayConfig.FIRST_TIME_VOTING, false)
+    }
+
+    suspend fun isFirstTimeVoting() = dashPayConfig.get(DashPayConfig.FIRST_TIME_VOTING) ?: true
+
+    fun invalidKeyType(wifKey: String): InvalidKeyType {
+        return try {
+            // check if it is a private key hex 64 chars first
+            if (wifKey.length == 64) {
+                try {
+                    Utils.HEX.decode(wifKey)
+                    return InvalidKeyType.PRIVATE_KEY_HEX
+                } catch (_: Exception) {
+                    // swallow
+                }
+            } else if (wifKey.length == 66) {
+                try {
+                    Utils.HEX.decode(wifKey)
+                    return InvalidKeyType.PUBLIC_KEY_HEX
+                } catch (_: Exception) {
+                    // swallow
+                }
+            }
+            DumpedPrivateKey.fromBase58(Constants.NETWORK_PARAMETERS, wifKey).key
+            InvalidKeyType.NOT_INVALID // shouldn't happen
+        } catch (e: AddressFormatException.WrongNetwork) {
+            try {
+                Address.fromBase58(Constants.NETWORK_PARAMETERS, wifKey)
+                InvalidKeyType.ADDRESS
+            } catch (e: AddressFormatException) {
+                InvalidKeyType.WRONG_NETWORK
+            }
+        } catch (e: AddressFormatException.InvalidChecksum) {
+            try {
+                if (Base58.decode(wifKey).size < 39)
+                    InvalidKeyType.SHORT
+                else InvalidKeyType.CHECKSUM
+            } catch (e: AddressFormatException.InvalidCharacter) {
+                InvalidKeyType.CHARACTER
+            }
+        } catch (e: AddressFormatException.InvalidCharacter) {
+            try {
+                if (Base58.decode(wifKey).size < 32)
+                    InvalidKeyType.SHORT
+                else InvalidKeyType.CHECKSUM
+            } catch (e: AddressFormatException.InvalidCharacter) {
+                InvalidKeyType.CHARACTER
+            }
+        } catch (e: Exception) {
+            // is it an address
+            try {
+                val decodedBytes = Utils.HEX.decode(wifKey)
+                if (decodedBytes.size == 33) {
+                    InvalidKeyType.PUBLIC_KEY_HEX
+                }
+                InvalidKeyType.PRIVATE_KEY_HEX
+            } catch (e: Exception) {
+                InvalidKeyType.UNKNOWN
+            }
+        }
+    }
+
+    fun updateBroadcastVotesTimestamp() {
+        BroadcastUsernameVotesOperation.lastTimestamp = System.currentTimeMillis()
+    }
+
+    fun updateUsernameRequestsWithVotes() {
+        viewModelScope.launch(Dispatchers.IO) {
+            platformSyncService.updateUsernameRequestsWithVotes()
+        }
+    }
+
+    fun removeMasternode(masternodeIp: String) {
+        val masternodeList = masternodeListManager.masternodeList
+        val masternode = masternodeList.getMNByAddress(InetSocketAddress(masternodeIp, Constants.NETWORK_PARAMETERS.port))
+        if (masternode != null) {
+            viewModelWorkerScope.launch {
+                importedMasternodeKeyDao.remove(masternode.proTxHash)
+            }
+        }
+    }
 }
diff --git a/wallet/src/de/schildbach/wallet/ui/username/VotingKeyInputFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/VotingKeyInputFragment.kt
index fe983bfa13..92c65e3dbe 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/VotingKeyInputFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/VotingKeyInputFragment.kt
@@ -31,6 +31,7 @@ import de.schildbach.wallet_test.R
 import de.schildbach.wallet_test.databinding.FragmentVotingKeyInputBinding
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import org.bitcoinj.core.NetworkParameters
 import org.dash.wallet.common.ui.viewBinding
 import org.dash.wallet.common.util.KeyboardUtil
 import org.dash.wallet.common.util.onUserInteraction
@@ -68,15 +69,21 @@ class VotingKeyInputFragment : Fragment(R.layout.fragment_voting_key_input) {
                 binding.inputError.isVisible = false
                 if (isValidMasternode) {
                     lifecycleScope.launch {
-                        viewModel.addKey(key)
-                        KeyboardUtil.hideKeyboard(requireContext(), binding.keyInput)
-                        delay(200)
-                        safeNavigate(
-                            VotingKeyInputFragmentDirections.votingKeyInputToAddKeys(
-                                args.requestId,
-                                args.approve
+                        if(viewModel.hasKey(key)) {
+                            viewModel.addKey(key)
+                            KeyboardUtil.hideKeyboard(requireContext(), binding.keyInput)
+                            delay(200)
+                            safeNavigate(
+                                VotingKeyInputFragmentDirections.votingKeyInputToAddKeys(
+                                    args.requestId,
+                                    args.vote
+                                )
                             )
-                        )
+                        } else {
+                            binding.inputError.text = getString(R.string.voting_key_input_already_present)
+                            binding.inputWrapper.isErrorEnabled = true
+                            binding.inputError.isVisible = true
+                        }
                     }
                 } else {
                     binding.inputError.text = getString(R.string.voting_key_input_not_active_error)
@@ -84,7 +91,20 @@ class VotingKeyInputFragment : Fragment(R.layout.fragment_voting_key_input) {
                     binding.inputError.isVisible = true
                 }
             } else {
-                binding.inputError.text = getString(R.string.voting_key_input_error)
+                // determine the type of invalid key
+                val isMainnet = de.schildbach.wallet.Constants.NETWORK_PARAMETERS.id == NetworkParameters.ID_MAINNET
+                val errorMessageId = when (viewModel.invalidKeyType(wifKey)) {
+                    InvalidKeyType.WRONG_NETWORK -> if (isMainnet) R.string.voting_key_input_invalid_private_key_wrong_network_testnet else R.string.voting_key_input_invalid_private_key_wrong_network_mainnet
+                    InvalidKeyType.ADDRESS -> R.string.voting_key_input_invalid_private_key_address
+                    InvalidKeyType.PRIVATE_KEY_HEX -> R.string.voting_key_input_invalid_private_key_private_key_hex
+                    InvalidKeyType.PUBLIC_KEY_HEX -> R.string.voting_key_input_invalid_private_key_public_key_hex
+                    InvalidKeyType.SHORT -> R.string.voting_key_input_invalid_private_key_too_short
+                    InvalidKeyType.CHECKSUM -> R.string.voting_key_input_invalid_private_key_incorrect
+                    InvalidKeyType.CHARACTER -> R.string.voting_key_input_invalid_private_key_invalid_char
+
+                    else -> R.string.voting_key_input_error
+                }
+                binding.inputError.text = getString(errorMessageId, getString(if (isMainnet) R.string.dash_private_key_mainnet else R.string.dash_private_key_testnet))
                 binding.inputWrapper.isErrorEnabled = true
                 binding.inputError.isVisible = true
             }
diff --git a/wallet/src/de/schildbach/wallet/ui/username/adapters/IPAddressAdapter.kt b/wallet/src/de/schildbach/wallet/ui/username/adapters/IPAddressAdapter.kt
index 2d71ae1854..d81daef652 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/adapters/IPAddressAdapter.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/adapters/IPAddressAdapter.kt
@@ -24,7 +24,7 @@ import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import de.schildbach.wallet_test.databinding.ViewMasternodeIpBinding
 
-class IPAddressAdapter : ListAdapter<String, IPAddressViewHolder>(DiffCallback()) {
+class IPAddressAdapter(private val deleteClickListener: (String) -> Unit) : ListAdapter<String, IPAddressViewHolder>(DiffCallback()) {
     class DiffCallback : DiffUtil.ItemCallback<String>() {
         override fun areItemsTheSame(oldItem: String, newItem: String): Boolean {
             return oldItem == newItem
@@ -42,7 +42,7 @@ class IPAddressAdapter : ListAdapter<String, IPAddressViewHolder>(DiffCallback()
             false
         )
 
-        return IPAddressViewHolder(binding)
+        return IPAddressViewHolder(binding, deleteClickListener)
     }
 
     override fun onBindViewHolder(holder: IPAddressViewHolder, position: Int) {
@@ -51,8 +51,11 @@ class IPAddressAdapter : ListAdapter<String, IPAddressViewHolder>(DiffCallback()
     }
 }
 
-class IPAddressViewHolder(val binding: ViewMasternodeIpBinding): RecyclerView.ViewHolder(binding.root) {
+class IPAddressViewHolder(val binding: ViewMasternodeIpBinding, private val deleteClickListener: (String) -> Unit): RecyclerView.ViewHolder(binding.root) {
     fun bind(ipAddress: String) {
         binding.ipAddress.text = ipAddress
+        binding.removeMasternode.setOnClickListener {
+            deleteClickListener.invoke(ipAddress)
+        }
     }
 }
diff --git a/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupAdapter.kt b/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupAdapter.kt
index 9ece706562..6499538e58 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupAdapter.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupAdapter.kt
@@ -16,9 +16,15 @@
  */
 package de.schildbach.wallet.ui.username.adapters
 
+import android.content.res.ColorStateList
+import android.graphics.PorterDuff
+import android.graphics.drawable.GradientDrawable
+import android.graphics.drawable.RippleDrawable
+import android.graphics.drawable.StateListDrawable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import androidx.core.content.ContextCompat
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
@@ -28,17 +34,42 @@ import androidx.recyclerview.widget.RecyclerView
 import de.schildbach.wallet.database.entity.UsernameRequest
 import de.schildbach.wallet.database.entity.UsernameVote
 import de.schildbach.wallet_test.R
-import de.schildbach.wallet_test.databinding.BlockUsernameRequestViewBinding
 import de.schildbach.wallet_test.databinding.UsernameRequestGroupViewBinding
 import de.schildbach.wallet_test.databinding.UsernameRequestViewBinding
 import org.dash.wallet.common.ui.decorators.ListDividerDecorator
-import org.dash.wallet.common.ui.setRoundedBackground
-import java.time.LocalDateTime
-import java.time.ZoneOffset
-import java.time.format.DateTimeFormatter
+import org.dash.wallet.common.ui.applyStyle
+import org.dash.wallet.common.ui.setRoundedRippleBackground
+import org.dash.wallet.common.ui.setRoundedRippleBackgroundButtonStyle
+import org.dashj.platform.sdk.platform.Names
+import java.text.SimpleDateFormat
+
+import java.util.Date
+import java.util.Locale
+
+fun Button.setVoteThemeColors(
+    backgroundColor: Int,
+    textColor: Int
+) {
+    try {
+        val backgroundColor = context.getColor(backgroundColor)
+        val rippleDrawable = background as RippleDrawable
+        val backgroundDrawable = rippleDrawable.getDrawable(1).current as? GradientDrawable
+
+        // Set background color directly on the background drawable
+        backgroundDrawable?.setColor(backgroundColor)
+
+        // Set text color
+        setTextColor(context.getColor(textColor))
+    } catch (e: Exception) {
+        // Fallback
+        background.setColorFilter(backgroundColor, PorterDuff.Mode.SRC_IN)
+        setTextColor(textColor)
+    }
+}
 
 class UsernameRequestGroupAdapter(
-    private val usernameClickListener: (UsernameRequest) -> Unit
+    private val usernameDetailsClickListener: (UsernameRequest) -> Unit,
+    private val voteClickListener: (UsernameRequest) -> Unit
 ): ListAdapter<UsernameRequestGroupView, UsernameRequestGroupViewHolder>(
     DiffCallback()
 ) {
@@ -64,11 +95,17 @@ class UsernameRequestGroupAdapter(
 
     override fun onBindViewHolder(holder: UsernameRequestGroupViewHolder, position: Int) {
         val item = currentList[position]
-        holder.bind(item, usernameClickListener)
+        val hasMoreThanOneRequest = item.requests.size > 1
+        holder.bind(item, usernameDetailsClickListener, voteClickListener)
         holder.binding.root.setOnClickListener {
-            val index = currentList.indexOfFirst { it.username == item.username }
-            currentList[index].isExpanded = !currentList[index].isExpanded
-            notifyItemChanged(index)
+            // expand if there is more than 1 request, otherwise show details
+            if (hasMoreThanOneRequest) {
+                val index = currentList.indexOfFirst { it.username == item.username }
+                currentList[index].isExpanded = !currentList[index].isExpanded
+                notifyItemChanged(index)
+            } else {
+                usernameDetailsClickListener.invoke(item.requests.first())
+            }
         }
     }
 }
@@ -76,55 +113,91 @@ class UsernameRequestGroupAdapter(
 class UsernameRequestGroupViewHolder(
     val binding: UsernameRequestGroupViewBinding
 ): RecyclerView.ViewHolder(binding.root) {
-    fun bind(option: UsernameRequestGroupView, usernameClickListener: (UsernameRequest) -> Unit) {
+    fun bind(option: UsernameRequestGroupView, usernameClickListener: (UsernameRequest) -> Unit, voteClickListener: (UsernameRequest) -> Unit) {
+        val hasMoreThanOneRequest = option.requests.size > 1
         binding.username.text = option.username
+        binding.requestsAmount.isVisible = hasMoreThanOneRequest
         binding.requestsAmount.text = binding.root.resources.getString(R.string.n_requests, option.requests.size)
         binding.requestsList.isVisible = option.isExpanded
+        binding.chevron.isVisible = hasMoreThanOneRequest
         binding.chevron.rotation = if (option.isExpanded) 90f else 270f
+        binding.linkBadge.isVisible = !hasMoreThanOneRequest
+        binding.linkIncluded.isVisible = !hasMoreThanOneRequest
 
-        binding.blockVotes.text = binding.root.context.getString(R.string.block_vote_count, option.lockVotes())
-        binding.blockVotes.isVisible = option.lockVotes() != 0
+        //binding.blockVotes.text = binding.root.context.getString(R.string.block_vote_count, option.lockVotes())
+        //binding.blockVotes.isVisible = option.lockVotes() != 0
+        val context = binding.root.context
+        binding.blocksButton.text = context.getString(R.string.two_lines_number_text, option.lockVotes(), context.resources.getQuantityString(R.plurals.block_vote_button, option.lockVotes()))
+        binding.blocksButton.setOnClickListener {
+            usernameClickListener.invoke(UsernameRequest.block(option.username, Names.normalizeString(option.username)))
+        }
+        binding.approvalsButton.isVisible = !hasMoreThanOneRequest
+        binding.approvalsButton.text = context.getString(R.string.two_lines_number_text, option.requests.maxOf { it.votes }, context.resources.getQuantityString(R.plurals.approval_button, option.requests.maxOf { it.votes }))
+        binding.approvalsButton.setOnClickListener {
+            // vote for the first request, which is the only request
+            voteClickListener.invoke(option.requests.first())
+        }
 
+        // change the button colors based on our vote(s)
+        val lastVote = option.votes.lastOrNull()
+        when (lastVote?.type?.lowercase()) {
+            UsernameVote.APPROVE -> {
+                binding.blocksButton.text = context.getString(R.string.two_lines_number_text, option.lockVotes(), context.resources.getQuantityString(R.plurals.block_vote_button, option.lockVotes()))
 
-        if (option.isExpanded) {
-            val adapter = UsernameRequestAdapter(option.votes) {
-                usernameClickListener.invoke(it)
+                //binding.approvalsButton.applyStyle(R.style.VoteButton_Blue)
+                //binding.blocksButton.applyStyle(R.style.VoteButton_LightRed)
+
+                binding.blocksButton.setVoteThemeColors(R.color.red_0_05, R.color.red)
+                binding.approvalsButton.setVoteThemeColors(R.color.dash_blue, R.color.dash_white)
+                //binding.blocksButton.setRoundedRippleBackground(R.style.VoteButton_LightRed)
+                //binding.blocksButton.setRoundedRippleBackground(R.style.VoteButton_Blue)
             }
-            binding.requestsList.adapter = adapter
-            val divider = ContextCompat.getDrawable(binding.root.context, R.drawable.list_divider)!!
-            val decorator = ListDividerDecorator(
-                divider,
-                showAfterLast = false,
-                marginStart = binding.root.resources.getDimensionPixelOffset(R.dimen.divider_margin_horizontal),
-                marginEnd = 0
-            )
-            binding.requestsList.addItemDecoration(decorator)
-            val listWithBlock = arrayListOf<UsernameRequest>()
-            listWithBlock.addAll(option.requests)
-            val firstItem = listWithBlock.first()
-            listWithBlock.add(
-                UsernameRequest(
-                    "",
-                    firstItem.username,
-                    firstItem.normalizedLabel,
-                    -1L,
-                    "",
-                    null,
-                    0,
-                    firstItem.lockVotes,
-                    false
-                )
+            UsernameVote.LOCK -> {
+                binding.blocksButton.text = context.getString(R.string.two_lines_number_text, option.lockVotes(), context.getString(R.string.unblock_button))
+                //binding.blocksButton.setRoundedRippleBackgroundButtonStyle(R.style.VoteButton_Red)
+                //binding.blocksButton.applyStyle(R.style.VoteButton_Red)
+                //binding.approvalsButton.applyStyle(R.style.VoteButton_LightBlue)
+                binding.blocksButton.setVoteThemeColors(R.color.red, R.color.dash_white)
+                binding.approvalsButton.setVoteThemeColors(R.color.dash_blue_0_05, R.color.dash_blue)
+                //binding.blocksButton.setRoundedRippleBackground(R.style.VoteButton_Red)
+                //binding.blocksButton.setRoundedRippleBackground(R.style.VoteButton_LightBlue)
+            }
+            else -> {
+                binding.blocksButton.text = context.getString(R.string.two_lines_number_text, option.lockVotes(), context.resources.getQuantityString(R.plurals.block_vote_button, option.lockVotes()))
+                //binding.blocksButton.applyStyle(R.style.VoteButton_LightRed)
+                //binding.approvalsButton.applyStyle(R.style.VoteButton_LightBlue)
+                binding.blocksButton.setVoteThemeColors(R.color.red_0_05, R.color.red)
+                binding.approvalsButton.setVoteThemeColors(R.color.dash_blue_0_05, R.color.dash_blue)
+                //binding.blocksButton.setRoundedRippleBackground(R.style.VoteButton_LightRed)
+                //binding.blocksButton.setRoundedRippleBackground(R.style.VoteButton_LightBlue)
+            }
+        }
+
+        if (option.isExpanded) {
+            val adapter = UsernameRequestAdapter(
+                option.votes,
+                { request -> usernameClickListener.invoke(request) },
+                { request -> voteClickListener.invoke(request) }
             )
-            adapter.submitList(listWithBlock)
+            binding.requestsList.adapter = adapter
+//            val divider = ContextCompat.getDrawable(binding.root.context, R.drawable.list_divider)!!
+//            val decorator = ListDividerDecorator(
+//                divider,
+//                showAfterLast = false,
+//                marginStart = binding.root.resources.getDimensionPixelOffset(R.dimen.divider_margin_horizontal),
+//                marginEnd = 0
+//            )
+//            binding.requestsList.addItemDecoration(decorator)
+            adapter.submitList(option.requests)
         }
     }
 }
 
 class UsernameRequestAdapter(
-    private val votes: List<UsernameVote>,
-    private val clickListener: (UsernameRequest) -> Unit
+    private var votes: List<UsernameVote>,
+    private val clickListener: (UsernameRequest) -> Unit,
+    private val voteClickListener: (UsernameRequest) -> Unit
 ) : ListAdapter<UsernameRequest, AbstractUsernameRequestViewHolder>(DiffCallback()) {
-
     class DiffCallback : DiffUtil.ItemCallback<UsernameRequest>() {
         override fun areItemsTheSame(oldItem: UsernameRequest, newItem: UsernameRequest): Boolean {
             return oldItem.requestId == newItem.requestId
@@ -145,12 +218,7 @@ class UsernameRequestAdapter(
 
             return UsernameRequestViewHolder(binding)
         } else {
-            val binding = BlockUsernameRequestViewBinding.inflate(
-                LayoutInflater.from(parent.context),
-                parent,
-                false
-            )
-            return BlockViewHolder(binding)
+            error("invalid viewType: $viewType")
         }
     }
 
@@ -166,72 +234,121 @@ class UsernameRequestAdapter(
         val item = currentList[position]
         holder.bind(item, votes)
 
-        holder.setOnClickListener(item) {
-            clickListener.invoke(item)
-        }
+        holder.setOnClickListener(item, {
+                clickListener.invoke(item)
+            }, {
+                voteClickListener.invoke(item)
+            }
+        )
+    }
+
+    fun updateVotes(votes: List<UsernameVote>) {
+        this.votes = votes
+        currentList
+            .indexOfFirst { it.normalizedLabel == votes.first().username }
+            ?.let {
+                notifyItemChanged(it)
+            }
     }
 }
 abstract class AbstractUsernameRequestViewHolder(root: View): RecyclerView.ViewHolder(root) {
     abstract fun bind(request: UsernameRequest, votes: List<UsernameVote>)
-    abstract fun setOnClickListener(usernameRequest: UsernameRequest, listener: (UsernameRequest) -> Unit)
+    abstract fun setOnClickListener(usernameRequest: UsernameRequest, listener: (UsernameRequest) -> Unit, voteClickListener: (UsernameRequest) -> Unit)
 }
 
 class UsernameRequestViewHolder(
     val binding: UsernameRequestViewBinding
 ): AbstractUsernameRequestViewHolder(binding.root) {
     override fun bind(request: UsernameRequest, votes: List<UsernameVote>) {
-        binding.dateRegistered.text = DateTimeFormatter.ofPattern("dd MMM yyyy · hh:mm a").format(
-            LocalDateTime.ofEpochSecond(request.createdAt / 1000, 0, ZoneOffset.UTC)
-        )
+        val context = binding.root.context
+        val dateFormat = SimpleDateFormat("dd MMM yyyy · hh:mm a", Locale.getDefault())
+        binding.dateRegistered.text = dateFormat.format(Date(request.createdAt))
+//            DateTimeFormatter.ofPattern("dd MMM yyyy · hh:mm a").format(
+//            LocalDateTime.ofEpochSecond(request.createdAt / 1000, 0, ZoneOffset.UTC)
+//        )
 
-        binding.voteAmount.setRoundedBackground(
-            if (request.isApproved) {
-                R.style.BlueBadgeTheme
-            } else {
-                R.style.InactiveBadgeTheme
+        binding.approvalsButton.text = context.getString(R.string.two_lines_number_text, request.votes, context.resources.getQuantityString(R.plurals.approval_button, request.votes))
+//        binding.approvalsButton.setOnClickListener {
+//            // vote for the first request, which is the only request
+//            usernameClickListener.invoke(option.requests.first())
+//        }
+//        votes.lastOrNull()?.let { vote ->
+//            when (vote.type) {
+//                UsernameVote.LOCK, UsernameVote.ABSTAIN -> {
+//                    binding.approvalsButton.applyStyle(R.style.VoteButton_LightBlue)
+//                }
+//                UsernameVote.APPROVE -> {
+//                    binding.approvalsButton.applyStyle(R.style.VoteButton_Blue)
+//                }
+//            }
+//        } ?: {
+//            binding.approvalsButton.applyStyle(R.style.VoteButton_LightBlue)
+//        }
+        val lastVote = votes.lastOrNull()
+        when (lastVote?.type) {
+            UsernameVote.APPROVE -> {
+                if (lastVote.identity == request.identity) {
+                    binding.approvalsButton.setVoteThemeColors(R.color.dash_blue, R.color.dash_white)
+                } else {
+                    binding.approvalsButton.setVoteThemeColors(R.color.dash_blue_0_05, R.color.dash_blue)
+                }
             }
-        )
+            UsernameVote.LOCK, UsernameVote.ABSTAIN -> {
+                binding.approvalsButton.setVoteThemeColors(R.color.dash_blue_0_05, R.color.dash_blue)
+            }
+            else -> {
+                binding.approvalsButton.setVoteThemeColors(R.color.dash_blue_0_05, R.color.dash_blue)
+            }
+        }
 
-        binding.voteAmount.setTextColor(
-            binding.voteAmount.resources.getColor(
-                if (request.isApproved) {
-                    R.color.white
-                } else {
-                    R.color.content_tertiary
-                },
-                null
-            )
-        )
+//        binding.voteAmount.setRoundedBackground(
+//            if (request.isApproved) {
+//                R.style.BlueBadgeTheme
+//            } else {
+//                R.style.InactiveBadgeTheme
+//            }
+//        )
+//
+//        binding.voteAmount.setTextColor(
+//            binding.voteAmount.resources.getColor(
+//                if (request.isApproved) {
+//                    R.color.white
+//                } else {
+//                    R.color.content_tertiary
+//                },
+//                null
+//            )
+//        )
 
-        binding.voteAmount.text = request.votes.toString()
+        //binding.voteAmount.text = request.votes.toString()
         binding.linkBadge.isGone = request.link.isNullOrEmpty()
         binding.linkIncluded.isGone = request.link.isNullOrEmpty()
 
-        val lastVote = votes.lastOrNull()
-        binding.cancelApprovalButton.isVisible = lastVote != null && lastVote.identity == request.identity && lastVote.type == UsernameVote.APPROVE
+        //val lastVote = votes.lastOrNull()
+        //binding.cancelApprovalButton.isVisible = lastVote != null && lastVote.identity == request.identity && lastVote.type == UsernameVote.APPROVE
     }
 
-    override fun setOnClickListener(usernameRequest: UsernameRequest, listener: (UsernameRequest) -> Unit) {
+    override fun setOnClickListener(usernameRequest: UsernameRequest, listener: (UsernameRequest) -> Unit, voteClickListener: (UsernameRequest) -> Unit) {
         binding.root.setOnClickListener {
             listener.invoke(usernameRequest)
         }
-        binding.cancelApprovalButton.setOnClickListener {
-            listener.invoke(usernameRequest)
+        binding.approvalsButton.setOnClickListener {
+            voteClickListener.invoke(usernameRequest)
         }
     }
 }
 
-class BlockViewHolder(val binding: BlockUsernameRequestViewBinding)
-    : AbstractUsernameRequestViewHolder(binding.root) {
-
-    override fun bind(request: UsernameRequest, votes: List<UsernameVote>) {
-        val lastVote = votes.lastOrNull()
-        //binding.cancelBlockButton.isVisible = lastVote != null && lastVote.identity == request.identity && lastVote.type == UsernameVote.APPROVE
-    }
-
-    override fun setOnClickListener(usernameRequest: UsernameRequest, listener: (UsernameRequest) -> Unit) {
-        binding.root.setOnClickListener {
-            listener.invoke(usernameRequest)
-        }
-    }
-}
+//class BlockViewHolder(val binding: BlockUsernameRequestViewBinding)
+//    : AbstractUsernameRequestViewHolder(binding.root) {
+//
+//    override fun bind(request: UsernameRequest, votes: List<UsernameVote>) {
+//        val lastVote = votes.lastOrNull()
+//        //binding.cancelBlockButton.isVisible = lastVote != null && lastVote.identity == request.identity && lastVote.type == UsernameVote.APPROVE
+//    }
+//
+//    override fun setOnClickListener(usernameRequest: UsernameRequest, listener: (UsernameRequest) -> Unit) {
+//        binding.root.setOnClickListener {
+//            listener.invoke(usernameRequest)
+//        }
+//    }
+//}
diff --git a/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUserNameViewModel.kt b/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUserNameViewModel.kt
index 7d908b12a0..38f96aadae 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUserNameViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUserNameViewModel.kt
@@ -35,8 +35,10 @@ import de.schildbach.wallet.service.CoinJoinMode
 import de.schildbach.wallet.ui.dashpay.CreateIdentityService
 import de.schildbach.wallet.ui.dashpay.PlatformRepo
 import de.schildbach.wallet.ui.dashpay.work.BroadcastIdentityVerifyOperation
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -47,6 +49,7 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.bitcoinj.core.Coin
 import org.bitcoinj.wallet.Wallet
 import org.dash.wallet.common.WalletDataProvider
@@ -90,6 +93,8 @@ class RequestUserNameViewModel @Inject constructor(
     companion object {
         private val log = LoggerFactory.getLogger(RequestUserNameViewModel::class.java)
     }
+    private val workerJob = SupervisorJob()
+    private val viewModelWorkerScope = CoroutineScope(Dispatchers.IO + workerJob)
     private val _uiState = MutableStateFlow(RequestUserNameUIState())
     val uiState: StateFlow<RequestUserNameUIState> = _uiState.asStateFlow()
 
@@ -132,7 +137,9 @@ class RequestUserNameViewModel @Inject constructor(
 
     init {
         viewModelScope.launch {
-            _requestedUserNameLink.value = identityConfig.get(BlockchainIdentityConfig.REQUESTED_USERNAME_LINK)
+            _requestedUserNameLink.value = withContext(Dispatchers.IO) {
+                identityConfig.get(BlockchainIdentityConfig.REQUESTED_USERNAME_LINK)
+            }
         }
         identityConfig.observe(IDENTITY_ID)
             .filterNotNull()
@@ -166,7 +173,7 @@ class RequestUserNameViewModel @Inject constructor(
                     }
                 }
             }
-            .launchIn(viewModelScope)
+            .launchIn(viewModelWorkerScope)
 
         coinJoinConfig.observeMode()
             .flatMapLatest { coinJoinMode ->
@@ -197,11 +204,10 @@ class RequestUserNameViewModel @Inject constructor(
         // Reset ui state for retry if needed
         resetUiForRetrySubmit()
         viewModelScope.launch {
-            updateConfig()
+            withContext(Dispatchers.IO) { updateConfig() }
             // send the request / create username, assume not retry
             val reuseTransaction = identity?.let {
-                it.usernameRequested == UsernameRequestStatus.LOCKED ||
-                        it.usernameRequested == UsernameRequestStatus.LOST_VOTE
+                it.usernameRequested == UsernameRequestStatus.LOCKED || it.usernameRequested == UsernameRequestStatus.LOST_VOTE
             } ?: false
             triggerIdentityCreation(reuseTransaction)
         }
@@ -255,31 +261,34 @@ class RequestUserNameViewModel @Inject constructor(
     fun checkUsername(requestedUserName: String?) {
         viewModelScope.launch {
             requestedUserName?.let { username ->
-                val usernameSearchResult = platformRepo.getUsername(username)
+                val usernameSearchResult = withContext(Dispatchers.IO) { platformRepo.getUsername(username) }
                 val usernameExists = when (usernameSearchResult.status) {
                     Status.SUCCESS -> {
                         usernameSearchResult.data != null
                     }
                     else -> false
                 }
-                val contenders = platformRepo.getVoteContenders(username)
-                val usernameContested = false // TODO: make the call
-                var maxApprovalVotes = 0
-                val firstCreatedAt = try {
-                    contenders.map.values.minOf { contender ->
-                        val document =  contender.seralizedDocument?.let {
-                            DomainDocument(platformRepo.platform.names.deserialize(it))
+                var usernameContested: Boolean
+                var firstCreatedAt = -1L
+                val usernameBlocked = withContext(Dispatchers.IO) {
+                    val contenders = platformRepo.getVoteContenders(username)
+                    usernameContested = contenders.map.isNotEmpty()
+                    var maxApprovalVotes = 0
+                    firstCreatedAt = try {
+                        contenders.map.values.minOf { contender ->
+                            val document = contender.seralizedDocument?.let {
+                                DomainDocument(platformRepo.platform.names.deserialize(it))
+                            }
+                            maxApprovalVotes = max(contender.votes, maxApprovalVotes)
+                            document?.createdAt ?: -1
                         }
-                        maxApprovalVotes = max(contender.votes, maxApprovalVotes)
-                        document?.createdAt ?: -1
+                    } catch (e: NoSuchElementException) {
+                        -1L
                     }
-                } catch (e: NoSuchElementException) {
-                    -1L
-                }
-
-                // is the name blocked
-                val usernameBlocked = firstCreatedAt == -1L && contenders.lockVoteTally > maxApprovalVotes
 
+                    // is the name blocked
+                    firstCreatedAt == -1L && contenders.lockVoteTally > maxApprovalVotes
+                }
                 _uiState.update {
                     it.copy(
                         usernameCheckSuccess = true,
@@ -295,31 +304,35 @@ class RequestUserNameViewModel @Inject constructor(
 
     fun verify() {
         viewModelScope.launch {
-            identityConfig.set(BlockchainIdentityConfig.REQUESTED_USERNAME_LINK, _requestedUserNameLink.value ?: "")
-            identityConfig.get(IDENTITY_ID)?.let { identityId ->
-                val usernameRequest = usernameRequestDao.getRequest(
-                    UsernameRequest.getRequestId(
-                        identityId,
-                        requestedUserName!!
+            withContext(Dispatchers.IO) {
+                identityConfig.set(BlockchainIdentityConfig.REQUESTED_USERNAME_LINK, _requestedUserNameLink.value ?: "")
+                identityConfig.get(IDENTITY_ID)?.let { identityId ->
+                    val usernameRequest = usernameRequestDao.getRequest(
+                        UsernameRequest.getRequestId(
+                            identityId,
+                            requestedUserName!!
+                        )
                     )
-                )
-                usernameRequest!!.link = _requestedUserNameLink.value
-                usernameRequestDao.update(usernameRequest)
+                    usernameRequest!!.link = _requestedUserNameLink.value
+                    usernameRequestDao.update(usernameRequest)
+                }
             }
             _uiState.update {
                 it.copy(
                     usernameVerified = true
                 )
             }
-            //submit()
         }
     }
 
+    @Deprecated("requests cannot be canceled")
     fun cancelRequest() {
         viewModelScope.launch {
-            identityConfig.set(BlockchainIdentityConfig.USERNAME, "")
-            identityConfig.set(BlockchainIdentityConfig.REQUESTED_USERNAME_LINK, "")
-            identityConfig.set(BlockchainIdentityConfig.CANCELED_REQUESTED_USERNAME_LINK, true)
+            withContext(Dispatchers.IO) {
+                identityConfig.set(BlockchainIdentityConfig.USERNAME, "")
+                identityConfig.set(BlockchainIdentityConfig.REQUESTED_USERNAME_LINK, "")
+                identityConfig.set(BlockchainIdentityConfig.CANCELED_REQUESTED_USERNAME_LINK, true)
+            }
         }
     }