From 71ceae7bc5458c20897d62be215e27a43452ecc7 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Thu, 5 Dec 2024 07:32:16 -0800
Subject: [PATCH 1/4] feat(dashpay): add quick voting function (#1322)

* feat: update username voting screen

* feat: add keys changes

* feat: add keys errors

* refactor: change vote system to return a tuple

* refactor: change vote queries to use get_vote_polls

* fix: improve Username Voting screen and voting

* feature: add delete masternode key functionality (disabled)

* fix: use withContext(Dispatchers.IO)

* fix: add voting keys fixes

* fix: fix vote click bug

* fix: add vote key again

* fix: prevent counting one vote as many

* chore: log the wrong vote differently

* fix: correct duplicate key detection

* fix: fix request process state

* fix: add tools:text for Results on

* chore: remove commented code

* fix: simplify Username Request vote button styles

* fix: delete vote fix

* feat: add OneVoteLeftDialog

* feat: add blue lightning bolt next to Quick Voting

* feat: add countVotes

* fix: spacing and text on OneVoteLeftDialogFragment

* feat: add new text for Quick Voting

* feat: add isQuickVoting for BroadcastUsernameVotes* classes

* feat: isApproved is based on the last vote

* fix: update voteForAll functiom

* fix: update voteForAll function

* feat: add quick voting support to UsernameRequestsFragment

* feat: improve username search in UsernameRequestsFragment

* feat: improve username search in UsernameRequestsFragment

* fix: keep track of normalized and regular labels

* fix: some bugs resulting from removing mocking
---
 common/src/main/res/values/styles.xml         |  82 -----------
 wallet/res/drawable/ic_blue_bolt.xml          |   9 ++
 wallet/res/layout/dialog_one_vote_left.xml    | 102 +++++++++++++
 wallet/res/layout/fragment_more.xml           |   2 +-
 .../res/layout/fragment_username_requests.xml |  31 ++--
 .../layout/username_request_group_view.xml    |  15 +-
 wallet/res/layout/username_request_view.xml   |  32 +---
 wallet/res/values/strings-dashpay.xml         |   6 +
 .../src/de/schildbach/wallet/Constants.java   |   3 -
 .../wallet/database/dao/UsernameVoteDao.kt    |   3 +
 .../service/platform/PlatformSyncService.kt   |  68 +--------
 .../work/BroadcastUsernameVotesOperation.kt   |  10 +-
 .../work/BroadcastUsernameVotesWorker.kt      |  64 ++++----
 .../schildbach/wallet/ui/more/MoreFragment.kt |   1 +
 .../ui/username/UsernameRequestsFragment.kt   | 113 ++++++++-------
 .../ui/username/UsernameRequestsViewModel.kt  | 125 +++++++++-------
 .../adapters/UsernameRequestGroupAdapter.kt   | 137 +++---------------
 .../voting/OneVoteLeftDialogFragment.kt       |  69 +++++++++
 18 files changed, 413 insertions(+), 459 deletions(-)
 create mode 100644 wallet/res/drawable/ic_blue_bolt.xml
 create mode 100644 wallet/res/layout/dialog_one_vote_left.xml
 create mode 100644 wallet/src/de/schildbach/wallet/ui/username/voting/OneVoteLeftDialogFragment.kt

diff --git a/common/src/main/res/values/styles.xml b/common/src/main/res/values/styles.xml
index 46f5b161d7..b07f4d2661 100644
--- a/common/src/main/res/values/styles.xml
+++ b/common/src/main/res/values/styles.xml
@@ -961,87 +961,6 @@
         <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>
@@ -1064,7 +983,6 @@
         <item name="android:theme">@style/PrimaryButtonTheme.Small.Round</item>
     </style>
 
-
     <style name="Button.Primary.ExtraSmall">
         <item name="android:theme">@style/PrimaryButtonTheme.ExtraSmall</item>
         <item name="android:textSize">11sp</item>
diff --git a/wallet/res/drawable/ic_blue_bolt.xml b/wallet/res/drawable/ic_blue_bolt.xml
new file mode 100644
index 0000000000..2bf168a69e
--- /dev/null
+++ b/wallet/res/drawable/ic_blue_bolt.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="10dp"
+    android:height="16dp"
+    android:viewportWidth="10"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M0.5,8.81C0.5,8.666 0.562,8.52 0.685,8.371L6.753,0.915C6.872,0.771 6.999,0.681 7.135,0.647C7.275,0.613 7.4,0.626 7.51,0.686C7.621,0.745 7.697,0.841 7.74,0.972C7.786,1.1 7.774,1.254 7.701,1.437L5.734,6.696H9.491C9.639,6.696 9.76,6.743 9.854,6.836C9.951,6.926 10,7.04 10,7.18C10,7.329 9.941,7.477 9.822,7.626L3.754,15.076C3.635,15.224 3.505,15.316 3.365,15.349C3.229,15.384 3.106,15.371 2.996,15.311C2.886,15.252 2.807,15.156 2.76,15.025C2.718,14.893 2.731,14.736 2.799,14.554L4.772,9.294H1.009C0.865,9.294 0.744,9.25 0.646,9.16C0.549,9.067 0.5,8.95 0.5,8.81Z"
+      android:fillColor="#008DE4"/>
+</vector>
diff --git a/wallet/res/layout/dialog_one_vote_left.xml b/wallet/res/layout/dialog_one_vote_left.xml
new file mode 100644
index 0000000000..110c1572bb
--- /dev/null
+++ b/wallet/res/layout/dialog_one_vote_left.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+~ Copyright 2023 Dash Core Group.
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ 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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <View
+        android:id="@+id/drag_indicator"
+        android:layout_width="35dp"
+        android:layout_height="4dp"
+        android:layout_gravity="center"
+        android:layout_marginVertical="7dp"
+        android:background="@drawable/rounded_background"
+        android:theme="@style/DragIndicatorBackground"
+        tools:background="@color/light_gray" />
+
+    <TextView
+        style="@style/Headline5"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="17dp"
+        android:gravity="center_horizontal"
+        android:textAlignment="gravity"
+        android:layout_marginHorizontal="20dp"
+        android:text="@string/one_vote_left_title" />
+
+    <TextView
+        android:id="@+id/subtitle"
+        style="@style/Body2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        android:textAlignment="gravity"
+        android:layout_marginHorizontal="20dp"
+        android:text="@string/quick_vote_subtitle" />
+
+    <TextView
+        android:id="@+id/show_usernames"
+        style="@style/Caption.Medium.Blue"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        android:textAlignment="gravity"
+        android:layout_marginHorizontal="20dp"
+        android:text="@string/one_vote_left_show_usernames" />
+
+    <TextView
+        android:id="@+id/username_list"
+        style="@style/Body2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="6dp"
+        android:textAlignment="gravity"
+        android:layout_marginHorizontal="20dp"
+        android:visibility="invisible"
+        tools:visibility="visible"
+        tools:text="@string/one_vote_left_username_examples" />
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginTop="30dp"
+        android:layout_marginBottom="15dp">
+
+        <Button
+            android:id="@+id/dismiss_btn"
+            style="@style/Button.Primary.Large.Grey"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:layout_weight="1"
+            android:text="@string/cancel" />
+
+        <Button
+            android:id="@+id/ok_button"
+            style="@style/Button.Primary.Large.Blue"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="15dp"
+            android:layout_weight="1"
+            android:text="@string/button_ok" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/wallet/res/layout/fragment_more.xml b/wallet/res/layout/fragment_more.xml
index 6bf31a746d..0ee865a244 100644
--- a/wallet/res/layout/fragment_more.xml
+++ b/wallet/res/layout/fragment_more.xml
@@ -237,7 +237,7 @@
                             style="@style/MenuRowSubTitle"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/requested_voting_duration" />
+                            tools:text="Results on 10/12/2024" />
                     </LinearLayout>
 
                     <LinearLayout
diff --git a/wallet/res/layout/fragment_username_requests.xml b/wallet/res/layout/fragment_username_requests.xml
index fb719f9da7..0f239e35e7 100644
--- a/wallet/res/layout/fragment_username_requests.xml
+++ b/wallet/res/layout/fragment_username_requests.xml
@@ -58,16 +58,29 @@
                 app:navigationIcon="@drawable/ic_arrow_back"
                 app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
 
-                <TextView
+                <LinearLayout
                     android:id="@+id/quick_vote_button"
-                    style="@style/Subtitle2.Blue"
-                    android:paddingVertical="4dp"
-                    android:paddingHorizontal="12dp"
-                    android:textSize="13sp"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
+                    android:orientation="horizontal"
                     android:layout_gravity="end"
-                    android:text="@string/quick_vote" />
+                    android:paddingVertical="4dp"
+                    android:paddingHorizontal="12dp" >
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="6dp"
+                        android:src="@drawable/ic_blue_bolt"
+                        android:layout_gravity="center_vertical"
+                        />
+                    <TextView
+                        style="@style/Subtitle2.Blue"
+                        android:textSize="13sp"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:text="@string/quick_vote" />
+                </LinearLayout>
             </androidx.appcompat.widget.Toolbar>
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
@@ -198,11 +211,11 @@
                 android:id="@+id/request_groups"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginTop="15dp"
-                android:paddingBottom="15dp"
                 android:layout_marginHorizontal="15dp"
+                android:layout_marginTop="15dp"
                 android:clipToPadding="false"
                 android:overScrollMode="never"
+                android:paddingBottom="15dp"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/search_panel"
diff --git a/wallet/res/layout/username_request_group_view.xml b/wallet/res/layout/username_request_group_view.xml
index 0050fe4ed2..7d21e9eab8 100644
--- a/wallet/res/layout/username_request_group_view.xml
+++ b/wallet/res/layout/username_request_group_view.xml
@@ -67,17 +67,6 @@
         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"
@@ -92,7 +81,7 @@
 
     <Button
         android:id="@+id/blocks_button"
-        style="@style/Button.Vote.LightRed"
+        style="@style/Button.Primary.Large.LightRed"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_marginVertical="5dp"
@@ -105,7 +94,7 @@
 
     <Button
         android:id="@+id/approvals_button"
-        style="@style/Button.Vote.LightBlue"
+        style="@style/Button.Primary.Large.LightBlue"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_marginVertical="5dp"
diff --git a/wallet/res/layout/username_request_view.xml b/wallet/res/layout/username_request_view.xml
index f107f02037..884bca2550 100644
--- a/wallet/res/layout/username_request_view.xml
+++ b/wallet/res/layout/username_request_view.xml
@@ -70,7 +70,7 @@
 
         <Button
             android:id="@+id/approvals_button"
-            style="@style/Button.Vote.LightBlue"
+            style="@style/Button.Primary.Large.LightBlue"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_marginHorizontal="8dp"
@@ -82,34 +82,4 @@
             />
     </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/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/values/strings-dashpay.xml b/wallet/res/values/strings-dashpay.xml
index 36d64e6c9c..1d095b7dc0 100644
--- a/wallet/res/values/strings-dashpay.xml
+++ b/wallet/res/values/strings-dashpay.xml
@@ -360,7 +360,9 @@
     <string name="add_masternode_key">Add Masternode Voting Key</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="quick_vote_submitting">Submitting your votes for all usernames</string>
     <string name="vote_submitted">Voted for %s username</string>
+    <string name="quick_vote_submitted">Successfully voted for all usernames</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>
@@ -371,6 +373,10 @@
     <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>
+    <string name="one_vote_left_title">One Vote Left</string>
+    <string name="one_vote_left_show_usernames">Show usernames</string>
+    <string name="one_vote_left_subtitle">You have already voted for the following usernames %d times. You can only cast one more vote for these usernames.</string>
+    <string name="one_vote_left_username_examples" translatable="false">stargazer101, quantumquirk, dreamchaser22, pixelpioneer, nebulanavigator, echoexplorer, cyberscribe, lunalark, astroaficionado, mysticmuse, solarsage, galacticguru, horizonhunter, cosmiccrafter, celestialseeker, orbitoracle, stellarscribe, novanomad, astroartisan, meteormaverick</string>
     <string name="voting_period_active">Username Voting Period Active</string>
     <string name="there_was_a_network_error">There was a network error, you can try again at no extra cost</string>
     <string name="requested_username_has_been">Username has been requested.</string>
diff --git a/wallet/src/de/schildbach/wallet/Constants.java b/wallet/src/de/schildbach/wallet/Constants.java
index 9e77f55082..efeee6dfc8 100644
--- a/wallet/src/de/schildbach/wallet/Constants.java
+++ b/wallet/src/de/schildbach/wallet/Constants.java
@@ -63,9 +63,6 @@ public final class Constants {
     public static boolean SUPPORTS_PLATFORM;
     // TODO: remove all references to this when invites are enabled and functional
     public static boolean SUPPORTS_INVITES;
-    // TODO: remove all references to this when quick voting is enabled and functional
-    public static final boolean SUPPORTS_QUICKVOTING = false;
-
 
     public static final EnumSet<MasternodeSync.SYNC_FLAGS> SYNC_FLAGS = MasternodeSync.SYNC_DEFAULT_SPV;
     public static final EnumSet<MasternodeSync.VERIFY_FLAGS> VERIFY_FLAGS = MasternodeSync.VERIFY_DEFAULT_SPV;
diff --git a/wallet/src/de/schildbach/wallet/database/dao/UsernameVoteDao.kt b/wallet/src/de/schildbach/wallet/database/dao/UsernameVoteDao.kt
index db38599522..504c13bf69 100644
--- a/wallet/src/de/schildbach/wallet/database/dao/UsernameVoteDao.kt
+++ b/wallet/src/de/schildbach/wallet/database/dao/UsernameVoteDao.kt
@@ -29,6 +29,9 @@ interface UsernameVoteDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insert(usernameVote: UsernameVote)
 
+    @Query("SELECT COUNT(*) FROM username_votes WHERE username = :username")
+    suspend fun countVotes(username: String): Int
+
     @Query("SELECT * FROM username_votes WHERE username = :username ORDER BY timestamp")
     suspend fun getVotes(username: String): List<UsernameVote>
 
diff --git a/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt b/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt
index fb8a8cb114..2a222b9e05 100644
--- a/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt
+++ b/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt
@@ -1075,6 +1075,7 @@ class PlatformSynchronizationService @Inject constructor(
 
                     name?.let { normalizedLabel ->
                         val voteContender = platformRepo.getVoteContenders(normalizedLabel)
+                        val votes = usernameVoteDao.getVotes(name)
 
                         voteContender.map.forEach { (identifier, contender) ->
 
@@ -1089,8 +1090,7 @@ class PlatformSynchronizationService @Inject constructor(
                                     val identityVerifyDocument = IdentityVerify(platform.platform).get(identifier, name)
 
                                     val requestId = UsernameRequest.getRequestId(identifier.toString(), normalizedLabel)
-                                    val previousUsernameRequest = usernameRequestDao.getRequest(requestId)
-
+                                    val lastVote = votes.lastOrNull()
                                     val usernameRequest = UsernameRequest(
                                         requestId = requestId,
                                         username = contestedDocument.label,
@@ -1100,7 +1100,7 @@ class PlatformSynchronizationService @Inject constructor(
                                         link = identityVerifyDocument?.url,
                                         votes = contender.votes,
                                         lockVotes = voteContender.lockVoteTally,
-                                        isApproved = previousUsernameRequest?.isApproved ?: false
+                                        isApproved = lastVote?.let { it.identity == identifier.toString() } ?: false
                                     )
                                     usernameRequestDao.insert(usernameRequest)
                                     currentRequestList.remove(usernameRequest)
@@ -1151,63 +1151,6 @@ class PlatformSynchronizationService @Inject constructor(
         }
     }
 
-    /*override*/ suspend fun updateUsernameRequestsWithVotes_old() {
-        checkUsernameVotingStatus()
-        try {
-            val contestedNames = platform.platform.names.getContestedNames()
-            // usernameRequestDao.clear()
-            // val myIdentifier = platformRepo.blockchainIdentity.uniqueIdentifier
-            for (name in contestedNames) {
-                try {
-                    val voteContender = platformRepo.getVoteContenders(name)
-
-                    voteContender.map.forEach { (identifier, contender) ->
-
-                        val contestedDocument = contender.serializedDocument?.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.warn("problem getting vote contenders for $name", e)
-                }
-            }
-        } catch (e: Exception) {
-            log.info("problem obtaining votes:", e)
-        }
-    }
-
     /**
      * update databases for a single username (normalized)
      */
@@ -1228,7 +1171,8 @@ class PlatformSynchronizationService @Inject constructor(
                         val identityVerifyDocument = IdentityVerify(platform.platform).get(identifier, name)
 
                         val requestId = UsernameRequest.getRequestId(identifier.toString(), name)
-                        val previousUsernameRequest = usernameRequestDao.getRequest(requestId)
+                        val votes = usernameVoteDao.getVotes(name)
+                        val lastVote = votes.lastOrNull()
 
                         val usernameRequest = UsernameRequest(
                             requestId = requestId,
@@ -1239,7 +1183,7 @@ class PlatformSynchronizationService @Inject constructor(
                             link = identityVerifyDocument?.url,
                             votes = contender.votes,
                             lockVotes = voteContender.lockVoteTally,
-                            isApproved = previousUsernameRequest?.isApproved ?: false
+                            isApproved = lastVote?.let { it.identity == identifier.toString() } ?: false
                         )
                         usernameRequestDao.insert(usernameRequest)
                     }
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 120db3ed67..c09b7b5cba 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesOperation.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesOperation.kt
@@ -103,19 +103,23 @@ class BroadcastUsernameVotesOperation(val application: Application) {
     @SuppressLint("EnqueueWork")
     fun create(
         usernames: List<String>,
+        normalizedLabels: List<String>,
         voteChoices: List<ResourceVoteChoice>,
-        masternodeKeys: List<ByteArray>
+        masternodeKeys: List<ByteArray>,
+        isQuickVoting: Boolean
     ): WorkContinuation {
         val password = SecurityGuard().retrievePassword()
         val verifyIdentityWorker = OneTimeWorkRequestBuilder<BroadcastUsernameVotesWorker>()
             .setInputData(
                 workDataOf(
                     BroadcastUsernameVotesWorker.KEY_PASSWORD to password,
-                    BroadcastUsernameVotesWorker.KEY_USERNAMES to usernames.toTypedArray(),
+                    BroadcastUsernameVotesWorker.KEY_NORMALIZED_LABELS to normalizedLabels.toTypedArray(),
+                    BroadcastUsernameVotesWorker.KEY_LABELS 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()
+                    }.toTypedArray(),
+                    BroadcastUsernameVotesWorker.KEY_QUICK_VOTING to isQuickVoting
                 )
             )
             .addTag("usernames:$usernames")
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 ed94c7ae18..feb9b62f6a 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesWorker.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesWorker.kt
@@ -48,31 +48,36 @@ import org.slf4j.LoggerFactory
 class BroadcastUsernameVotesWorker @AssistedInject constructor(
     @Assisted context: Context,
     @Assisted parameters: WorkerParameters,
-    val analytics: AnalyticsService,
-    val platformBroadcastService: PlatformBroadcastService,
-    val platformSyncService: PlatformSyncService,
-    val walletDataProvider: WalletDataProvider,
-    val usernameRequestDao: UsernameRequestDao,
-    val usernameVoteDao: UsernameVoteDao
+    private val analytics: AnalyticsService,
+    private val platformBroadcastService: PlatformBroadcastService,
+    private val platformSyncService: PlatformSyncService,
+    private val walletDataProvider: WalletDataProvider,
+    private val usernameRequestDao: UsernameRequestDao,
+    private val usernameVoteDao: UsernameVoteDao
 ) : BaseWorker(context, parameters) {
     companion object {
         private val log = LoggerFactory.getLogger(BroadcastUsernameVotesWorker::class.java)
 
         const val KEY_PASSWORD = "BroadcastUsernameVotesWorker.PASSWORD"
-        const val KEY_USERNAMES = "BroadcastUsernameVotesWorker.USERNAMES"
+        const val KEY_NORMALIZED_LABELS = "BroadcastUsernameVotesWorker.NORMALIZED_LABELS"
+        const val KEY_LABELS = "BroadcastUsernameVotesWorker.LABELS"
         const val KEY_VOTE_CHOICES = "BroadcastUsernameVotesWorker.VOTE_CHOICES"
         const val KEY_MASTERNODE_KEYS = "BroadcastUsernameVotesWorker.MASTERNODE_KEYS"
+        const val KEY_QUICK_VOTING = "BroadcastUsernameVotesWorker.QUICK_VOTING"
     }
 
     override suspend fun doWorkWithBaseProgress(): Result {
         val password = inputData.getString(KEY_PASSWORD)
                 ?: return Result.failure(workDataOf(KEY_ERROR_MESSAGE to "missing KEY_PASSWORD parameter"))
-        val usernames = inputData.getStringArray(KEY_USERNAMES)
+        val normalizedLabels = inputData.getStringArray(KEY_NORMALIZED_LABELS)
                 ?: return Result.failure(workDataOf(KEY_ERROR_MESSAGE to "missing KEY_USERNAMES parameter"))
+        val labels = inputData.getStringArray(KEY_LABELS)
+            ?: return Result.failure(workDataOf(KEY_ERROR_MESSAGE to "missing KEY_USERNAMES parameter"))
         val voteChoices = inputData.getStringArray(KEY_VOTE_CHOICES)
             ?: return Result.failure(workDataOf(KEY_ERROR_MESSAGE to "missing KEY_VOTE_CHOICES parameter"))
         val masternodeKeys = inputData.getStringArray(KEY_MASTERNODE_KEYS)
             ?: return Result.failure(workDataOf(KEY_ERROR_MESSAGE to "missing KEY_MASTERNODE_KEYS parameter"))
+        val isQuickVoting = inputData.getBoolean(KEY_QUICK_VOTING, false)
 
         // TODO: add decryption later?
         val encryptionKey: KeyParameter
@@ -85,17 +90,19 @@ class BroadcastUsernameVotesWorker @AssistedInject constructor(
         }
 
         return try {
-            log.info("executing BroadcastUsernameVotesWorker({}, {})", usernames, voteChoices)
-            log.info("voting BroadcastUsernameVotesWorker({}, {})", usernames, voteChoices)
+            val labelMap = hashMapOf<String, String>()
+            normalizedLabels.forEachIndexed { i, normalizedLabel ->  labelMap[normalizedLabel] = labels[i] }
+            log.info("executing BroadcastUsernameVotesWorker({}, {})", normalizedLabels, voteChoices)
+            log.info("voting BroadcastUsernameVotesWorker({}, {})", normalizedLabels, voteChoices)
 
             // comment this out for now
             val votingResults = platformBroadcastService.broadcastUsernameVotes(
-                usernames.toList(),
+                normalizedLabels.toList(),
                 voteChoices.map { ResourceVoteChoice.from(it) },
                 masternodeKeys.map { DumpedPrivateKey.fromBase58(Constants.NETWORK_PARAMETERS, it).key.privKeyBytes },
                 encryptionKey
             )
-            log.info("voted BroadcastUsernameVotesWorker({}, {})", usernames, voteChoices)
+            log.info("voted BroadcastUsernameVotesWorker({}, {})", normalizedLabels, voteChoices)
             // mock the voting results
 //            val votingResults = arrayListOf<Triple<ResourceVoteChoice, Vote?, Exception?>>()
 //            usernames.forEachIndexed { i, username ->
@@ -151,21 +158,25 @@ class BroadcastUsernameVotesWorker @AssistedInject constructor(
                     log.info("all votes succeeded: total submitted {}", errorCount, votingResults.size)
                     Result.success(
                         workDataOf(
-                            KEY_USERNAMES to if (votingResults.isNotEmpty()) {
+                            KEY_NORMALIZED_LABELS to if (votingResults.isNotEmpty()) {
                                 arrayOfnames
                             } else {
                                 listOf("").toTypedArray()
                             },
+                            KEY_LABELS to labels,
                             KEY_VOTE_CHOICES to votingResults.map {
                                 it.first.toString()
-                            }.toTypedArray()
+                            }.toTypedArray(),
+                            KEY_QUICK_VOTING to isQuickVoting
                         )
                     )
                 }
                 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/ })
+                    // errors that can be returned
+                    // 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/ })
+                    // Dapi client error: Transport(Status { code: InvalidArgument, message: "Masternode with id: CmbJumQ1ALJXHYFpUdCCnvbfgvXKSajErNXGhv3H4GN1 already voted 5 times and is trying to vote again, they can only vote 5 times"
                     votingResults.forEach {
                         it.third?.let { e ->
                             log.error("error with vote: {}", it.first, e)
@@ -173,14 +184,12 @@ class BroadcastUsernameVotesWorker @AssistedInject constructor(
                     }
                     Result.failure(
                         workDataOf(
-                            KEY_USERNAMES to if (votingResults.isNotEmpty()) {
-                                arrayOfnames
-                            } else {
-                                listOf("").toTypedArray()
-                            },
+                            KEY_NORMALIZED_LABELS to arrayOfnames,
+                            KEY_LABELS to arrayOfnames.map { labelMap[it] },
                             KEY_VOTE_CHOICES to votingResults.map {
                                 it.first.toString()
-                            }.toTypedArray()
+                            }.toTypedArray(),
+                            KEY_QUICK_VOTING to isQuickVoting
                         )
                     )
                 }
@@ -194,8 +203,10 @@ class BroadcastUsernameVotesWorker @AssistedInject constructor(
                     }
                     Result.success(
                         workDataOf(
-                            KEY_USERNAMES to usernames,
-                            KEY_VOTE_CHOICES to voteChoices
+                            KEY_NORMALIZED_LABELS to arrayOfnames,
+                            KEY_LABELS to arrayOfnames.map { labelMap[it] },
+                            KEY_VOTE_CHOICES to voteChoices,
+                            KEY_QUICK_VOTING to isQuickVoting
                         )
                     )
                 }
@@ -206,12 +217,13 @@ class BroadcastUsernameVotesWorker @AssistedInject constructor(
             Result.failure(
                 workDataOf(
                     KEY_ERROR_MESSAGE to formatExceptionMessage("broadcast username vote", ex),
-                    KEY_USERNAMES to usernames,
-                    KEY_VOTE_CHOICES to voteChoices
+                    KEY_NORMALIZED_LABELS to normalizedLabels,
+                    KEY_VOTE_CHOICES to voteChoices,
+                    KEY_QUICK_VOTING to isQuickVoting
                 )
             )
         } finally {
-            log.info("finshed BroadcastUsernameVotesWorker({}, {})", usernames, voteChoices)
+            log.info("finished BroadcastUsernameVotesWorker({}, {})", normalizedLabels, voteChoices)
         }
     }
 
diff --git a/wallet/src/de/schildbach/wallet/ui/more/MoreFragment.kt b/wallet/src/de/schildbach/wallet/ui/more/MoreFragment.kt
index 4fefc975a9..9db13a49e5 100644
--- a/wallet/src/de/schildbach/wallet/ui/more/MoreFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/more/MoreFragment.kt
@@ -253,6 +253,7 @@ class MoreFragment : Fragment(R.layout.fragment_more) {
                     }
                     UsernameRequestStatus.VOTING -> {
                         binding.requestedUsernameTitle.text = mainActivityViewModel.getRequestedUsername()
+                        binding.requestedUsernameSubtitleTwo.isVisible = true
                         binding.requestedUsernameSubtitleTwo.text =
                             getString(R.string.requested_voting_duration, votingPeriod)
                         binding.retryRequestButton.isVisible = false
diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
index e83c173fd8..e84ce2035f 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
@@ -27,7 +27,6 @@ import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
 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
@@ -35,6 +34,7 @@ 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
+import de.schildbach.wallet.ui.username.voting.OneVoteLeftDialogFragment
 import de.schildbach.wallet_test.R
 import de.schildbach.wallet_test.databinding.FragmentUsernameRequestsBinding
 import kotlinx.coroutines.delay
@@ -75,40 +75,13 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
             safeNavigate(UsernameRequestsFragmentDirections.requestsToFilters())
         }
         val adapter = UsernameRequestGroupAdapter(
-            { request -> //performVote(request)
+            { 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)
-//                            }
-//                        }
                     }
                 }
             },
@@ -156,15 +129,6 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
 
             setState(state.filteredUsernameRequests)
             setList(adapter, state.filteredUsernameRequests)
-            //setVotes(state.votes)
-
-//            if (state.voteSubmitted) {
-//                showVoteIndicator(binding, false)
-//            }
-//
-//            if (state.voteCancelled) {
-//                showVoteIndicator(binding, true)
-//            }
         }
 
         viewModel.filterState.observe(viewLifecycleOwner) { state ->
@@ -182,10 +146,13 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
             log.info("vote data: {}", voteData)
             voteData.forEach { (t, u) ->
                 try {
+                    val normalizedLabels =
+                        u.data?.outputData?.getStringArray(BroadcastUsernameVotesWorker.KEY_NORMALIZED_LABELS)?.toList()
                     val usernames =
-                        u.data?.outputData?.getStringArray(BroadcastUsernameVotesWorker.KEY_USERNAMES)?.toList()
+                        u.data?.outputData?.getStringArray(BroadcastUsernameVotesWorker.KEY_NORMALIZED_LABELS)?.toList()
                     val votes =
                         u.data?.outputData?.getStringArray(BroadcastUsernameVotesWorker.KEY_VOTE_CHOICES)?.toList()
+                    val isQuickVoting = u.data?.outputData?.getBoolean(BroadcastUsernameVotesWorker.KEY_QUICK_VOTING, false) ?: false
                     when (u.status) {
                         Status.LOADING -> {
                             log.info("  loading: {} {}", t, u.data?.outputData)
@@ -194,12 +161,13 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
 
                         Status.SUCCESS -> {
                             log.info("  success: {} {}", t, u.data?.outputData)
-                            showVoteIndicator(binding, votes!!, usernames!!, u.status)
+                            showVoteIndicator(binding, votes!!, usernames!!, u.status, isQuickVoting)
+                            viewModel.updateUsernameRequestsWithVotes()
                         }
 
                         Status.ERROR -> {
                             log.info("  error: {} {}", t, u.data?.outputData)
-                            showVoteIndicator(binding, votes!!, usernames!!, u.status)
+                            showVoteIndicator(binding, votes!!, usernames!!, u.status, isQuickVoting)
                         }
 
                         Status.CANCELED -> {
@@ -333,7 +301,7 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
         binding.filterSubtitle.text = getString(R.string.n_usernames, requests.size)
         binding.filterSubtitle.isVisible = requests.isNotEmpty()
         binding.searchPanel.isVisible = requests.isNotEmpty()
-        binding.quickVoteButton.isVisible = requests.isNotEmpty() && viewModel.keysAmount > 0 && Constants.SUPPORTS_QUICKVOTING
+        binding.quickVoteButton.isVisible = requests.isNotEmpty() && viewModel.keysAmount > 0
         binding.noItemsTxt.isVisible = requests.isEmpty()
     }
 
@@ -346,16 +314,20 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
         binding.requestGroups.scrollToPosition(scrollPosition)
     }
 
-//    private fun setVotes(adapter: UsernameRequestGroupAdapter, votes: List<UsernameVote>) {
-//        adapter.updateVotes(votes)
-//    }
-
+    /**
+     * Returns a list of [UsernameRequestGroupView] where the username of the group or the label or normalizedLabel
+     * of any related request contains [query] text.
+     */
     private fun filterByQuery(items: List<UsernameRequestGroupView>, query: String?): List<UsernameRequestGroupView> {
         if (query.isNullOrEmpty()) {
             return items
         }
 
-        return items.filter { it.username.startsWith(query, true) }
+        return items.filter {
+            it.username.contains(query, true) || it.requests.any {
+                request -> request.normalizedLabel.contains(query)
+            }
+        }
     }
 
     private fun populateAppliedFilters(state: FiltersUIState) {
@@ -377,11 +349,15 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
         binding.filteredByTxt.text = appliedFilterNames.joinToString(", ")
     }
 
+    /**
+     * Display the toast regarding the last vote
+     */
     private fun showVoteIndicator(
         binding: FragmentUsernameRequestsBinding,
         votes: List<String>,
         usernames: List<String>,
-        status: Status
+        status: Status,
+        isQuickVoting: Boolean
     ) {
         if (votes.isEmpty()) {
             return
@@ -390,22 +366,39 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
         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
+        if (isQuickVoting) {
+            // show dialog about 1 vote left if necessary
+            showQuickVotingResults(usernames)
+        }
+        viewModel.currentVote?.let {
+            if (!it.any { usernames.contains(it.username) }) {
+                log.info("vote, there is no 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)
+                is TowardsIdentity -> {
+                    if (isQuickVoting) {
+                        getString(R.string.quick_vote_submitted)
+                    } else {
+                        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)
+                is TowardsIdentity -> {
+                    if (isQuickVoting) {
+                        getString(R.string.vote_submitting, username)
+                    } else {
+                        getString(R.string.vote_submitting, username)
+                    }
+                }
                 else -> error("invalid vote choice: $resourceVoteChoice")
             }
             Status.ERROR -> when (resourceVoteChoice) {
@@ -439,4 +432,16 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
                 .start()
         }, 3000L)
     }
+
+    /**
+     * Display a dialog for any usernames that have only one vote remaining after quick voting
+     */
+    private fun showQuickVotingResults(usernames: List<String>) {
+        lifecycleScope.launch {
+            val usernamesWithOneVoteLeft = viewModel.getUsernamesByVotesLeft(usernames, 1)
+            if (usernamesWithOneVoteLeft.isNotEmpty()) {
+                OneVoteLeftDialogFragment.newInstance(usernamesWithOneVoteLeft).show(requireActivity())
+            }
+        }
+    }
 }
diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
index 17e7572c75..6ae20c8508 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
@@ -49,13 +49,20 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 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.MasternodeAddress
+import org.bitcoinj.core.NetworkParameters
+import org.bitcoinj.core.Sha256Hash
 import org.bitcoinj.core.Utils
+import org.bitcoinj.crypto.BLSLazyPublicKey
+import org.bitcoinj.crypto.BLSPublicKey
+import org.bitcoinj.evolution.SimplifiedMasternodeListEntry
 import org.bitcoinj.evolution.SimplifiedMasternodeListManager
 import org.bitcoinj.wallet.AuthenticationKeyChain
 import org.bitcoinj.wallet.authentication.AuthenticationKeyStatus
@@ -259,20 +266,15 @@ class UsernameRequestsViewModel @Inject constructor(
         viewModelScope.launch(Dispatchers.IO) {
             usernameRequestDao.getRequest(requestId)?.let { request ->
                 BroadcastUsernameVotesOperation(walletApplication).create(
+                    listOf(request.username),
                     listOf(request.normalizedLabel),
                     listOf(ResourceVoteChoice.towardsIdentity(Identifier.from(request.identity))),
-                    masternodes.value.map { it.votingPrivateKey }
+                    masternodes.value.map { it.votingPrivateKey },
+                    isQuickVoting = false
                 ).enqueue()
 
-                usernameRequestDao.removeApproval(request.username)
-                usernameRequestDao.update(request.copy(votes = request.votes + keysAmount, isApproved = true))
-//                usernameVoteDao.insert(
-//                    UsernameVote(
-//                        request.normalizedLabel,
-//                        request.identity,
-//                        UsernameVote.APPROVE
-//                    )
-//                )
+                //usernameRequestDao.removeApproval(request.username)
+                //usernameRequestDao.update(request.copy(votes = request.votes + keysAmount, isApproved = true))
                 currentVote = arrayListOf(
                     UsernameVote(
                         request.normalizedLabel,
@@ -285,7 +287,7 @@ class UsernameRequestsViewModel @Inject constructor(
         }
     }
 
-    fun revokeVote(requestId: String) {
+    private fun revokeVote(requestId: String) {
         if (keysAmount == 0) {
             return
         }
@@ -293,18 +295,12 @@ class UsernameRequestsViewModel @Inject constructor(
         viewModelScope.launch(Dispatchers.IO) {
             usernameRequestDao.getRequest(requestId)?.let { request ->
                 BroadcastUsernameVotesOperation(walletApplication).create(
+                    listOf(request.username),
                     listOf(request.normalizedLabel),
                     listOf(ResourceVoteChoice.abstain()),
-                    masternodes.value.map { it.votingPrivateKey }
+                    masternodes.value.map { it.votingPrivateKey },
+                    isQuickVoting = false
                 ).enqueue()
-                usernameRequestDao.update(request.copy(votes = request.votes - keysAmount, isApproved = false))
-//                usernameVoteDao.insert(
-//                    UsernameVote(
-//                        request.normalizedLabel,
-//                        request.identity,
-//                        UsernameVote.ABSTAIN
-//                    )
-//                )
                 currentVote = arrayListOf(
                     UsernameVote(
                         request.normalizedLabel,
@@ -322,35 +318,50 @@ class UsernameRequestsViewModel @Inject constructor(
             return
         }
 
-        viewModelScope.launch(Dispatchers.IO) {
-            val filteredRequests = _uiState.value.filteredUsernameRequests
-            val requestIds = filteredRequests.flatMap {
-                it.requests
-            }.filterNot {
-                it.isApproved
-            }.map {
-                it.requestId
-            }
-            usernameRequestDao.voteForRequests(
-                requestIds,
-                keysAmount
-            )
-            _uiState.update { it.copy(voteSubmitted = true) }
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                val filteredRequests = _uiState.value.filteredUsernameRequests
+                // group the filtered requests according to the normalizedLabel
+                val requestsByUsername = hashMapOf<String, ArrayList<UsernameRequest>>()
+                filteredRequests.flatMap {
+                    it.requests
+                }.forEach {
+                    val requestList = if (!requestsByUsername.contains(it.normalizedLabel)) {
+                        val list = arrayListOf<UsernameRequest>()
+                        requestsByUsername[it.normalizedLabel] = list
+                        list
+                    } else {
+                        requestsByUsername[it.normalizedLabel]
+                    }
+                    requestList!!.add(it)
+                }
 
-            val usernames = arrayListOf<String>()
-            val voteChoices = arrayListOf<ResourceVoteChoice>()
-            requestIds.forEach {
-                usernameRequestDao.getRequest(it)?.let { request ->
-                    usernames.add(request.normalizedLabel)
+                // choose the first request submitted for each group based on the createdAt timestamp
+                val firstRequests = requestsByUsername.map {
+                    it.value.minByOrNull { request -> request.createdAt }!!
+                }
+
+                val usernames = arrayListOf<String>()
+                val normalizedLabels = arrayListOf<String>()
+                val voteChoices = arrayListOf<ResourceVoteChoice>()
+                // ignore the requests that already have been approved or have no votes remaining
+                firstRequests.filterNot {
+                    it.isApproved && usernameVoteDao.countVotes(it.normalizedLabel) < UsernameVote.MAX_VOTES
+                }.forEach { request ->
+                    usernames.add(request.username)
+                    normalizedLabels.add(request.normalizedLabel)
                     voteChoices.add(ResourceVoteChoice.towardsIdentity(Identifier.from(request.identity)))
                 }
-            }
 
-            BroadcastUsernameVotesOperation(walletApplication).create(
-                usernames,
-                voteChoices,
-                masternodes.value.map { it.votingPrivateKey }
-            ).enqueue()
+                BroadcastUsernameVotesOperation(walletApplication).create(
+                    usernames,
+                    normalizedLabels,
+                    voteChoices,
+                    masternodes.value.map { it.votingPrivateKey },
+                    isQuickVoting = true
+                ).enqueue()
+            }
+            _uiState.update { it.copy(voteSubmitted = true) }
         }
     }
 
@@ -553,20 +564,13 @@ class UsernameRequestsViewModel @Inject constructor(
         logEvent(AnalyticsConstants.UsernameVoting.BLOCK)
         viewModelScope.launch(Dispatchers.IO) {
             BroadcastUsernameVotesOperation(walletApplication).create(
+                listOf(username),
                 listOf(username),
                 listOf(ResourceVoteChoice.lock()),
-                masternodes.value.map { it.votingPrivateKey }
+                masternodes.value.map { it.votingPrivateKey },
+                isQuickVoting = false
             ).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),
@@ -680,4 +684,13 @@ class UsernameRequestsViewModel @Inject constructor(
             }
         }
     }
+
+    /**
+     * returns names in [usernames] that have only [votesLeft] remaining votes that can be cast
+     */
+    suspend fun getUsernamesByVotesLeft(usernames: List<String>, votesLeft: Int): List<String> {
+        return usernames.filter { username ->
+            usernameVoteDao.countVotes(username) == UsernameVote.MAX_VOTES - votesLeft
+        }
+    }
 }
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 6499538e58..01e268caaa 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupAdapter.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupAdapter.kt
@@ -16,16 +16,12 @@
  */
 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.util.TypedValue
+import android.util.TypedValue.COMPLEX_UNIT_SP
 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
 import androidx.recyclerview.widget.DiffUtil
@@ -36,10 +32,7 @@ import de.schildbach.wallet.database.entity.UsernameVote
 import de.schildbach.wallet_test.R
 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.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
 
@@ -47,24 +40,12 @@ import java.util.Date
 import java.util.Locale
 
 fun Button.setVoteThemeColors(
-    backgroundColor: Int,
+    backgroundStyle: 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)
-    }
+    setRoundedRippleBackground(backgroundStyle)
+    setTextColor(context.getColor(textColor))
+    setTextSize(COMPLEX_UNIT_SP, 12.0f)
 }
 
 class UsernameRequestGroupAdapter(
@@ -98,7 +79,7 @@ class UsernameRequestGroupAdapter(
         val hasMoreThanOneRequest = item.requests.size > 1
         holder.bind(item, usernameDetailsClickListener, voteClickListener)
         holder.binding.root.setOnClickListener {
-            // expand if there is more than 1 request, otherwise show details
+            // expand if there is more than 1 request, otherwise show details on click
             if (hasMoreThanOneRequest) {
                 val index = currentList.indexOfFirst { it.username == item.username }
                 currentList[index].isExpanded = !currentList[index].isExpanded
@@ -124,8 +105,6 @@ class UsernameRequestGroupViewHolder(
         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
         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 {
@@ -139,37 +118,21 @@ class UsernameRequestGroupViewHolder(
         }
 
         // change the button colors based on our vote(s)
-        val lastVote = option.votes.lastOrNull()
-        when (lastVote?.type?.lowercase()) {
+        when (option.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()))
-
-                //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.blocksButton.setVoteThemeColors(R.style.PrimaryButtonTheme_Large_LightRed, R.color.red)
+                binding.approvalsButton.setVoteThemeColors(R.style.PrimaryButtonTheme_Large_Blue, R.color.dash_white)
             }
             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)
+                binding.blocksButton.setVoteThemeColors(R.style.PrimaryButtonTheme_Large_Red, R.color.dash_white)
+                binding.approvalsButton.setVoteThemeColors(R.style.PrimaryButtonTheme_Large_LightBlue, R.color.dash_blue)
             }
             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)
+                binding.blocksButton.setVoteThemeColors(R.style.PrimaryButtonTheme_Large_LightRed, R.color.red)
+                binding.approvalsButton.setVoteThemeColors(R.style.PrimaryButtonTheme_Large_LightBlue, R.color.dash_blue)
             }
         }
 
@@ -180,14 +143,6 @@ class UsernameRequestGroupViewHolder(
                 { request -> voteClickListener.invoke(request) }
             )
             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)
         }
     }
@@ -263,69 +218,27 @@ class UsernameRequestViewHolder(
         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.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)
+                    binding.approvalsButton.setVoteThemeColors(R.style.PrimaryButtonTheme_Large_Blue, R.color.dash_white)
                 } else {
-                    binding.approvalsButton.setVoteThemeColors(R.color.dash_blue_0_05, R.color.dash_blue)
+                    binding.approvalsButton.setVoteThemeColors(R.style.PrimaryButtonTheme_Large_LightBlue, R.color.dash_blue)
                 }
             }
             UsernameVote.LOCK, UsernameVote.ABSTAIN -> {
-                binding.approvalsButton.setVoteThemeColors(R.color.dash_blue_0_05, R.color.dash_blue)
+                binding.approvalsButton.setVoteThemeColors(R.style.PrimaryButtonTheme_Large_LightBlue, R.color.dash_blue)
             }
             else -> {
-                binding.approvalsButton.setVoteThemeColors(R.color.dash_blue_0_05, R.color.dash_blue)
+                binding.approvalsButton.setVoteThemeColors(R.style.PrimaryButtonTheme_Large_LightBlue, R.color.dash_blue)
             }
         }
 
-//        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.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
     }
 
     override fun setOnClickListener(usernameRequest: UsernameRequest, listener: (UsernameRequest) -> Unit, voteClickListener: (UsernameRequest) -> Unit) {
@@ -338,17 +251,3 @@ class UsernameRequestViewHolder(
     }
 }
 
-//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/OneVoteLeftDialogFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/voting/OneVoteLeftDialogFragment.kt
new file mode 100644
index 0000000000..909535e59d
--- /dev/null
+++ b/wallet/src/de/schildbach/wallet/ui/username/voting/OneVoteLeftDialogFragment.kt
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2024 Dash Core Group.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.schildbach.wallet.ui.username.voting
+
+import android.os.Bundle
+import android.view.View
+import androidx.core.view.isVisible
+import de.schildbach.wallet.database.entity.UsernameVote
+import de.schildbach.wallet_test.R
+import de.schildbach.wallet_test.databinding.DialogOneVoteLeftBinding
+import org.dash.wallet.common.ui.dialogs.OffsetDialogFragment
+import org.dash.wallet.common.ui.viewBinding
+
+class OneVoteLeftDialogFragment: OffsetDialogFragment(R.layout.dialog_one_vote_left) {
+    companion object {
+        private const val USERNAME_ARG = "usernames"
+        fun newInstance(usernames: List<String>): OneVoteLeftDialogFragment{
+            val args = Bundle()
+            args.putStringArray(USERNAME_ARG, usernames.toTypedArray())
+            val fragment = OneVoteLeftDialogFragment()
+            fragment.arguments = args
+            return fragment
+        }
+    }
+    private val binding by viewBinding(DialogOneVoteLeftBinding::bind)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        binding.okButton.setOnClickListener { dismiss() }
+
+        binding.dismissBtn.setOnClickListener { dismiss() }
+
+        requireArguments().apply {
+            val usernameList = getStringArray(USERNAME_ARG)!!
+            if (usernameList.size > 1) {
+                // hide all the names behind the "Show usernames" button
+                binding.showUsernames.isVisible = true
+                binding.usernameList.isVisible = false
+                binding.usernameList.text = usernameList.joinToString(", ")
+            } else {
+                // if there is only one username, then show it
+                binding.showUsernames.isVisible = false
+                binding.usernameList.isVisible = true
+                binding.usernameList.text = usernameList.first()
+            }
+            binding.subtitle.text = getString(R.string.one_vote_left_subtitle, UsernameVote.MAX_VOTES - 1)
+        }
+
+        binding.showUsernames.setOnClickListener {
+            binding.showUsernames.isVisible = false
+            binding.usernameList.isVisible = true
+        }
+    }
+}

From 8449d43354de0b1e3af88f881786c00c509d74d0 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Thu, 5 Dec 2024 07:41:23 -0800
Subject: [PATCH 2/4] fix(dashpay): improve username voting screen and other
 voting fixes (#1328)

* fix: allow space for 2 lines of title on Username Voting layout

* fix: improve tracking progress of votes from worker

* fix: properly show "link included"

* refactor: some types changed in dash-sdk-kotlin

* fix: minor changes

* chore: remove comment

* fix: make prepopulateList conform to all rules

* fix: maintain expanded status of a username request group

* fix: More Fragment Join button size
---
 wallet/res/layout/fragment_more.xml           |   6 +-
 .../res/layout/fragment_username_requests.xml |   3 +-
 .../wallet/ui/dashpay/utils/DashPayConfig.kt  |   8 ++
 .../work/BroadcastUsernameVotesOperation.kt   |  40 +++++--
 .../ui/username/UsernameRequestsFragment.kt   |  90 ++++++++-------
 .../ui/username/UsernameRequestsViewModel.kt  | 107 ++++++++++--------
 .../adapters/UsernameRequestGroupAdapter.kt   |   4 +-
 7 files changed, 159 insertions(+), 99 deletions(-)

diff --git a/wallet/res/layout/fragment_more.xml b/wallet/res/layout/fragment_more.xml
index 0ee865a244..a0de3650a2 100644
--- a/wallet/res/layout/fragment_more.xml
+++ b/wallet/res/layout/fragment_more.xml
@@ -75,10 +75,14 @@
                 <Button
                     android:id="@+id/join_dashpay_btn"
                     style="@style/Button.Primary.Blue"
-                    android:layout_width="110dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="30dp"
                     android:layout_marginBottom="14dp"
+                    android:layout_marginHorizontal="100dp"
+                    android:maxLines="1"
+                    android:ellipsize="end"
+                    android:minWidth="110dp"
                     android:text="@string/join"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
diff --git a/wallet/res/layout/fragment_username_requests.xml b/wallet/res/layout/fragment_username_requests.xml
index 0f239e35e7..727dc7a10a 100644
--- a/wallet/res/layout/fragment_username_requests.xml
+++ b/wallet/res/layout/fragment_username_requests.xml
@@ -36,6 +36,7 @@
             app:contentScrim="@color/background_secondary"
             app:layout_scrollFlags="scroll|snap|exitUntilCollapsed"
             app:title="@string/username_voting"
+            app:maxLines="2"
             app:collapsedTitleTextColor="@color/content_primary"
             app:expandedTitleTextColor="@color/content_primary"
             app:expandedTitleTextAppearance="@style/Headline3"
@@ -46,7 +47,7 @@
 
             <View
                 android:layout_width="match_parent"
-                android:layout_height="100dp"
+                android:layout_height="130dp"
                 app:layout_collapseMode="parallax" />
 
             <androidx.appcompat.widget.Toolbar
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 3dfadaa624..9b76c6e5d4 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/utils/DashPayConfig.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/utils/DashPayConfig.kt
@@ -20,6 +20,7 @@ package de.schildbach.wallet.ui.dashpay.utils
 import android.content.Context
 import androidx.datastore.preferences.SharedPreferencesMigration
 import androidx.datastore.preferences.core.booleanPreferencesKey
+import androidx.datastore.preferences.core.intPreferencesKey
 import androidx.datastore.preferences.core.longPreferencesKey
 import org.dash.wallet.common.WalletDataProvider
 import org.dash.wallet.common.data.BaseConfig
@@ -55,6 +56,7 @@ open class DashPayConfig @Inject constructor(
         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")
+        val USERNAME_VOTE_COUNTER = intPreferencesKey("username_vote_counter")
     }
 
     open suspend fun areNotificationsDisabled(): Boolean {
@@ -64,4 +66,10 @@ open class DashPayConfig @Inject constructor(
     open suspend fun disableNotifications() {
         set(LAST_SEEN_NOTIFICATION_TIME, DISABLE_NOTIFICATIONS)
     }
+
+    suspend fun getUsernameVoteCounter(): Int {
+        val counter = (get(USERNAME_VOTE_COUNTER) ?: 0) + 1
+        set(USERNAME_VOTE_COUNTER, counter)
+        return counter
+    }
 }
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 c09b7b5cba..a7b18486b5 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesOperation.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesOperation.kt
@@ -27,6 +27,7 @@ import de.schildbach.wallet.Constants
 import de.schildbach.wallet.livedata.Resource
 import de.schildbach.wallet.security.SecurityGuard
 import org.bitcoinj.core.ECKey
+import org.dash.wallet.common.services.analytics.AnalyticsService
 import org.dashj.platform.dpp.voting.ResourceVoteChoice
 import org.slf4j.LoggerFactory
 
@@ -39,8 +40,35 @@ class BroadcastUsernameVotesOperation(val application: Application) {
 
         private const val WORK_NAME = "BroadcastUsernameVotes.WORK#"
 
-        fun uniqueWorkName(usernames: String) = "$WORK_NAME$usernames-${System.currentTimeMillis()}"
+        fun uniqueWorkName(workId: String) = "$WORK_NAME$workId}"
 
+        fun operationStatus(
+            application: Application,
+            toUserId: String,
+            analytics: AnalyticsService
+        ): LiveData<Resource<WorkInfo>> {
+            val workManager: WorkManager = WorkManager.getInstance(application)
+            return workManager.getWorkInfosForUniqueWorkLiveData(uniqueWorkName(toUserId)).switchMap {
+                return@switchMap liveData {
+
+                    if (it.isNullOrEmpty()) {
+                        return@liveData
+                    }
+
+                    if (it.size > 1) {
+                        val e = RuntimeException("there should never be more than one unique work ${
+                            uniqueWorkName(
+                                toUserId
+                            )
+                        }")
+                        analytics.logError(e)
+                        throw e
+                    }
+                    emit(convertState(it.first()))
+                }
+            }
+        }
+        
         fun allOperationsStatus(application: Application): LiveData<MutableMap<String, Resource<WorkInfo>>> {
             val workManager: WorkManager = WorkManager.getInstance(application)
             return workManager.getWorkInfosByTagLiveData(BroadcastUsernameVotesWorker::class.qualifiedName!!).switchMap {
@@ -93,15 +121,9 @@ class BroadcastUsernameVotesOperation(val application: Application) {
         }
     }
 
-    private val workManager: WorkManager = WorkManager.getInstance(application)
-
-//    /**
-//     * Gets the list of all BroadcastUsernameVotesOperation WorkInfo's
-//     */
-//    val allOperationsLiveData = workManager.getWorkInfosByTagLiveData(BroadcastUsernameVotesWorker::class.qualifiedName!!)
-
     @SuppressLint("EnqueueWork")
     fun create(
+        workId: String,
         usernames: List<String>,
         normalizedLabels: List<String>,
         voteChoices: List<ResourceVoteChoice>,
@@ -128,7 +150,7 @@ class BroadcastUsernameVotesOperation(val application: Application) {
         log.info("creating BroadcastUsernameVotesOperation({}, {})", usernames, voteChoices)
         return WorkManager.getInstance(application)
             .beginUniqueWork(
-                uniqueWorkName(usernames.joinToString(",")),
+                uniqueWorkName(workId),
                 ExistingWorkPolicy.KEEP,
                 verifyIdentityWorker
             )
diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
index e84ce2035f..0bda5358da 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
@@ -122,7 +122,7 @@ 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()
             }
@@ -142,40 +142,56 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
             }
         }
 
-        viewModel.voteSubmissionLiveData.observe(viewLifecycleOwner) { voteData ->
-            log.info("vote data: {}", voteData)
-            voteData.forEach { (t, u) ->
-                try {
-                    val normalizedLabels =
-                        u.data?.outputData?.getStringArray(BroadcastUsernameVotesWorker.KEY_NORMALIZED_LABELS)?.toList()
-                    val usernames =
-                        u.data?.outputData?.getStringArray(BroadcastUsernameVotesWorker.KEY_NORMALIZED_LABELS)?.toList()
-                    val votes =
-                        u.data?.outputData?.getStringArray(BroadcastUsernameVotesWorker.KEY_VOTE_CHOICES)?.toList()
-                    val isQuickVoting = u.data?.outputData?.getBoolean(BroadcastUsernameVotesWorker.KEY_QUICK_VOTING, false) ?: false
-                    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, isQuickVoting)
-                            viewModel.updateUsernameRequestsWithVotes()
-                        }
-
-                        Status.ERROR -> {
-                            log.info("  error: {} {}", t, u.data?.outputData)
-                            showVoteIndicator(binding, votes!!, usernames!!, u.status, isQuickVoting)
-                        }
-
-                        Status.CANCELED -> {
-                            log.info("  error: {} {}", t, u.data?.outputData)
+        // currentWorkId is updated before a vote is broadcasts
+        // this block will then create an observer for that vote
+        viewModel.currentWorkId.observe(viewLifecycleOwner) {
+            if (it.isNotEmpty()) {
+                val liveData = viewModel.voteObserver(it)
+                liveData.observe(viewLifecycleOwner) { resource ->
+                    // show vote info dialogs and toasts
+                    log.info("current work id: {}: {}", it, resource)
+                    try {
+                        val outputData = resource.data?.outputData
+                        val normalizedLabels =
+                            outputData?.getStringArray(BroadcastUsernameVotesWorker.KEY_NORMALIZED_LABELS)?.toList()
+                        val usernames =
+                            outputData?.getStringArray(BroadcastUsernameVotesWorker.KEY_LABELS)?.toList()
+                        val votes =
+                            outputData?.getStringArray(BroadcastUsernameVotesWorker.KEY_VOTE_CHOICES)?.toList()
+                        val isQuickVoting = outputData?.getBoolean(BroadcastUsernameVotesWorker.KEY_QUICK_VOTING, false) ?: false
+                        when (resource.status) {
+                            Status.LOADING -> {
+                                log.info("  loading: {}", outputData)
+                            }
+
+                            Status.SUCCESS -> {
+                                log.info("  success: {}", outputData)
+                                showVoteIndicator(votes!!, usernames!!, resource.status, isQuickVoting)
+                                if (!isQuickVoting) {
+                                    normalizedLabels?.firstOrNull()?.let {
+                                        viewModel.updateUsernameRequestWithVotes(it)
+                                    }
+                                } else {
+                                    viewModel.updateUsernameRequestsWithVotes()
+                                }
+                            }
+
+                            Status.ERROR -> {
+                                log.info("  error: {}", outputData)
+                                showVoteIndicator(votes!!, usernames!!, resource.status, isQuickVoting)
+                            }
+
+                            Status.CANCELED -> {
+                                log.info("  error: {}", outputData)
+                            }
                         }
+                    } catch (e: Exception) {
+                        log.error("error processing vote information", e)
+                    }
+                    if (resource.status == Status.SUCCESS) {
+                        // remove all observer
+                        liveData.removeObservers(viewLifecycleOwner)
                     }
-                } catch (e: Exception) {
-                    log.error("error processing vote information", e)
                 }
             }
         }
@@ -353,7 +369,6 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
      * Display the toast regarding the last vote
      */
     private fun showVoteIndicator(
-        binding: FragmentUsernameRequestsBinding,
         votes: List<String>,
         usernames: List<String>,
         status: Status,
@@ -365,17 +380,10 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
         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()
         if (isQuickVoting) {
             // show dialog about 1 vote left if necessary
             showQuickVotingResults(usernames)
         }
-        viewModel.currentVote?.let {
-            if (!it.any { usernames.contains(it.username) }) {
-                log.info("vote, there is no match for {}", usernames)
-                //return
-            }
-        }
         val toastText = when (status) {
             Status.SUCCESS -> when (resourceVoteChoice) {
                 is AbstainVoteChoice -> getString(R.string.cancel_submitted, username)
diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
index 6ae20c8508..85a4fce266 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
@@ -73,7 +73,9 @@ 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 org.slf4j.LoggerFactory
 import java.net.InetSocketAddress
+import java.nio.ByteBuffer
 import java.util.UUID
 import javax.inject.Inject
 import kotlin.math.min
@@ -125,7 +127,13 @@ class UsernameRequestsViewModel @Inject constructor(
     private val walletApplication: WalletApplication,
     private val analytics: AnalyticsService
 ): ViewModel() {
-    var currentVote: ArrayList<UsernameVote>? = null
+    companion object {
+        private val log = LoggerFactory.getLogger(UsernameRequestsViewModel::class.java)
+    }
+
+    private val _currentWorkId = MutableStateFlow("")
+    val currentWorkId: StateFlow<String>
+        get() = _currentWorkId
     private val workerJob = SupervisorJob()
     private val viewModelWorkerScope = CoroutineScope(Dispatchers.IO + workerJob)
 
@@ -159,8 +167,6 @@ 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) } }
@@ -183,7 +189,7 @@ class UsernameRequestsViewModel @Inject constructor(
                                     }?.username?.lowercase() ?: list[0].username
                                 }
                             }
-                            UsernameRequestGroupView(prettyUsername, sortedList, isExpanded = isExpanded(normalizedUsername), votes)
+                            UsernameRequestGroupView(prettyUsername, sortedList, isExpanded = isExpanded(prettyUsername), votes)
                         }.filterNot { it.requests.isEmpty() }
                 }
         }.onEach { requests -> _uiState.update { it.copy(filteredUsernameRequests = requests) } }
@@ -264,8 +270,11 @@ class UsernameRequestsViewModel @Inject constructor(
         }
         logEvent(AnalyticsConstants.UsernameVoting.VOTE)
         viewModelScope.launch(Dispatchers.IO) {
+            val workId = getNextWorkId()
+            _currentWorkId.value = workId
             usernameRequestDao.getRequest(requestId)?.let { request ->
                 BroadcastUsernameVotesOperation(walletApplication).create(
+                    workId,
                     listOf(request.username),
                     listOf(request.normalizedLabel),
                     listOf(ResourceVoteChoice.towardsIdentity(Identifier.from(request.identity))),
@@ -273,15 +282,6 @@ class UsernameRequestsViewModel @Inject constructor(
                     isQuickVoting = false
                 ).enqueue()
 
-                //usernameRequestDao.removeApproval(request.username)
-                //usernameRequestDao.update(request.copy(votes = request.votes + keysAmount, isApproved = true))
-                currentVote = arrayListOf(
-                    UsernameVote(
-                        request.normalizedLabel,
-                        request.identity,
-                        UsernameVote.APPROVE
-                    )
-                )
                 _uiState.update { it.copy(voteSubmitted = true) }
             }
         }
@@ -293,26 +293,24 @@ class UsernameRequestsViewModel @Inject constructor(
         }
         logEvent(AnalyticsConstants.UsernameVoting.VOTE_CANCEL)
         viewModelScope.launch(Dispatchers.IO) {
+            val workId = getNextWorkId()
+            _currentWorkId.value = workId
             usernameRequestDao.getRequest(requestId)?.let { request ->
                 BroadcastUsernameVotesOperation(walletApplication).create(
+                    workId,
                     listOf(request.username),
                     listOf(request.normalizedLabel),
                     listOf(ResourceVoteChoice.abstain()),
                     masternodes.value.map { it.votingPrivateKey },
                     isQuickVoting = false
                 ).enqueue()
-                currentVote = arrayListOf(
-                    UsernameVote(
-                        request.normalizedLabel,
-                        "",
-                        UsernameVote.ABSTAIN
-                    )
-                )
                 _uiState.update { it.copy(voteCancelled = true) }
             }
         }
     }
 
+    private suspend fun getNextWorkId() = dashPayConfig.getUsernameVoteCounter().toString(16)
+
     fun voteForAll() {
         if (keysAmount == 0) {
             return
@@ -320,6 +318,8 @@ class UsernameRequestsViewModel @Inject constructor(
 
         viewModelScope.launch {
             withContext(Dispatchers.IO) {
+                val workId = getNextWorkId()
+                _currentWorkId.value = workId
                 val filteredRequests = _uiState.value.filteredUsernameRequests
                 // group the filtered requests according to the normalizedLabel
                 val requestsByUsername = hashMapOf<String, ArrayList<UsernameRequest>>()
@@ -354,6 +354,7 @@ class UsernameRequestsViewModel @Inject constructor(
                 }
 
                 BroadcastUsernameVotesOperation(walletApplication).create(
+                    workId,
                     usernames,
                     normalizedLabels,
                     voteChoices,
@@ -450,6 +451,15 @@ class UsernameRequestsViewModel @Inject constructor(
 
     private var nameCount = 1
     // TODO: remove this when development is completed.
+
+    private fun randomBytes(): ByteArray {
+        val uuid = UUID.randomUUID()
+        val byteBuffer = ByteBuffer.allocate(16)
+        byteBuffer.putLong(uuid.mostSignificantBits)
+        byteBuffer.putLong(uuid.leastSignificantBits)
+        return Sha256Hash.hash(byteBuffer.array())
+    }
+
     fun prepopulateList() {
         nameCount++
         val now = System.currentTimeMillis()// / 1000
@@ -458,13 +468,14 @@ class UsernameRequestsViewModel @Inject constructor(
 
         viewModelScope.launch {
             var name = names[Random.nextInt(0, min(names.size, nameCount))]
+            var identifier = Identifier.from(randomBytes())
             usernameRequestDao.insert(
                 UsernameRequest(
-                    UUID.randomUUID().toString(),
+                    UsernameRequest.getRequestId(name, identifier.toString()),
                     name,
                     Names.normalizeString(name),
                     Random.nextLong(from, now),
-                    Base58.encode(UUID.randomUUID().toString().toByteArray()),
+                    identifier.toString(),
                     "https://www.figma.com/file/hh5juOSdGnNNPijJG1NGTi/DashPay%E3%83%BBIn-" +
                         "process%E3%83%BBAndroid?type=design&node-id=752-11735&mode=design&t=zasn6AKlSwb5NuYS-0",
                     Random.nextInt(0, 15),
@@ -473,13 +484,14 @@ class UsernameRequestsViewModel @Inject constructor(
                 )
             )
             name = names[Random.nextInt(0, min(names.size, nameCount))]
+            identifier = Identifier.from(randomBytes())
             usernameRequestDao.insert(
                 UsernameRequest(
-                    UUID.randomUUID().toString(),
+                    UsernameRequest.getRequestId(name, identifier.toString()),
                     name,
                     Names.normalizeString(name),
                     Random.nextLong(from, now),
-                    Base58.encode(UUID.randomUUID().toString().toByteArray()),
+                    identifier.toString(),
                     null,
                     Random.nextInt(0, 15),
                     Random.nextInt(0, 1),
@@ -487,13 +499,14 @@ class UsernameRequestsViewModel @Inject constructor(
                 )
             )
             name = names[Random.nextInt(0, min(names.size, nameCount))]
+            identifier = Identifier.from(randomBytes())
             usernameRequestDao.insert(
                 UsernameRequest(
-                    UUID.randomUUID().toString(),
+                    UsernameRequest.getRequestId(name, identifier.toString()),
                     name,
                     Names.normalizeString(name),
                     Random.nextLong(from, now),
-                    Base58.encode(UUID.randomUUID().toString().toByteArray()),
+                    identifier.toString(),
                     null,
                     Random.nextInt(0, 15),
                     Random.nextInt(0, 1),
@@ -501,12 +514,13 @@ class UsernameRequestsViewModel @Inject constructor(
                 )
             )
             name = names[Random.nextInt(0, min(names.size, nameCount))]
+            identifier = Identifier.from(randomBytes())
             usernameRequestDao.insert(
                 UsernameRequest(
-                    UUID.randomUUID().toString(),
+                    UsernameRequest.getRequestId(name, identifier.toString()),
                     name,
                     Names.normalizeString(name),                    Random.nextLong(from, now),
-                    Base58.encode(UUID.randomUUID().toString().toByteArray()),
+                    identifier.toString(),
                     "https://twitter.com/ProductHunt/",
                     Random.nextInt(0, 15),
                     Random.nextInt(0, 1),
@@ -514,12 +528,13 @@ class UsernameRequestsViewModel @Inject constructor(
                 )
             )
             name = names[Random.nextInt(0, min(names.size, nameCount))]
+            identifier = Identifier.from(randomBytes())
             usernameRequestDao.insert(
                 UsernameRequest(
-                    UUID.randomUUID().toString(),
+                    UsernameRequest.getRequestId(name, identifier.toString()),
                     name,
                     Names.normalizeString(name),                    Random.nextLong(from, now),
-                    Base58.encode(UUID.randomUUID().toString().toByteArray()),
+                    identifier.toString(),
                     null,
                     Random.nextInt(0, 15),
                     Random.nextInt(0, 1),
@@ -527,13 +542,14 @@ class UsernameRequestsViewModel @Inject constructor(
                 )
             )
             name = names[Random.nextInt(0, min(names.size, nameCount))]
+            identifier = Identifier.from(randomBytes())
             usernameRequestDao.insert(
                 UsernameRequest(
-                    UUID.randomUUID().toString(),
+                    UsernameRequest.getRequestId(name, identifier.toString()),
                     name,
                     Names.normalizeString(name),
                     Random.nextLong(from, now),
-                    Base58.encode(UUID.randomUUID().toString().toByteArray()),
+                    identifier.toString(),
                     null,
                     Random.nextInt(0, 15),
                     Random.nextInt(0, 1),
@@ -541,13 +557,14 @@ class UsernameRequestsViewModel @Inject constructor(
                 )
             )
             name = names[Random.nextInt(0, min(names.size, nameCount))]
+            identifier = Identifier.from(randomBytes())
             usernameRequestDao.insert(
                 UsernameRequest(
-                    UUID.randomUUID().toString(),
+                    UsernameRequest.getRequestId(name, identifier.toString()),
                     name,
                     Names.normalizeString(name),
                     Random.nextLong(from, now),
-                    Base58.encode(UUID.randomUUID().toString().toByteArray()),
+                    identifier.toString(),
                     null,
                     Random.nextInt(0, 15),
                     Random.nextInt(0, 2),
@@ -563,7 +580,10 @@ class UsernameRequestsViewModel @Inject constructor(
         }
         logEvent(AnalyticsConstants.UsernameVoting.BLOCK)
         viewModelScope.launch(Dispatchers.IO) {
+            val workId = getNextWorkId()
+            _currentWorkId.value = workId
             BroadcastUsernameVotesOperation(walletApplication).create(
+                workId,
                 listOf(username),
                 listOf(username),
                 listOf(ResourceVoteChoice.lock()),
@@ -571,13 +591,6 @@ class UsernameRequestsViewModel @Inject constructor(
                 isQuickVoting = false
             ).enqueue()
 
-            currentVote = arrayListOf(
-                UsernameVote(
-                    Names.normalizeString(username),
-                    "",
-                    UsernameVote.LOCK
-                )
-            )
             _uiState.update { it.copy(voteSubmitted = true) }
         }
     }
@@ -665,16 +678,18 @@ class UsernameRequestsViewModel @Inject constructor(
         }
     }
 
-    fun updateBroadcastVotesTimestamp() {
-        BroadcastUsernameVotesOperation.lastTimestamp = System.currentTimeMillis()
-    }
-
     fun updateUsernameRequestsWithVotes() {
         viewModelScope.launch(Dispatchers.IO) {
             platformSyncService.updateUsernameRequestsWithVotes()
         }
     }
 
+    fun updateUsernameRequestWithVotes(username: String) {
+        viewModelScope.launch(Dispatchers.IO) {
+            platformSyncService.updateUsernameRequestWithVotes(username)
+        }
+    }
+
     fun removeMasternode(masternodeIp: String) {
         val masternodeList = masternodeListManager.masternodeList
         val masternode = masternodeList.getMNByAddress(InetSocketAddress(masternodeIp, Constants.NETWORK_PARAMETERS.port))
@@ -693,4 +708,6 @@ class UsernameRequestsViewModel @Inject constructor(
             usernameVoteDao.countVotes(username) == UsernameVote.MAX_VOTES - votesLeft
         }
     }
+
+    fun voteObserver(workId: String) = BroadcastUsernameVotesOperation.operationStatus(walletApplication, workId, analytics)
 }
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 01e268caaa..cb59a1c2e1 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupAdapter.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupAdapter.kt
@@ -102,8 +102,8 @@ class UsernameRequestGroupViewHolder(
         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.linkBadge.isVisible = !hasMoreThanOneRequest && option.requests.first().link != null
+        binding.linkIncluded.isVisible = !hasMoreThanOneRequest && option.requests.first().link != null
 
         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()))

From 20c3d0d26b0dbf7e014e0b7569c80147905a5547 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Thu, 5 Dec 2024 07:50:26 -0800
Subject: [PATCH 3/4] feat(dashpay): support removing masternode key used for
 voting (#1330)

* feat: show delete button and increase its padding

* feat: show delete button only for imported masternode keys

* chore: add license ot AddVotingKeysFragment

* fix: make the delete MN button larger
---
 wallet/res/layout/view_masternode_ip.xml      | 21 +++++++++-------
 .../ui/username/AddVotingKeysFragment.kt      | 25 ++++++++++++++++---
 .../UsernameRequestDetailsFragment.kt         |  2 +-
 .../ui/username/UsernameRequestsViewModel.kt  |  6 ++++-
 .../ui/username/adapters/IPAddressAdapter.kt  | 23 +++++++++++------
 5 files changed, 54 insertions(+), 23 deletions(-)

diff --git a/wallet/res/layout/view_masternode_ip.xml b/wallet/res/layout/view_masternode_ip.xml
index e5ce2e6fc4..1b780ac5bc 100644
--- a/wallet/res/layout/view_masternode_ip.xml
+++ b/wallet/res/layout/view_masternode_ip.xml
@@ -48,16 +48,19 @@
             tools:text="XXX.XXX.XX.X1" />
     </LinearLayout>
 
-    <Button
+    <FrameLayout
         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"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingHorizontal="20dp"
+        android:paddingVertical="12dp"
+        android:layout_marginEnd="5dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent" />
-
+        app:layout_constraintBottom_toBottomOf="parent" >
+        <ImageView
+            android:layout_width="11dp"
+            android:layout_height="11dp"
+            android:src="@drawable/ic_x" />
+    </FrameLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ 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 804853398a..099fc1d349 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/AddVotingKeysFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/AddVotingKeysFragment.kt
@@ -1,8 +1,23 @@
+/*
+ * Copyright 2023 Dash Core Group.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 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
@@ -10,6 +25,7 @@ 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.adapters.MasternodeEntry
 import de.schildbach.wallet.ui.username.utils.votingViewModels
 import de.schildbach.wallet_test.R
 import de.schildbach.wallet_test.databinding.FragmentAddVotingKeysBinding
@@ -21,12 +37,12 @@ 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>()
@@ -63,7 +79,8 @@ class AddVotingKeysFragment : Fragment(R.layout.fragment_add_voting_keys) {
             log.info("updating masternode list: {}", it.map { mn -> mn.address })
             adapter.submitList(
                 it.map { masternode ->
-                    masternode.address
+                    val canDelete = viewModel.isImported(masternode)
+                    MasternodeEntry(masternode.address, canDelete)
                 }
             )
             binding.votesCastText.text = getString(R.string.multiple_votes_cast, it.size)
@@ -78,7 +95,7 @@ class AddVotingKeysFragment : Fragment(R.layout.fragment_add_voting_keys) {
         lifecycleScope.launch {
             val isFirstTime = withContext(Dispatchers.IO) { viewModel.isFirstTimeVoting() }
             binding.dontAskAgainButton.isVisible = !isFirstTime
-            viewModel.setSecondTimeVoting()
+            withContext(Dispatchers.IO) { 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 c075292cf2..8a2827652b 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestDetailsFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestDetailsFragment.kt
@@ -33,7 +33,7 @@ class UsernameRequestDetailsFragment : Fragment(R.layout.fragment_username_reque
             findNavController().popBackStack()
         }
 
-        viewModel.selectedUsernameRequest.observe(viewLifecycleOwner) { request ->
+        viewModel.selectedUsernameRequestId.observe(viewLifecycleOwner) { request ->
             binding.username.text = request.username
             binding.identity.text = request.identity
 
diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
index 85a4fce266..e792516c60 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
@@ -144,7 +144,7 @@ class UsernameRequestsViewModel @Inject constructor(
     val filterState: StateFlow<FiltersUIState> = _filterState.asStateFlow()
 
     private val _selectedUsernameRequestId = MutableStateFlow<String?>(null)
-    val selectedUsernameRequest: Flow<UsernameRequest> = _selectedUsernameRequestId
+    val selectedUsernameRequestId: Flow<UsernameRequest> = _selectedUsernameRequestId
         .filterNotNull()
         .distinctUntilChanged()
         .flatMapLatest { id ->
@@ -710,4 +710,8 @@ class UsernameRequestsViewModel @Inject constructor(
     }
 
     fun voteObserver(workId: String) = BroadcastUsernameVotesOperation.operationStatus(walletApplication, workId, analytics)
+
+    suspend fun isImported(masternode: ImportedMasternodeKey): Boolean {
+        return importedMasternodeKeyDao.contains(masternode.proTxHash)
+    }
 }
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 d81daef652..02855e686e 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/adapters/IPAddressAdapter.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/adapters/IPAddressAdapter.kt
@@ -19,18 +19,24 @@ package de.schildbach.wallet.ui.username.adapters
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.core.view.isVisible
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import de.schildbach.wallet_test.databinding.ViewMasternodeIpBinding
 
-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
+data class MasternodeEntry(
+    val ipAddress: String,
+    val canDelete: Boolean
+)
+
+class IPAddressAdapter(private val deleteClickListener: (String) -> Unit) : ListAdapter<MasternodeEntry, IPAddressViewHolder>(DiffCallback()) {
+    class DiffCallback : DiffUtil.ItemCallback<MasternodeEntry>() {
+        override fun areItemsTheSame(oldItem: MasternodeEntry, newItem: MasternodeEntry): Boolean {
+            return oldItem.ipAddress == newItem.ipAddress
         }
 
-        override fun areContentsTheSame(oldItem: String, newItem: String): Boolean {
+        override fun areContentsTheSame(oldItem: MasternodeEntry, newItem: MasternodeEntry): Boolean {
             return oldItem == newItem
         }
     }
@@ -52,10 +58,11 @@ class IPAddressAdapter(private val deleteClickListener: (String) -> Unit) : List
 }
 
 class IPAddressViewHolder(val binding: ViewMasternodeIpBinding, private val deleteClickListener: (String) -> Unit): RecyclerView.ViewHolder(binding.root) {
-    fun bind(ipAddress: String) {
-        binding.ipAddress.text = ipAddress
+    fun bind(masternodeEntry: MasternodeEntry) {
+        binding.ipAddress.text = masternodeEntry.ipAddress
         binding.removeMasternode.setOnClickListener {
-            deleteClickListener.invoke(ipAddress)
+            deleteClickListener.invoke(masternodeEntry.ipAddress)
         }
+        binding.removeMasternode.isVisible = masternodeEntry.canDelete
     }
 }

From 80c8cd0fdae1a5ebe4c79fcefe9d136f01a2f623 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Mon, 30 Dec 2024 05:49:00 -0800
Subject: [PATCH 4/4] feat(voting): improve voting button and grouping by date
 (#1335)

* feat: add voting period ends improvements

* feat: use thumbs up/down logos instead

* fix: crash on empty list

* fix: update sorting to match user selection

* feat: improve sorting

* fix: prevent crash after view destroyed

* chore: cleanup and add license
---
 wallet/res/drawable/ic_thumb_down_red.xml     |  25 +++
 wallet/res/drawable/ic_thumb_down_white.xml   |  25 +++
 wallet/res/drawable/ic_thumb_up_blue.xml      |  25 +++
 wallet/res/drawable/ic_thumb_up_white.xml     |  25 +++
 .../dialog_username_request_filters.xml       |  28 +++
 .../fragment_username_request_details.xml     |  24 +++
 .../res/layout/username_request_date_view.xml |  37 ++++
 .../layout/username_request_group_view.xml    |  57 ++++--
 wallet/res/layout/username_request_view.xml   |  25 ++-
 wallet/res/navigation/nav_voting.xml          |   4 +
 wallet/res/values/strings-dashpay.xml         |  25 +--
 .../wallet/database/dao/UsernameRequestDao.kt |   3 +
 .../UsernameRequestDetailsFragment.kt         |   8 +
 .../username/UsernameRequestFilterDialog.kt   |  50 +++++-
 .../ui/username/UsernameRequestsFragment.kt   |  42 ++++-
 .../ui/username/UsernameRequestsViewModel.kt  |  59 +++++-
 .../adapters/UsernameRequestGroupAdapter.kt   | 168 +++++++++++++-----
 .../adapters/UsernameRequestGroupView.kt      |  22 ++-
 .../voting/RequestUserNameViewModel.kt        |   6 +
 .../voting/VotingRequestDetailsFragment.kt    |  65 ++++---
 20 files changed, 594 insertions(+), 129 deletions(-)
 create mode 100644 wallet/res/drawable/ic_thumb_down_red.xml
 create mode 100644 wallet/res/drawable/ic_thumb_down_white.xml
 create mode 100644 wallet/res/drawable/ic_thumb_up_blue.xml
 create mode 100644 wallet/res/drawable/ic_thumb_up_white.xml
 create mode 100644 wallet/res/layout/username_request_date_view.xml

diff --git a/wallet/res/drawable/ic_thumb_down_red.xml b/wallet/res/drawable/ic_thumb_down_red.xml
new file mode 100644
index 0000000000..3ca1632e87
--- /dev/null
+++ b/wallet/res/drawable/ic_thumb_down_red.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright 2024 Dash Core Group.
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="17dp"
+    android:height="16dp"
+    android:viewportWidth="17"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M14.123,0.744H3.823C2.813,0.744 1.953,1.434 1.733,2.454L0.763,8.554C0.663,9.164 0.843,9.784 1.243,10.254C1.643,10.724 2.233,10.994 2.853,10.994H6.103V12.464C6.083,13.184 6.293,13.874 6.713,14.464C7.063,14.964 7.623,15.254 8.223,15.254C8.273,15.254 8.313,15.254 8.363,15.254C9.013,15.204 9.583,14.824 9.883,14.244L11.913,10.214C11.974,10.084 12.113,10.004 12.253,10.004H14.144C15.314,10.004 16.264,9.054 16.264,7.884V2.864C16.264,1.694 15.314,0.744 14.144,0.744H14.123ZM10.774,9.644L8.743,13.674C8.603,13.944 8.353,13.994 8.253,14.004C8.143,14.004 7.893,14.004 7.723,13.754C7.463,13.374 7.323,12.934 7.333,12.474L7.353,10.374C7.353,10.204 7.293,10.044 7.173,9.924C7.053,9.804 6.893,9.734 6.733,9.734H2.853C2.593,9.734 2.363,9.624 2.193,9.434C2.033,9.244 1.953,8.984 1.993,8.734L2.953,2.674C3.043,2.274 3.403,1.984 3.813,1.984H11.253V9.074C11.054,9.224 10.884,9.404 10.774,9.634V9.644ZM14.983,7.874C14.983,8.354 14.594,8.744 14.113,8.744H12.503V1.994H14.113C14.594,1.994 14.983,2.384 14.983,2.864V7.884V7.874Z"
+      android:fillColor="#EA3943"/>
+</vector>
diff --git a/wallet/res/drawable/ic_thumb_down_white.xml b/wallet/res/drawable/ic_thumb_down_white.xml
new file mode 100644
index 0000000000..8156ea16af
--- /dev/null
+++ b/wallet/res/drawable/ic_thumb_down_white.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright 2024 Dash Core Group.
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="17dp"
+    android:height="16dp"
+    android:viewportWidth="17"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M14.123,0.744H3.823C2.813,0.744 1.953,1.434 1.733,2.454L0.763,8.554C0.663,9.164 0.843,9.784 1.243,10.254C1.643,10.724 2.233,10.994 2.853,10.994H6.103V12.464C6.083,13.184 6.293,13.874 6.713,14.464C7.063,14.964 7.623,15.254 8.223,15.254C8.273,15.254 8.313,15.254 8.363,15.254C9.013,15.204 9.583,14.824 9.883,14.244L11.913,10.214C11.974,10.084 12.113,10.004 12.253,10.004H14.144C15.314,10.004 16.264,9.054 16.264,7.884V2.864C16.264,1.694 15.314,0.744 14.144,0.744H14.123ZM10.774,9.644L8.743,13.674C8.603,13.944 8.353,13.994 8.253,14.004C8.143,14.004 7.893,14.004 7.723,13.754C7.463,13.374 7.323,12.934 7.333,12.474L7.353,10.374C7.353,10.204 7.293,10.044 7.173,9.924C7.053,9.804 6.893,9.734 6.733,9.734H2.853C2.593,9.734 2.363,9.624 2.193,9.434C2.033,9.244 1.953,8.984 1.993,8.734L2.953,2.674C3.043,2.274 3.403,1.984 3.813,1.984H11.253V9.074C11.054,9.224 10.884,9.404 10.774,9.634V9.644ZM14.983,7.874C14.983,8.354 14.594,8.744 14.113,8.744H12.503V1.994H14.113C14.594,1.994 14.983,2.384 14.983,2.864V7.884V7.874Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/wallet/res/drawable/ic_thumb_up_blue.xml b/wallet/res/drawable/ic_thumb_up_blue.xml
new file mode 100644
index 0000000000..55dec1e2d7
--- /dev/null
+++ b/wallet/res/drawable/ic_thumb_up_blue.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright 2024 Dash Core Group.
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="17dp"
+    android:height="16dp"
+    android:viewportWidth="17"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M2.877,15.256H13.177C14.186,15.256 15.047,14.566 15.267,13.546L16.236,7.446C16.337,6.836 16.156,6.216 15.757,5.746C15.356,5.276 14.767,5.006 14.146,5.006H10.896V3.536C10.917,2.816 10.707,2.126 10.286,1.536C9.937,1.036 9.377,0.746 8.777,0.746C8.727,0.746 8.687,0.746 8.637,0.746C7.987,0.796 7.417,1.176 7.117,1.756L5.087,5.786C5.027,5.916 4.887,5.996 4.747,5.996H2.857C1.687,5.996 0.737,6.946 0.737,8.116V13.136C0.737,14.306 1.687,15.256 2.857,15.256H2.877ZM6.227,6.356L8.257,2.326C8.397,2.056 8.647,2.006 8.747,1.996C8.857,1.996 9.107,1.996 9.277,2.246C9.537,2.626 9.677,3.066 9.667,3.526L9.647,5.626C9.647,5.796 9.707,5.956 9.827,6.076C9.947,6.196 10.106,6.266 10.267,6.266H14.146C14.406,6.266 14.637,6.376 14.807,6.566C14.967,6.756 15.047,7.016 15.007,7.266L14.047,13.326C13.957,13.726 13.597,14.016 13.186,14.016H5.747V6.926C5.947,6.776 6.117,6.596 6.227,6.366V6.356ZM2.017,8.126C2.017,7.646 2.407,7.256 2.887,7.256H4.497V14.006H2.887C2.407,14.006 2.017,13.616 2.017,13.136V8.116V8.126Z"
+      android:fillColor="#008DE4"/>
+</vector>
diff --git a/wallet/res/drawable/ic_thumb_up_white.xml b/wallet/res/drawable/ic_thumb_up_white.xml
new file mode 100644
index 0000000000..a22d1332fc
--- /dev/null
+++ b/wallet/res/drawable/ic_thumb_up_white.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright 2024 Dash Core Group.
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="17dp"
+    android:height="16dp"
+    android:viewportWidth="17"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M2.877,15.256H13.177C14.186,15.256 15.047,14.566 15.267,13.546L16.236,7.446C16.337,6.836 16.156,6.216 15.757,5.746C15.356,5.276 14.767,5.006 14.146,5.006H10.896V3.536C10.917,2.816 10.707,2.126 10.286,1.536C9.937,1.036 9.377,0.746 8.777,0.746C8.727,0.746 8.687,0.746 8.637,0.746C7.987,0.796 7.417,1.176 7.117,1.756L5.087,5.786C5.027,5.916 4.887,5.996 4.747,5.996H2.857C1.687,5.996 0.737,6.946 0.737,8.116V13.136C0.737,14.306 1.687,15.256 2.857,15.256H2.877ZM6.227,6.356L8.257,2.326C8.397,2.056 8.647,2.006 8.747,1.996C8.857,1.996 9.107,1.996 9.277,2.246C9.537,2.626 9.677,3.066 9.667,3.526L9.647,5.626C9.647,5.796 9.707,5.956 9.827,6.076C9.947,6.196 10.106,6.266 10.267,6.266H14.146C14.406,6.266 14.637,6.376 14.807,6.566C14.967,6.756 15.047,7.016 15.007,7.266L14.047,13.326C13.957,13.726 13.597,14.016 13.186,14.016H5.747V6.926C5.947,6.776 6.117,6.596 6.227,6.366V6.356ZM2.017,8.126C2.017,7.646 2.407,7.256 2.887,7.256H4.497V14.006H2.887C2.407,14.006 2.017,13.616 2.017,13.136V8.116V8.126Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/wallet/res/layout/dialog_username_request_filters.xml b/wallet/res/layout/dialog_username_request_filters.xml
index 7f5c0b87d7..6b25ae8c80 100644
--- a/wallet/res/layout/dialog_username_request_filters.xml
+++ b/wallet/res/layout/dialog_username_request_filters.xml
@@ -66,12 +66,40 @@
         android:layout_marginTop="5dp"
         app:layout_constraintTop_toBottomOf="@id/header">
 
+
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
             android:orientation="vertical"
             android:paddingHorizontal="15dp">
+            <TextView
+                android:id="@+id/group_by_label"
+                style="@style/Caption.Medium.Tertiary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="15dp"
+                android:text="@string/group_by" />
+
+            <androidx.cardview.widget.CardView
+                android:id="@+id/group_by_card"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                app:cardBackgroundColor="@color/background_secondary"
+                app:cardCornerRadius="10dp"
+                app:cardElevation="0dp">
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/group_by_filter"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:nestedScrollingEnabled="false"
+                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                    tools:itemCount="2"
+                    tools:listitem="@layout/radiobutton_row" />
+            </androidx.cardview.widget.CardView>
 
             <TextView
                 android:id="@+id/sort_by_label"
diff --git a/wallet/res/layout/fragment_username_request_details.xml b/wallet/res/layout/fragment_username_request_details.xml
index ee8f7b9517..8da8332864 100644
--- a/wallet/res/layout/fragment_username_request_details.xml
+++ b/wallet/res/layout/fragment_username_request_details.xml
@@ -114,6 +114,30 @@
                 android:layout_marginTop="2dp"
                 tools:text="90f95ff7bc2438a748dc8470255b888b2a9ea6837bf518d018dc3d6cddf698" />
         </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="14dp"
+            android:orientation="vertical"
+            android:paddingHorizontal="15dp"
+            android:paddingVertical="10dp"
+            android:background="@drawable/rounded_background"
+            android:theme="@style/GrayPanelBackground">
+
+            <TextView
+                style="@style/Overline.Secondary"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/voting_period" />
+
+            <TextView
+                android:id="@+id/voting_period"
+                style="@style/Body2"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                tools:text="2024 Dec 1 to 2014 Dec 15" />
+        </LinearLayout>
     </LinearLayout>
 
     <FrameLayout
diff --git a/wallet/res/layout/username_request_date_view.xml b/wallet/res/layout/username_request_date_view.xml
new file mode 100644
index 0000000000..7991509a40
--- /dev/null
+++ b/wallet/res/layout/username_request_date_view.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2024 Dash Core Group.
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="36dp"
+    tools:context="de.schildbach.wallet.ui.username.adapters.DateViewHolder">
+
+    <TextView
+        android:id="@+id/date_heading"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textAlignment="center"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:maxLines="1"
+        android:ellipsize="middle"
+        tools:text="Voting period ends in 14 days"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/wallet/res/layout/username_request_group_view.xml b/wallet/res/layout/username_request_group_view.xml
index 7d21e9eab8..e0e284c1eb 100644
--- a/wallet/res/layout/username_request_group_view.xml
+++ b/wallet/res/layout/username_request_group_view.xml
@@ -62,7 +62,7 @@
         android:id="@+id/link_included"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="link included"
+        android:text="@string/link_included"
         style="@style/Caption.Blue"
         app:layout_constraintTop_toTopOf="@id/link_badge"
         app:layout_constraintStart_toEndOf="@id/link_badge" />
@@ -79,32 +79,61 @@
         app:layout_constraintBottom_toBottomOf="@id/username"
         tools:text="4 requests" />
 
-    <Button
-        android:id="@+id/blocks_button"
+    <LinearLayout
+        android:id="@+id/blocks_button_container"
         style="@style/Button.Primary.Large.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"
+        android:layout_marginVertical="5dp"
+        app:layout_constraintEnd_toStartOf="@id/approvals_button_container"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        tools:text="1\nBlock"
-        />
+        tools:text="2" >
+        <TextView
+            android:id="@+id/blocks_button_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/system_red"
+            android:textSize="12sp"
+            tools:text="2"
+            />
+        <ImageView
+            android:id="@+id/blocks_button_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
+            android:src="@drawable/ic_thumb_down_red"
+            />
+    </LinearLayout>
 
-    <Button
-        android:id="@+id/approvals_button"
+    <LinearLayout
+        android:id="@+id/approvals_button_container"
         style="@style/Button.Primary.Large.LightBlue"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
+        android:layout_marginHorizontal="8dp"
         android:layout_marginVertical="5dp"
-        android:layout_marginHorizontal="10dp"
-        app:layout_constraintEnd_toStartOf="@id/chevron"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        tools:text="3\nApprovals"
-        />
-
+        tools:text="2" >
+        <TextView
+            android:id="@+id/approvals_button_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/dash_blue"
+            android:textSize="12sp"
+            tools:text="2"
+            />
+        <ImageView
+            android:id="@+id/approvals_button_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
+            android:src="@drawable/ic_thumb_up_blue"
+            />
+    </LinearLayout>
     <ImageView
         android:id="@+id/chevron"
         android:layout_width="11dp"
diff --git a/wallet/res/layout/username_request_view.xml b/wallet/res/layout/username_request_view.xml
index 884bca2550..0e413d31e7 100644
--- a/wallet/res/layout/username_request_view.xml
+++ b/wallet/res/layout/username_request_view.xml
@@ -63,13 +63,13 @@
             android:id="@+id/link_included"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="link included"
+            android:text="@string/link_included"
             style="@style/Caption.Blue"
             app:layout_constraintTop_toTopOf="@id/link_badge"
             app:layout_constraintStart_toEndOf="@id/link_badge" />
 
-        <Button
-            android:id="@+id/approvals_button"
+        <LinearLayout
+            android:id="@+id/approvals_button_container"
             style="@style/Button.Primary.Large.LightBlue"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
@@ -78,8 +78,23 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/info"
             app:layout_constraintBottom_toBottomOf="@id/info"
-            tools:text="2\nApprovals"
-            />
+            tools:text="2" >
+            <TextView
+                android:id="@+id/approvals_button_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/dash_blue"
+                android:textSize="12sp"
+                tools:text="2"
+                />
+            <ImageView
+                android:id="@+id/approvals_button_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="4dp"
+                android:src="@drawable/ic_thumb_up_blue"
+                />
+        </LinearLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </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 f05381875a..7a557d922c 100644
--- a/wallet/res/navigation/nav_voting.xml
+++ b/wallet/res/navigation/nav_voting.xml
@@ -74,6 +74,10 @@
             android:name="requestId"
             app:argType="string" />
 
+        <argument
+            android:name="startDate"
+            app:argType="long" />
+
         <action
             android:id="@+id/details_to_votingKeyInput"
             app:destination="@id/votingKeyInputFragment"
diff --git a/wallet/res/values/strings-dashpay.xml b/wallet/res/values/strings-dashpay.xml
index 1d095b7dc0..148e4af5dc 100644
--- a/wallet/res/values/strings-dashpay.xml
+++ b/wallet/res/values/strings-dashpay.xml
@@ -280,8 +280,15 @@
     <string name="only_duplicates">Only duplicates</string>
     <string name="only_links">Only requests with links</string>
     <string name="only_links_short">With links</string>
-    <string name="date">Date: %s</string>
+    <string name="date">Request Date: %s</string>
     <string name="votes">Votes: %s</string>
+    <string name="voting_ends">Voting ends: %s</string>
+
+    <string-array name="usernames_group_by_options">
+        <item>None</item>
+        <item>Soonest first</item>
+        <item>Latest first</item>
+    </string-array>
 
     <string-array name="usernames_sort_by_options">
         <item>New to old</item>
@@ -296,16 +303,6 @@
         <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>
     <string name="request_username">Request Username</string>
@@ -452,4 +449,10 @@
     <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>
+    <string name="voting_period">Voting Period</string>
+    <string name="voting_period_ends_in_days">Voting ends in %d days</string>
+    <string name="voting_period_ends_today">Voting ends today</string>
+    <string name="voting_period_ends_tomorrow">Voting ends tomorrow</string>
+    <string name="link_included">link included</string>
+    <string name="group_by">Group by</string>
 </resources>
diff --git a/wallet/src/de/schildbach/wallet/database/dao/UsernameRequestDao.kt b/wallet/src/de/schildbach/wallet/database/dao/UsernameRequestDao.kt
index b42a0c7092..6d8ac770ea 100644
--- a/wallet/src/de/schildbach/wallet/database/dao/UsernameRequestDao.kt
+++ b/wallet/src/de/schildbach/wallet/database/dao/UsernameRequestDao.kt
@@ -35,6 +35,9 @@ interface UsernameRequestDao {
     @Query("SELECT * FROM username_requests WHERE requestId = :requestId")
     suspend fun getRequest(requestId: String): UsernameRequest?
 
+    @Query("SELECT * FROM username_requests WHERE normalizedLabel = :normalizedLabel")
+    suspend fun getRequestsByNormalizedLabel(normalizedLabel: String): List<UsernameRequest>
+
     @Query("SELECT * FROM username_requests WHERE requestId = :requestId")
     fun observeRequest(requestId: String): Flow<UsernameRequest?>
 
diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestDetailsFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestDetailsFragment.kt
index 8a2827652b..fa51aa890c 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestDetailsFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestDetailsFragment.kt
@@ -1,6 +1,7 @@
 package de.schildbach.wallet.ui.username
 
 import android.os.Bundle
+import android.text.format.DateFormat
 import android.view.View
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
@@ -92,6 +93,13 @@ class UsernameRequestDetailsFragment : Fragment(R.layout.fragment_username_reque
                     }
                 }
             }
+            val votingPeriod = args.startDate.let { startTime ->
+                val endTime = startTime + UsernameRequest.VOTING_PERIOD_MILLIS
+                val dateFormat = DateFormat.getMediumDateFormat(requireContext())
+                String.format("%s - %s", dateFormat.format(startTime), dateFormat.format(endTime))
+            }
+
+            binding.votingPeriod.text = votingPeriod
         }
 
         viewModel.selectUsernameRequest(args.requestId)
diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestFilterDialog.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestFilterDialog.kt
index 7b38e7feb6..0913f2f4be 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestFilterDialog.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestFilterDialog.kt
@@ -29,6 +29,16 @@ import org.dash.wallet.common.ui.radio_group.RadioGroupAdapter
 import org.dash.wallet.common.ui.radio_group.setupRadioGroup
 import org.dash.wallet.common.ui.viewBinding
 
+enum class UsernameGroupOption {
+    VotingPeriodNone,
+    VotingPeriodSoonest,
+    VotingPeriodLatest;
+
+    companion object {
+        val defaultOption = VotingPeriodSoonest
+    }
+}
+
 enum class UsernameSortOption {
     DateDescending,
     DateAscending,
@@ -36,7 +46,7 @@ enum class UsernameSortOption {
     VotesAscending;
 
     companion object {
-        val defaultOption = DateDescending
+        val defaultOption = DateAscending
     }
 }
 
@@ -60,6 +70,7 @@ class UsernameRequestFilterDialog : OffsetDialogFragment(R.layout.dialog_usernam
 
     private lateinit var typeOptionsAdapter: RadioGroupAdapter
     private lateinit var sortByOptionsAdapter: RadioGroupAdapter
+    private lateinit var groupByOptionsAdapter: RadioGroupAdapter
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -81,17 +92,37 @@ class UsernameRequestFilterDialog : OffsetDialogFragment(R.layout.dialog_usernam
     }
 
     private fun setupSortByOptions() {
-        val optionNames = binding.root.resources.getStringArray(R.array.usernames_sort_by_options).mapIndexed { i, it ->
+
+        val sortByOptionNames = binding.root.resources.getStringArray(R.array.usernames_sort_by_options).mapIndexed { i, it ->
             IconifiedViewItem(getString(if (i < 2) R.string.date else R.string.votes, it))
         }
 
+        val groupByOptionNames = binding.root.resources.getStringArray(R.array.usernames_group_by_options).mapIndexed { i, it ->
+            IconifiedViewItem(
+                if (i == 0) {
+                    it
+                } else {
+                    getString(R.string.voting_ends, it)
+                }
+            )
+        }
+
+        val groupOption = viewModel.filterState.value.groupByOption
+        val initialGroupIndex = UsernameGroupOption.entries.indexOf(groupOption)
+        val groupAdapter = RadioGroupAdapter(initialGroupIndex) { _, _ ->
+            checkResetButton()
+        }
+        binding.groupByFilter.setupRadioGroup(groupAdapter)
+        groupAdapter.submitList(groupByOptionNames)
+        groupByOptionsAdapter = groupAdapter
+
         val sortOption = viewModel.filterState.value.sortByOption
-        val initialIndex = UsernameSortOption.values().indexOf(sortOption)
+        val initialIndex = UsernameSortOption.entries.indexOf(sortOption)
         val adapter = RadioGroupAdapter(initialIndex) { _, _ ->
             checkResetButton()
         }
         binding.sortByFilter.setupRadioGroup(adapter)
-        adapter.submitList(optionNames)
+        adapter.submitList(sortByOptionNames)
         sortByOptionsAdapter = adapter
     }
 
@@ -116,18 +147,20 @@ class UsernameRequestFilterDialog : OffsetDialogFragment(R.layout.dialog_usernam
     }
 
     private fun applyFilters() {
-        val sortByOption = UsernameSortOption.values()[sortByOptionsAdapter.selectedIndex]
-        val typeOption = UsernameTypeOption.values()[typeOptionsAdapter.selectedIndex]
+        val groupByOption = UsernameGroupOption.entries[groupByOptionsAdapter.selectedIndex]
+        val sortByOption = UsernameSortOption.entries[sortByOptionsAdapter.selectedIndex]
+        val typeOption = UsernameTypeOption.entries[typeOptionsAdapter.selectedIndex]
         val onlyDuplicates = binding.onlyDuplicatesCheckbox.isChecked
         val onlyLinks = binding.onlyLinksCheckbox.isChecked
 
-        viewModel.applyFilters(sortByOption, typeOption, onlyDuplicates, onlyLinks)
+        viewModel.applyFilters(groupByOption, sortByOption, typeOption, onlyDuplicates, onlyLinks)
     }
 
     private fun checkResetButton() {
         var isEnabled = false
 
-        if (sortByOptionsAdapter.selectedIndex != UsernameSortOption.defaultOption.ordinal ||
+        if (groupByOptionsAdapter.selectedIndex != UsernameGroupOption.defaultOption.ordinal ||
+            sortByOptionsAdapter.selectedIndex != UsernameSortOption.defaultOption.ordinal ||
             typeOptionsAdapter.selectedIndex != UsernameTypeOption.defaultOption.ordinal
         ) {
             isEnabled = true
@@ -145,6 +178,7 @@ class UsernameRequestFilterDialog : OffsetDialogFragment(R.layout.dialog_usernam
     }
 
     private fun resetFilters() {
+        groupByOptionsAdapter.selectedIndex = UsernameGroupOption.defaultOption.ordinal
         sortByOptionsAdapter.selectedIndex = UsernameSortOption.defaultOption.ordinal
         typeOptionsAdapter.selectedIndex = UsernameTypeOption.defaultOption.ordinal
         binding.onlyDuplicatesCheckbox.isChecked = true
diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
index 0bda5358da..e0f9e83608 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
@@ -23,6 +23,7 @@ import android.view.ViewTreeObserver
 import androidx.core.view.isVisible
 import androidx.core.widget.doOnTextChanged
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -31,14 +32,18 @@ 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.main.HistoryRowView
 import de.schildbach.wallet.ui.username.adapters.UsernameRequestGroupAdapter
 import de.schildbach.wallet.ui.username.adapters.UsernameRequestGroupView
+import de.schildbach.wallet.ui.username.adapters.UsernameRequestRowView
 import de.schildbach.wallet.ui.username.utils.votingViewModels
 import de.schildbach.wallet.ui.username.voting.OneVoteLeftDialogFragment
 import de.schildbach.wallet_test.R
 import de.schildbach.wallet_test.databinding.FragmentUsernameRequestsBinding
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.dash.wallet.common.services.analytics.AnalyticsConstants
 import org.dash.wallet.common.ui.dialogs.AdaptiveDialog
 import org.dash.wallet.common.ui.viewBinding
@@ -50,6 +55,8 @@ 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
+import java.time.Instant
+import java.time.ZoneId
 
 @AndroidEntryPoint
 class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
@@ -79,7 +86,10 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
                 lifecycleScope.launch {
                     if (request.requestId != "") {
                         viewModel.logEvent(AnalyticsConstants.UsernameVoting.DETAILS)
-                        safeNavigate(UsernameRequestsFragmentDirections.requestsToDetails(request.requestId))
+                        val votingStartDate = withContext(Dispatchers.IO) {
+                            viewModel.getVotingStartDate(request.normalizedLabel)
+                        }
+                        safeNavigate(UsernameRequestsFragmentDirections.requestsToDetails(request.requestId, votingStartDate))
                     } else {
                         performVote(request)
                     }
@@ -326,7 +336,18 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
         val list = filterByQuery(itemList, binding.search.text.toString())
         val layoutManager = binding.requestGroups.layoutManager as LinearLayoutManager
         val scrollPosition = layoutManager.findFirstVisibleItemPosition()
-        adapter.submitList(list)
+        val listForAdapter = if (list.isNotEmpty() && viewModel.filterState.value.groupByOption != UsernameGroupOption.VotingPeriodNone) {
+            list.groupBy {
+                Instant.ofEpochMilli(it.votingEndDate).atZone(ZoneId.systemDefault()).toLocalDate()
+            }.map {
+                val outList = mutableListOf<UsernameRequestRowView>()
+                outList.add(UsernameRequestRowView(it.key))
+                outList.apply { addAll(it.value) }
+            }.reduce { acc, list -> acc.apply { addAll(list) } }
+        } else {
+            requests
+        }
+        adapter.submitList(listForAdapter)
         binding.requestGroups.scrollToPosition(scrollPosition)
     }
 
@@ -430,14 +451,17 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
             .start()
 
         viewModel.voteHandled()
+        // replace with our custom toast?
         binding.voteSubmittedIndicator.postDelayed({
-            binding.voteSubmittedIndicator.animate()
-                .alpha(0f)
-                .setDuration(animationDuration)
-                .withEndAction {
-                    binding.voteSubmittedIndicator.isVisible = false
-                }
-                .start()
+            if (isAdded && viewLifecycleOwner.lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)) {
+                binding.voteSubmittedIndicator.animate()
+                    .alpha(0f)
+                    .setDuration(animationDuration)
+                    .withEndAction {
+                        binding.voteSubmittedIndicator.isVisible = false
+                    }
+                    .start()
+            }
         }, 3000L)
     }
 
diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
index e792516c60..0e114c1c01 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
@@ -41,6 +41,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.filterNot
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOf
@@ -56,13 +57,8 @@ import org.bitcoinj.core.Base58
 import org.bitcoinj.core.DumpedPrivateKey
 import org.bitcoinj.core.ECKey
 import org.bitcoinj.core.KeyId
-import org.bitcoinj.core.MasternodeAddress
-import org.bitcoinj.core.NetworkParameters
 import org.bitcoinj.core.Sha256Hash
 import org.bitcoinj.core.Utils
-import org.bitcoinj.crypto.BLSLazyPublicKey
-import org.bitcoinj.crypto.BLSPublicKey
-import org.bitcoinj.evolution.SimplifiedMasternodeListEntry
 import org.bitcoinj.evolution.SimplifiedMasternodeListManager
 import org.bitcoinj.wallet.AuthenticationKeyChain
 import org.bitcoinj.wallet.authentication.AuthenticationKeyStatus
@@ -102,6 +98,7 @@ data class UsernameRequestsUIState(
 )
 
 data class FiltersUIState(
+    val groupByOption: UsernameGroupOption = UsernameGroupOption.defaultOption,
     val sortByOption: UsernameSortOption = UsernameSortOption.defaultOption,
     val typeOption: UsernameTypeOption = UsernameTypeOption.defaultOption,
     val onlyDuplicates: Boolean = true,
@@ -189,8 +186,48 @@ class UsernameRequestsViewModel @Inject constructor(
                                     }?.username?.lowercase() ?: list[0].username
                                 }
                             }
-                            UsernameRequestGroupView(prettyUsername, sortedList, isExpanded = isExpanded(prettyUsername), votes)
-                        }.filterNot { it.requests.isEmpty() }
+                            val votingEndDate = if (sortedList.isNotEmpty()) {
+                                sortedList.minOf { request -> request.createdAt } + UsernameRequest.VOTING_PERIOD_MILLIS
+                            } else {
+                                -1L
+                            }
+                            UsernameRequestGroupView(prettyUsername, sortedList, isExpanded = isExpanded(prettyUsername), votes, votingEndDate)
+                        }.filterNot { it.requests.isEmpty() && it.votingEndDate < System.currentTimeMillis() }
+                }.map { groupViews -> // Sort the list emitted by the Flow
+                    when (_filterState.value.groupByOption) {
+                        UsernameGroupOption.VotingPeriodSoonest -> groupViews.sortedWith(
+                            when (_filterState.value.sortByOption) {
+                                UsernameSortOption.DateAscending -> compareBy<UsernameRequestGroupView> { group -> group.localDate }.thenBy { group -> group.requests.minOf { request -> request.createdAt } }
+                                UsernameSortOption.DateDescending -> compareBy<UsernameRequestGroupView> { group -> group.localDate }.thenByDescending {  group -> group.requests.minOf { request -> request.createdAt } }
+                                UsernameSortOption.VotesAscending -> compareBy<UsernameRequestGroupView> { group -> group.localDate }.thenBy {  group -> group.requests.maxOf { request -> request.votes } }
+                                UsernameSortOption.VotesDescending -> compareBy<UsernameRequestGroupView> { group -> group.localDate }.thenByDescending {  group -> group.requests.maxOf { request -> request.votes } }
+                            }
+                        )
+                        UsernameGroupOption.VotingPeriodLatest -> groupViews.sortedWith(
+                            when (_filterState.value.sortByOption) {
+                                UsernameSortOption.DateAscending -> compareByDescending<UsernameRequestGroupView> { group -> group.localDate }.thenBy { group -> group.requests.minOf { request -> request.createdAt } }
+                                UsernameSortOption.DateDescending -> compareByDescending<UsernameRequestGroupView> { group -> group.localDate }.thenByDescending {  group -> group.requests.minOf { request -> request.createdAt } }
+                                UsernameSortOption.VotesAscending -> compareByDescending<UsernameRequestGroupView> { group -> group.localDate }.thenBy {  group -> group.requests.maxOf { request -> request.votes } }
+                                UsernameSortOption.VotesDescending -> compareByDescending<UsernameRequestGroupView> { group -> group.localDate }.thenByDescending {  group -> group.requests.maxOf { request -> request.votes } }
+                            }
+                        )
+                        else -> {
+                            when (_filterState.value.sortByOption) {
+                                UsernameSortOption.DateAscending -> groupViews.sortedBy {
+                                    it.requests.minOf { request -> request.createdAt }
+                                }
+                                UsernameSortOption.DateDescending -> groupViews.sortedByDescending {
+                                    it.requests.minOf { request -> request.createdAt }
+                                }
+                                UsernameSortOption.VotesAscending -> groupViews.sortedBy {
+                                    it.requests.maxOf { request -> request.votes }
+                                }
+                                UsernameSortOption.VotesDescending -> groupViews.sortedByDescending {
+                                    it.requests.maxOf { request -> request.votes }
+                                }
+                            }
+                        }
+                    }
                 }
         }.onEach { requests -> _uiState.update { it.copy(filteredUsernameRequests = requests) } }
             .launchIn(viewModelWorkerScope)
@@ -245,6 +282,7 @@ class UsernameRequestsViewModel @Inject constructor(
     }
 
     fun applyFilters(
+        groupByOption: UsernameGroupOption,
         sortByOption: UsernameSortOption,
         typeOption: UsernameTypeOption,
         onlyDuplicates: Boolean,
@@ -252,6 +290,7 @@ class UsernameRequestsViewModel @Inject constructor(
     ) {
         _filterState.update {
             it.copy(
+                groupByOption = groupByOption,
                 sortByOption = sortByOption,
                 typeOption = typeOption,
                 onlyDuplicates = onlyDuplicates,
@@ -714,4 +753,10 @@ class UsernameRequestsViewModel @Inject constructor(
     suspend fun isImported(masternode: ImportedMasternodeKey): Boolean {
         return importedMasternodeKeyDao.contains(masternode.proTxHash)
     }
+
+    suspend fun getVotingStartDate(normalizedLabel: String): Long {
+        return usernameRequestDao.getRequestsByNormalizedLabel(normalizedLabel).minOf {
+            it.createdAt
+        }
+    }
 }
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 cb59a1c2e1..d50a13b160 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupAdapter.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupAdapter.kt
@@ -16,12 +16,14 @@
  */
 package de.schildbach.wallet.ui.username.adapters
 
-import android.util.TypedValue
 import android.util.TypedValue.COMPLEX_UNIT_SP
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.DiffUtil
@@ -30,11 +32,14 @@ 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.UsernameRequestDateViewBinding
 import de.schildbach.wallet_test.databinding.UsernameRequestGroupViewBinding
 import de.schildbach.wallet_test.databinding.UsernameRequestViewBinding
 import org.dash.wallet.common.ui.setRoundedRippleBackground
 import org.dashj.platform.sdk.platform.Names
 import java.text.SimpleDateFormat
+import java.time.LocalDate
+import java.time.temporal.ChronoUnit
 
 import java.util.Date
 import java.util.Locale
@@ -48,52 +53,122 @@ fun Button.setVoteThemeColors(
     setTextSize(COMPLEX_UNIT_SP, 12.0f)
 }
 
+private fun setVoteThemeColors(
+    button: LinearLayout,
+    textView: TextView,
+    imageView: ImageView,
+    backgroundStyle: Int,
+    textColor: Int,
+    iconResource: Int
+) {
+    button.setRoundedRippleBackground(backgroundStyle)
+    textView.setTextColor(textView.context.getColor(textColor))
+    textView.setTextSize(COMPLEX_UNIT_SP, 12.0f)
+    imageView.setImageResource(iconResource)
+}
+
 class UsernameRequestGroupAdapter(
     private val usernameDetailsClickListener: (UsernameRequest) -> Unit,
     private val voteClickListener: (UsernameRequest) -> Unit
-): ListAdapter<UsernameRequestGroupView, UsernameRequestGroupViewHolder>(
+): ListAdapter<UsernameRequestRowView, AbstractUsernameRequestGroupViewHolder>(
     DiffCallback()
 ) {
-    class DiffCallback : DiffUtil.ItemCallback<UsernameRequestGroupView>() {
-        override fun areItemsTheSame(oldItem: UsernameRequestGroupView, newItem: UsernameRequestGroupView): Boolean {
-            return oldItem.username == newItem.username
+    companion object {
+        private const val DATE_TYPE = 0
+        private const val GROUP_TYPE = 1
+    }
+    class DiffCallback : DiffUtil.ItemCallback<UsernameRequestRowView>() {
+        override fun areItemsTheSame(oldItem: UsernameRequestRowView, newItem: UsernameRequestRowView): Boolean {
+            return oldItem is UsernameRequestGroupView &&
+                    newItem is UsernameRequestGroupView &&
+                    oldItem.username == newItem.username || oldItem.localDate == newItem.localDate
         }
 
-        override fun areContentsTheSame(oldItem: UsernameRequestGroupView, newItem: UsernameRequestGroupView): Boolean {
+        override fun areContentsTheSame(oldItem: UsernameRequestRowView, newItem: UsernameRequestRowView): Boolean {
             return oldItem == newItem
         }
     }
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): UsernameRequestGroupViewHolder {
-        val binding = UsernameRequestGroupViewBinding.inflate(
-            LayoutInflater.from(parent.context),
-            parent,
-            false
-        )
+    override fun getItemViewType(position: Int): Int {
+        return when {
+            currentList[position] is UsernameRequestGroupView -> GROUP_TYPE
+            else -> DATE_TYPE
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AbstractUsernameRequestGroupViewHolder {
+        return when (viewType) {
+            GROUP_TYPE -> {
+                val binding = UsernameRequestGroupViewBinding.inflate(
 
-        return UsernameRequestGroupViewHolder(binding)
+                    LayoutInflater.from(parent.context),
+                    parent,
+                    false
+                )
+                UsernameRequestGroupViewHolder(binding)
+            }
+
+            DATE_TYPE -> {
+                val binding = UsernameRequestDateViewBinding.inflate(
+                    LayoutInflater.from(parent.context),
+                    parent,
+                    false
+                )
+                DateViewHolder(binding)
+            }
+            else -> error("unknown viewType $viewType")
+        }
     }
 
-    override fun onBindViewHolder(holder: UsernameRequestGroupViewHolder, position: Int) {
-        val item = currentList[position]
-        val hasMoreThanOneRequest = item.requests.size > 1
-        holder.bind(item, usernameDetailsClickListener, voteClickListener)
-        holder.binding.root.setOnClickListener {
-            // expand if there is more than 1 request, otherwise show details on click
-            if (hasMoreThanOneRequest) {
-                val index = currentList.indexOfFirst { it.username == item.username }
-                currentList[index].isExpanded = !currentList[index].isExpanded
-                notifyItemChanged(index)
-            } else {
-                usernameDetailsClickListener.invoke(item.requests.first())
+    override fun onBindViewHolder(holder: AbstractUsernameRequestGroupViewHolder, position: Int) {
+        when (val item = currentList[position]) {
+            is UsernameRequestGroupView -> {
+                val hasMoreThanOneRequest = item.requests.size > 1
+                holder as UsernameRequestGroupViewHolder
+                holder.bind(item, usernameDetailsClickListener, voteClickListener)
+                holder.binding.root.setOnClickListener {
+                    // expand if there is more than 1 request, otherwise show details on click
+                    if (hasMoreThanOneRequest) {
+                        val index = currentList.indexOfFirst { it is UsernameRequestGroupView && it.username == item.username }
+                        item.isExpanded = !item.isExpanded
+                        notifyItemChanged(index)
+                    } else {
+                        usernameDetailsClickListener.invoke(item.requests.first())
+                    }
+                }
             }
+            is UsernameRequestRowView -> {
+                holder as DateViewHolder
+                holder.bind(item)
+            }
+        }
+    }
+}
+
+abstract class AbstractUsernameRequestGroupViewHolder(view: View): RecyclerView.ViewHolder(view)
+
+class DateViewHolder(
+    val binding: UsernameRequestDateViewBinding
+): AbstractUsernameRequestGroupViewHolder(binding.root) {
+    fun bind(row: UsernameRequestRowView) {
+        val now = LocalDate.now()
+        val isToday = now == row.localDate
+        val isTomorrow = !isToday && row.localDate == now.plusDays(1)
+
+        binding.dateHeading.text = when {
+            isToday -> binding.root.context.getString(R.string.voting_period_ends_today)
+            isTomorrow -> binding.root.context.getString(R.string.voting_period_ends_tomorrow)
+            else -> binding.root.context.getString(
+                R.string.voting_period_ends_in_days,
+                ChronoUnit.DAYS.between(now, row.localDate)
+            )
         }
     }
 }
 
 class UsernameRequestGroupViewHolder(
     val binding: UsernameRequestGroupViewBinding
-): RecyclerView.ViewHolder(binding.root) {
+): AbstractUsernameRequestGroupViewHolder(binding.root) {
     fun bind(option: UsernameRequestGroupView, usernameClickListener: (UsernameRequest) -> Unit, voteClickListener: (UsernameRequest) -> Unit) {
         val hasMoreThanOneRequest = option.requests.size > 1
         binding.username.text = option.username
@@ -106,13 +181,13 @@ class UsernameRequestGroupViewHolder(
         binding.linkIncluded.isVisible = !hasMoreThanOneRequest && option.requests.first().link != null
 
         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 {
+        binding.blocksButtonText.text = option.lockVotes().toString()
+        binding.blocksButtonContainer.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 {
+        binding.approvalsButtonContainer.isVisible = !hasMoreThanOneRequest
+        binding.approvalsButtonText.text = option.requests.maxOf { it.votes }.toString()
+        binding.approvalsButtonContainer.setOnClickListener {
             // vote for the first request, which is the only request
             voteClickListener.invoke(option.requests.first())
         }
@@ -120,19 +195,19 @@ class UsernameRequestGroupViewHolder(
         // change the button colors based on our vote(s)
         when (option.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()))
-                binding.blocksButton.setVoteThemeColors(R.style.PrimaryButtonTheme_Large_LightRed, R.color.red)
-                binding.approvalsButton.setVoteThemeColors(R.style.PrimaryButtonTheme_Large_Blue, R.color.dash_white)
+                binding.blocksButtonText.text = option.lockVotes().toString()
+                setVoteThemeColors(binding.blocksButtonContainer, binding.blocksButtonText, binding.blocksButtonIcon, R.style.PrimaryButtonTheme_Large_LightRed, R.color.red, R.drawable.ic_thumb_down_red)
+                setVoteThemeColors(binding.approvalsButtonContainer, binding.approvalsButtonText, binding.approvalsButtonIcon, R.style.PrimaryButtonTheme_Large_Blue, R.color.dash_white, R.drawable.ic_thumb_up_white)
             }
             UsernameVote.LOCK -> {
-                binding.blocksButton.text = context.getString(R.string.two_lines_number_text, option.lockVotes(), context.getString(R.string.unblock_button))
-                binding.blocksButton.setVoteThemeColors(R.style.PrimaryButtonTheme_Large_Red, R.color.dash_white)
-                binding.approvalsButton.setVoteThemeColors(R.style.PrimaryButtonTheme_Large_LightBlue, R.color.dash_blue)
+                binding.blocksButtonText.text = option.lockVotes().toString()
+                setVoteThemeColors(binding.blocksButtonContainer, binding.blocksButtonText, binding.blocksButtonIcon, R.style.PrimaryButtonTheme_Large_Red, R.color.dash_white, R.drawable.ic_thumb_down_white)
+                setVoteThemeColors(binding.approvalsButtonContainer, binding.approvalsButtonText, binding.approvalsButtonIcon, R.style.PrimaryButtonTheme_Large_LightBlue, R.color.dash_blue, R.drawable.ic_thumb_up_blue)
             }
             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.setVoteThemeColors(R.style.PrimaryButtonTheme_Large_LightRed, R.color.red)
-                binding.approvalsButton.setVoteThemeColors(R.style.PrimaryButtonTheme_Large_LightBlue, R.color.dash_blue)
+                binding.blocksButtonText.text = option.lockVotes().toString()
+                setVoteThemeColors(binding.blocksButtonContainer, binding.blocksButtonText, binding.blocksButtonIcon, R.style.PrimaryButtonTheme_Large_LightRed, R.color.red, R.drawable.ic_thumb_down_red)
+                setVoteThemeColors(binding.approvalsButtonContainer, binding.approvalsButtonText, binding.approvalsButtonIcon, R.style.PrimaryButtonTheme_Large_LightBlue, R.color.dash_blue, R.drawable.ic_thumb_up_blue)
             }
         }
 
@@ -215,25 +290,24 @@ class UsernameRequestViewHolder(
     val binding: UsernameRequestViewBinding
 ): AbstractUsernameRequestViewHolder(binding.root) {
     override fun bind(request: UsernameRequest, votes: List<UsernameVote>) {
-        val context = binding.root.context
         val dateFormat = SimpleDateFormat("dd MMM yyyy · hh:mm a", Locale.getDefault())
         binding.dateRegistered.text = dateFormat.format(Date(request.createdAt))
 
-        binding.approvalsButton.text = context.getString(R.string.two_lines_number_text, request.votes, context.resources.getQuantityString(R.plurals.approval_button, request.votes))
+        binding.approvalsButtonText.text = request.votes.toString()
         val lastVote = votes.lastOrNull()
         when (lastVote?.type) {
             UsernameVote.APPROVE -> {
                 if (lastVote.identity == request.identity) {
-                    binding.approvalsButton.setVoteThemeColors(R.style.PrimaryButtonTheme_Large_Blue, R.color.dash_white)
+                    setVoteThemeColors(binding.approvalsButtonContainer, binding.approvalsButtonText, binding.approvalsButtonIcon, R.style.PrimaryButtonTheme_Large_Blue, R.color.dash_white, R.drawable.ic_thumb_up_white)
                 } else {
-                    binding.approvalsButton.setVoteThemeColors(R.style.PrimaryButtonTheme_Large_LightBlue, R.color.dash_blue)
+                    setVoteThemeColors(binding.approvalsButtonContainer, binding.approvalsButtonText, binding.approvalsButtonIcon, R.style.PrimaryButtonTheme_Large_LightBlue, R.color.dash_blue, R.drawable.ic_thumb_up_blue)
                 }
             }
             UsernameVote.LOCK, UsernameVote.ABSTAIN -> {
-                binding.approvalsButton.setVoteThemeColors(R.style.PrimaryButtonTheme_Large_LightBlue, R.color.dash_blue)
+                setVoteThemeColors(binding.approvalsButtonContainer, binding.approvalsButtonText, binding.approvalsButtonIcon, R.style.PrimaryButtonTheme_Large_LightBlue, R.color.dash_blue, R.drawable.ic_thumb_up_blue)
             }
             else -> {
-                binding.approvalsButton.setVoteThemeColors(R.style.PrimaryButtonTheme_Large_LightBlue, R.color.dash_blue)
+                setVoteThemeColors(binding.approvalsButtonContainer, binding.approvalsButtonText, binding.approvalsButtonIcon, R.style.PrimaryButtonTheme_Large_LightBlue, R.color.dash_blue, R.drawable.ic_thumb_up_blue)
             }
         }
 
@@ -245,7 +319,7 @@ class UsernameRequestViewHolder(
         binding.root.setOnClickListener {
             listener.invoke(usernameRequest)
         }
-        binding.approvalsButton.setOnClickListener {
+        binding.approvalsButtonContainer.setOnClickListener {
             voteClickListener.invoke(usernameRequest)
         }
     }
diff --git a/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupView.kt b/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupView.kt
index e26ec05c0d..bb9c57b30f 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupView.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupView.kt
@@ -19,13 +19,31 @@ package de.schildbach.wallet.ui.username.adapters
 
 import de.schildbach.wallet.database.entity.UsernameRequest
 import de.schildbach.wallet.database.entity.UsernameVote
+import java.time.Instant
+import java.time.LocalDate
+import java.time.ZoneId
 
+/** Base class for items in the Username Request list.  This will be used to display
+ * hold a date to display some presentation of time.
+ */
+open class UsernameRequestRowView(
+    val localDate: LocalDate
+) {
+    override fun equals(other: Any?): Boolean {
+        return other is UsernameRequestRowView && other.localDate == localDate
+    }
+}
+
+/** Represents a username contest that has one or more username requests
+ *  for the same normalizedLabel.
+ */
 data class UsernameRequestGroupView(
     val username: String,
     val requests: List<UsernameRequest>,
     var isExpanded: Boolean = false,
-    var votes: List<UsernameVote>
-) {
+    var votes: List<UsernameVote>,
+    val votingEndDate: Long
+) : UsernameRequestRowView(Instant.ofEpochMilli(votingEndDate).atZone(ZoneId.systemDefault()).toLocalDate()) {
     val lastVote: UsernameVote?
         get() = votes.lastOrNull()
 
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 bd158cbf62..f92d660adf 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUserNameViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUserNameViewModel.kt
@@ -420,4 +420,10 @@ class RequestUserNameViewModel @Inject constructor(
     fun logEvent(event: String) {
         analytics.logEvent(event, mapOf())
     }
+
+    suspend fun getVotingStartDate(normalizedLabel: String): Long {
+        return usernameRequestDao.getRequestsByNormalizedLabel(normalizedLabel).minOf {
+            it.createdAt
+        }
+    }
 }
diff --git a/wallet/src/de/schildbach/wallet/ui/username/voting/VotingRequestDetailsFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/voting/VotingRequestDetailsFragment.kt
index 675548d2a8..74cb0a8302 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/voting/VotingRequestDetailsFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/voting/VotingRequestDetailsFragment.kt
@@ -24,10 +24,14 @@ import android.view.View
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.lifecycleScope
 import de.schildbach.wallet.Constants
 import de.schildbach.wallet.database.entity.UsernameRequest
 import de.schildbach.wallet_test.R
 import de.schildbach.wallet_test.databinding.FragmentVotingRequestDetailsBinding
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.bitcoinj.core.NetworkParameters
 import org.dash.wallet.common.ui.dialogs.AdaptiveDialog
 import org.dash.wallet.common.ui.viewBinding
@@ -58,35 +62,44 @@ class VotingRequestDetailsFragment : Fragment(R.layout.fragment_voting_request_d
             binding.username.text = myUsernameRequest?.username
             binding.identity.text = myUsernameRequest?.identity
             var isVotingOver = false
-            val votingResults = myUsernameRequest?.createdAt?.let { startTime ->
-                val endTime = startTime + UsernameRequest.VOTING_PERIOD_MILLIS
-                val dateFormat = DateFormat.getMediumDateFormat(requireContext())
-                isVotingOver = endTime < System.currentTimeMillis()
-                if (isVotingOver) {
-                    getString(R.string.request_username_taken_results)
-                } else {
-                    dateFormat.format(endTime)
+            lifecycleScope.launch {
+                val startDate = withContext(Dispatchers.IO) {
+                    myUsernameRequest?.let {
+                        requestUserNameViewModel.getVotingStartDate(it.normalizedLabel)
+                    }
                 }
-            } ?: "Voting Period not found"
-            binding.votingRange.text = votingResults
-            when {
-                isVotingOver -> {
-                    binding.link.text = if (myUsernameRequest?.link != null && myUsernameRequest.link != "") {
-                        myUsernameRequest.link
+                val votingResults = startDate?.let { startTime ->
+                    val endTime = startTime + UsernameRequest.VOTING_PERIOD_MILLIS
+                    val dateFormat = DateFormat.getMediumDateFormat(requireContext())
+                    isVotingOver = endTime < System.currentTimeMillis()
+                    if (isVotingOver) {
+                        getString(R.string.request_username_taken_results)
                     } else {
-                        getString(R.string.none)
+                        dateFormat.format(endTime)
+                    }
+                } ?: "Voting period not found"
+                binding.votingRange.text = votingResults
+                when {
+                    isVotingOver -> {
+                        binding.link.text = if (myUsernameRequest?.link != null && myUsernameRequest.link != "") {
+                            myUsernameRequest.link
+                        } else {
+                            getString(R.string.none)
+                        }
+                        binding.linkLayout.isVisible = true
+                        binding.verifyNowLayout.isVisible = false
+                    }
+
+                    myUsernameRequest?.link != null && myUsernameRequest.link != "" -> {
+                        binding.link.text = myUsernameRequest.link
+                        binding.linkLayout.isVisible = true
+                        binding.verifyNowLayout.isVisible = false
+                    }
+
+                    else -> {
+                        binding.linkLayout.isVisible = false
+                        binding.verifyNowLayout.isVisible = true
                     }
-                    binding.linkLayout.isVisible = true
-                    binding.verifyNowLayout.isVisible = false
-                }
-                myUsernameRequest?.link != null && myUsernameRequest.link != "" -> {
-                    binding.link.text = myUsernameRequest.link
-                    binding.linkLayout.isVisible = true
-                    binding.verifyNowLayout.isVisible = false
-                }
-                else -> {
-                    binding.linkLayout.isVisible = false
-                    binding.verifyNowLayout.isVisible = true
                 }
             }
         }