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
+        }
+    }
+}