From 9461b9d765abb0efebf0caf6d17a680d427aab54 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Mon, 21 Oct 2024 07:57:23 -0700
Subject: [PATCH 01/58] feat: add firebase events for some dashpay related
 actions

---
 .../services/analytics/AnalyticsConstants.kt  |  3 ++
 .../src/de/schildbach/wallet/di/AppModule.kt  |  9 +++-
 .../wallet/payments/SendCoinsTaskRunner.kt    | 53 +++++++++++++++++--
 .../wallet/ui/dashpay/EditProfileViewModel.kt |  1 +
 4 files changed, 59 insertions(+), 7 deletions(-)

diff --git a/common/src/main/java/org/dash/wallet/common/services/analytics/AnalyticsConstants.kt b/common/src/main/java/org/dash/wallet/common/services/analytics/AnalyticsConstants.kt
index fbd2b9c358..112899d225 100644
--- a/common/src/main/java/org/dash/wallet/common/services/analytics/AnalyticsConstants.kt
+++ b/common/src/main/java/org/dash/wallet/common/services/analytics/AnalyticsConstants.kt
@@ -87,6 +87,8 @@ object AnalyticsConstants {
     }
 
     object SendReceive {
+        const val SEND_TX = "send_tx" // also include amount sent
+        const val SEND_TX_CONTACT = "send_tx_to_contact"  // also include amount sent
         const val SCAN_TO_SEND = "send_scan_to_send"
         const val SEND_TO_ADDRESS = "send_to_address"
         const val SHOW_QR_CODE = "receive_show_qr_code"
@@ -175,6 +177,7 @@ object AnalyticsConstants {
         const val PROFILE_NAME_LENGTH = "profile_display_name_length"
         const val PROFILE_CHANGE_ABOUT_ME = "profile_change_about_me"
         const val PROFILE_ABOUT_ME_LENGTH = "profile_about_me_length"
+        const val PROFILE_CHANGE_PICTURE = "profile_change_picture"
         const val PROFILE_CHANGE_PICTURE_GRAVATAR = "profile_change_picture_gravatar"
         const val PROFILE_CHANGE_PICTURE_PUBLIC_URL = "profile_change_picture_public_url"
         const val PROFILE_CHANGE_PICTURE_CAMERA = "profile_change_picture_camera_photo"
diff --git a/wallet/src/de/schildbach/wallet/di/AppModule.kt b/wallet/src/de/schildbach/wallet/di/AppModule.kt
index c548e3bd7d..d6578e12e0 100644
--- a/wallet/src/de/schildbach/wallet/di/AppModule.kt
+++ b/wallet/src/de/schildbach/wallet/di/AppModule.kt
@@ -30,6 +30,7 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import de.schildbach.wallet.WalletApplication
 import de.schildbach.wallet.data.CoinJoinConfig
+import de.schildbach.wallet.database.entity.BlockchainIdentityConfig
 import de.schildbach.wallet.payments.ConfirmTransactionLauncher
 import de.schildbach.wallet.payments.SendCoinsTaskRunner
 import de.schildbach.wallet.security.SecurityFunctions
@@ -37,6 +38,7 @@ import de.schildbach.wallet.service.*
 import de.schildbach.wallet.service.AndroidActionsService
 import de.schildbach.wallet.service.AppRestartService
 import de.schildbach.wallet.service.RestartService
+import de.schildbach.wallet.ui.dashpay.PlatformRepo
 import de.schildbach.wallet.ui.more.tools.ZenLedgerApi
 import de.schildbach.wallet.ui.more.tools.ZenLedgerClient
 import de.schildbach.wallet.ui.notifications.NotificationManagerWrapper
@@ -105,9 +107,12 @@ abstract class AppModule {
             walletApplication: WalletApplication,
             securityFunctions: SecurityFunctions,
             packageInfoProvider: PackageInfoProvider,
-            coinJoinConfig: CoinJoinConfig
+            analyticsService: AnalyticsService,
+            identityConfig: BlockchainIdentityConfig,
+            coinJoinConfig: CoinJoinConfig,
+            platformRepo: PlatformRepo
         ): SendPaymentService {
-            val realService = SendCoinsTaskRunner(walletData, walletApplication, securityFunctions, packageInfoProvider, coinJoinConfig)
+            val realService = SendCoinsTaskRunner(walletData, walletApplication, securityFunctions, packageInfoProvider, analyticsService, identityConfig, coinJoinConfig, platformRepo)
 
             return if (BuildConfig.FLAVOR.lowercase() == "prod") {
                 realService
diff --git a/wallet/src/de/schildbach/wallet/payments/SendCoinsTaskRunner.kt b/wallet/src/de/schildbach/wallet/payments/SendCoinsTaskRunner.kt
index 894e56ca7d..f3ef41a217 100644
--- a/wallet/src/de/schildbach/wallet/payments/SendCoinsTaskRunner.kt
+++ b/wallet/src/de/schildbach/wallet/payments/SendCoinsTaskRunner.kt
@@ -17,17 +17,19 @@
 package de.schildbach.wallet.payments
 
 import androidx.annotation.VisibleForTesting
-import androidx.lifecycle.viewModelScope
+import com.google.firebase.installations.FirebaseInstallations
 import de.schildbach.wallet.WalletApplication
 import de.schildbach.wallet.data.CoinJoinConfig
 import de.schildbach.wallet.data.PaymentIntent
+import de.schildbach.wallet.database.entity.BlockchainIdentityConfig
+import de.schildbach.wallet.database.entity.BlockchainIdentityConfig.Companion.IDENTITY_ID
 import de.schildbach.wallet.payments.parsers.PaymentIntentParser
 import de.schildbach.wallet.security.SecurityFunctions
 import de.schildbach.wallet.security.SecurityGuard
 import de.schildbach.wallet.service.CoinJoinMode
 import de.schildbach.wallet.service.PackageInfoProvider
+import de.schildbach.wallet.ui.dashpay.PlatformRepo
 import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -52,6 +54,8 @@ import org.dash.wallet.common.WalletDataProvider
 import org.dash.wallet.common.services.DirectPayException
 import org.dash.wallet.common.services.LeftoverBalanceException
 import org.dash.wallet.common.services.SendPaymentService
+import org.dash.wallet.common.services.analytics.AnalyticsConstants
+import org.dash.wallet.common.services.analytics.AnalyticsService
 import org.dash.wallet.common.transactions.ByAddressCoinSelector
 import org.dash.wallet.common.util.Constants
 import org.dash.wallet.common.util.call
@@ -64,7 +68,10 @@ class SendCoinsTaskRunner @Inject constructor(
     private val walletApplication: WalletApplication,
     private val securityFunctions: SecurityFunctions,
     private val packageInfoProvider: PackageInfoProvider,
-    coinJoinConfig: CoinJoinConfig
+    private val analyticsService: AnalyticsService,
+    private val identityConfig: BlockchainIdentityConfig,
+    coinJoinConfig: CoinJoinConfig,
+    private val platformRepo: PlatformRepo
 ) : SendPaymentService {
     companion object {
         private const val WALLET_EXCEPTION_MESSAGE = "this method can't be used before creating the wallet"
@@ -72,7 +79,7 @@ class SendCoinsTaskRunner @Inject constructor(
     }
     private var coinJoinSend = false
     private val coroutineScope = CoroutineScope(Dispatchers.IO)
-
+    private var firebaseInstallationId: String = ""
     init {
         coinJoinConfig
             .observeMode()
@@ -81,6 +88,10 @@ class SendCoinsTaskRunner @Inject constructor(
                 coinJoinSend = mode != CoinJoinMode.NONE
             }
             .launchIn(coroutineScope)
+
+        FirebaseInstallations.getInstance().id.addOnCompleteListener { task ->
+            firebaseInstallationId = if (task.isSuccessful) task.result else ""
+        }
     }
 
     @Throws(LeftoverBalanceException::class)
@@ -319,7 +330,6 @@ class SendCoinsTaskRunner @Inject constructor(
         if (checkBalanceConditions) {
             checkBalanceConditions(wallet, sendRequest.tx)
         }
-
         signSendRequest(sendRequest)
 
         try {
@@ -334,6 +344,7 @@ class SendCoinsTaskRunner @Inject constructor(
             val transaction = sendRequest.tx
             log.info("send successful, transaction committed: {}", transaction.txId.toString())
             walletApplication.broadcastTransaction(transaction)
+            logSendTxEvent(transaction, wallet)
             transaction
         } catch (ex: Exception) {
             when (ex) {
@@ -349,6 +360,38 @@ class SendCoinsTaskRunner @Inject constructor(
         }
     }
 
+    private suspend fun logSendTxEvent(
+        transaction: Transaction,
+        wallet: Wallet
+    ) {
+        identityConfig.get(IDENTITY_ID)?.let {
+            val valueSent: Long = transaction.outputs.filter {
+                !it.isMine(wallet)
+            }.sumOf {
+                it.value.value
+            }
+            val isSentToContact = try {
+                platformRepo.blockchainIdentity.getContactForTransaction(transaction) != null
+            } catch (e: Exception) {
+                false
+            }
+            analyticsService.logEvent(
+                AnalyticsConstants.SendReceive.SEND_TX,
+                mapOf(
+                    AnalyticsConstants.Parameter.VALUE to valueSent
+                )
+            )
+            if (isSentToContact) {
+                analyticsService.logEvent(
+                    AnalyticsConstants.SendReceive.SEND_TX_CONTACT,
+                    mapOf(
+                        AnalyticsConstants.Parameter.VALUE to valueSent
+                    )
+                )
+            }
+        }
+    }
+
     fun signSendRequest(sendRequest: SendRequest) {
         val wallet = walletData.wallet ?: throw RuntimeException("this method can't be used before creating the wallet")
 
diff --git a/wallet/src/de/schildbach/wallet/ui/dashpay/EditProfileViewModel.kt b/wallet/src/de/schildbach/wallet/ui/dashpay/EditProfileViewModel.kt
index 2f424d1a13..f657d1217a 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/EditProfileViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/EditProfileViewModel.kt
@@ -398,6 +398,7 @@ class EditProfileViewModel @Inject constructor(
         }
 
         if (avatarUrl != dashPayProfile.value!!.avatarUrl) {
+            analytics.logEvent(AnalyticsConstants.UsersContacts.PROFILE_CHANGE_PICTURE, mapOf())
             when (pictureSource) {
                 "gravatar" -> analytics.logEvent(AnalyticsConstants.UsersContacts.PROFILE_CHANGE_PICTURE_GRAVATAR, mapOf())
                 "public_url" -> analytics.logEvent(AnalyticsConstants.UsersContacts.PROFILE_CHANGE_PICTURE_PUBLIC_URL, mapOf())

From 374e6465ed406aa8b4ad71e6f19c0e08a0475436 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Mon, 21 Oct 2024 07:58:00 -0700
Subject: [PATCH 02/58] fix: change order of operands to ensure execution

---
 .../wallet/service/platform/PlatformSyncService.kt        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt b/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt
index 74819afe00..5292df3dd4 100644
--- a/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt
+++ b/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt
@@ -300,7 +300,7 @@ class PlatformSynchronizationService @Inject constructor(
                     dashPayContactRequestDao.insert(dashPayContactRequest)
 
                     // add our receiving from this contact keychain if it doesn't exist
-                    addedContact = addedContact || checkAndAddSentRequest(userId, contactRequest)
+                    addedContact = checkAndAddSentRequest(userId, contactRequest) || addedContact
                     log.info("contactRequest: added sent request from ${contactRequest.toUserId}")
                 }
             }
@@ -328,7 +328,7 @@ class PlatformSynchronizationService @Inject constructor(
                     dashPayContactRequestDao.insert(dashPayContactRequest)
 
                     // add the sending to contact keychain if it doesn't exist
-                    addedContact = addedContact || checkAndAddReceivedRequest(userId, contactRequest)
+                    addedContact = checkAndAddReceivedRequest(userId, contactRequest) || addedContact
                     log.info("contactRequest: added received request from ${contactRequest.ownerId}")
                 }
             }
@@ -477,9 +477,9 @@ class PlatformSynchronizationService @Inject constructor(
                     myEncryptionKey =
                         platformRepo.walletApplication.wallet!!.keyCrypter!!.deriveKey(password)
                 }
-                platformRepo.blockchainIdentity.addContactPaymentKeyChain(
+                platformRepo.blockchainIdentity.addPaymentKeyChainToContact(
                     contactIdentity!!,
-                    contactRequest.document,
+                    contactRequest,
                     myEncryptionKey!!
                 )
                 return true

From d41c0d86a053b1e26f1a4440ae414f277d4753f1 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Mon, 21 Oct 2024 08:09:21 -0700
Subject: [PATCH 03/58] fix: use dashj 21.1.2

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index b6ce137df4..e1f5061c75 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         kotlin_version = '1.9.23'
         coroutinesVersion = '1.6.4'
         ok_http_version = '4.9.1'
-        dashjVersion = '21.1.1'
+        dashjVersion = '21.1.2'
         dppVersion = "1.3-SNAPSHOT"
         hiltVersion = '2.51'
         hiltCompilerVersion = '1.2.0'

From ab41f9dd3327b65af2e65da7e05893c743e3534d Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Mon, 21 Oct 2024 10:40:10 -0700
Subject: [PATCH 04/58] chore: v11.0.1

---
 wallet/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wallet/build.gradle b/wallet/build.gradle
index a5532ed6ae..68a393e383 100644
--- a/wallet/build.gradle
+++ b/wallet/build.gradle
@@ -207,8 +207,8 @@ android {
         compileSdk 34
         minSdkVersion 24
         targetSdkVersion 34
-        versionCode project.hasProperty('versionCode') ? project.property('versionCode') as int : 110043
-        versionName project.hasProperty('versionName') ? project.property('versionName') : "11.0-beta"
+        versionCode project.hasProperty('versionCode') ? project.property('versionCode') as int : 110060
+        versionName project.hasProperty('versionName') ? project.property('versionName') : "11.0.1"
         multiDexEnabled true
         generatedDensities = ['hdpi', 'xhdpi']
         vectorDrawables.useSupportLibrary = true

From 582456e2f4ff10b475549a1f58353e37e33c3bdd Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Thu, 24 Oct 2024 18:12:23 -0700
Subject: [PATCH 05/58] feat: update username voting screen

---
 build.gradle                                  |   2 +-
 .../org/dash/wallet/common/ui/ResourcesExt.kt |  98 ++++++
 common/src/main/res/values/colors.xml         |   2 +
 common/src/main/res/values/strings.xml        |   1 +
 common/src/main/res/values/styles.xml         |  81 +++++
 wallet/AndroidManifest.xml                    |   6 +
 .../res/layout/fragment_username_requests.xml |  12 +-
 .../layout/fragment_username_voting_info.xml  |   3 +-
 .../layout/username_request_group_view.xml    |  84 ++++-
 wallet/res/layout/username_request_view.xml   |  76 ++--
 wallet/res/navigation/nav_voting.xml          |   8 +-
 wallet/res/values/strings-dashpay.xml         |  14 +-
 .../wallet/database/dao/UsernameVoteDao.kt    |  10 +-
 .../wallet/database/entity/UsernameRequest.kt |  16 +-
 .../wallet/database/entity/UsernameVote.kt    |   2 +-
 .../service/platform/PlatformSyncService.kt   |  45 ++-
 .../work/BroadcastUsernameVotesOperation.kt   |  95 +++--
 .../work/BroadcastUsernameVotesWorker.kt      |  30 +-
 .../ui/username/AddVotingKeysFragment.kt      |  16 +-
 .../UsernameRequestDetailsFragment.kt         |   6 +-
 .../ui/username/UsernameRequestsFragment.kt   | 136 +++++--
 .../ui/username/UsernameRequestsViewModel.kt  |  22 +-
 .../ui/username/VotingKeyInputFragment.kt     |   2 +-
 .../adapters/UsernameRequestGroupAdapter.kt   | 332 +++++++++++++-----
 .../voting/RequestUserNameViewModel.kt        |   3 +-
 25 files changed, 853 insertions(+), 249 deletions(-)

diff --git a/build.gradle b/build.gradle
index e1f5061c75..a6664eb071 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         coroutinesVersion = '1.6.4'
         ok_http_version = '4.9.1'
         dashjVersion = '21.1.2'
-        dppVersion = "1.3-SNAPSHOT"
+        dppVersion = "1.3.1-SNAPSHOT"
         hiltVersion = '2.51'
         hiltCompilerVersion = '1.2.0'
         hiltWorkVersion = '1.0.0'
diff --git a/common/src/main/java/org/dash/wallet/common/ui/ResourcesExt.kt b/common/src/main/java/org/dash/wallet/common/ui/ResourcesExt.kt
index 6747bd3b8e..c53504c15e 100644
--- a/common/src/main/java/org/dash/wallet/common/ui/ResourcesExt.kt
+++ b/common/src/main/java/org/dash/wallet/common/ui/ResourcesExt.kt
@@ -17,7 +17,12 @@
 
 package org.dash.wallet.common.ui
 
+import android.content.Context
+import android.graphics.Color
+import android.graphics.drawable.GradientDrawable
+import android.graphics.drawable.RippleDrawable
 import android.view.View
+import android.widget.Button
 import androidx.annotation.StyleRes
 import androidx.core.content.res.ResourcesCompat
 import org.dash.wallet.common.R
@@ -41,3 +46,96 @@ fun View.setRoundedRippleBackground(@StyleRes style: Int?) {
         )
     }
 }
+
+fun View.applyStyle(@StyleRes style: Int?) {
+    style?.let {
+        context.theme.applyStyle(style, true)
+    }
+}
+
+//fun View.setRoundedRippleBackgroundButtonStyle1(@StyleRes style: Int?) {
+//    style?.let {
+//        val theme = this.resources.newTheme().apply { applyStyle(style, true) }
+//
+//        // Extract the cornerRadius attribute
+////        val cornerRadiusAttr = intArrayOf(R.attr.cornerRadius)
+////        val cornerRadiusArray = theme.obtainStyledAttributes(cornerRadiusAttr)
+////        val cornerRadius = cornerRadiusArray.getDimension(0, 0f) // Default to 0 if not set
+////        cornerRadiusArray.recycle()
+//        val cornerRadius = 7.dpToPx(context).toFloat()
+//
+//        // Extract the titleTextColor attribute
+//        val titleTextColorAttr = intArrayOf(R.attr.titleTextColor)
+//        val textColorArray = theme.obtainStyledAttributes(titleTextColorAttr)
+//        val titleTextColor = textColorArray.getColor(0, Color.BLACK) // Default to black if not set
+//        textColorArray.recycle()
+//
+//        // Apply cornerRadius and titleTextColor as needed (e.g., to a button)
+//        val drawable = ResourcesCompat.getDrawable(
+//            this.resources,
+//            R.drawable.rounded_ripple_background,
+//            theme
+//        )
+//
+//        // Assuming rounded_ripple_background is a shape drawable that supports corner radius
+//        if (drawable is RippleDrawable) {
+//            // For the mask
+//            val maskDrawable = drawable.findDrawableByLayerId(android.R.id.mask) as? GradientDrawable
+//            maskDrawable?.cornerRadius = cornerRadius
+//
+//            // For the content shape (background)
+//            val contentDrawable = drawable.getDrawable(0) as? GradientDrawable
+//            contentDrawable?.cornerRadius = cornerRadius
+//        }
+//
+//        // Apply drawable as background and set titleTextColor
+//        this.background = drawable
+//        (this as? Button)?.setTextColor(titleTextColor)
+//    }
+//}
+//
+fun View.setRoundedRippleBackgroundButtonStyle(@StyleRes style: Int?, defaultCornerRadius: Int = 7) {
+    style?.let {
+        val theme = this.resources.newTheme().apply { applyStyle(style, true) }
+        val defaultCornerRadius = defaultCornerRadius.dpToPx(this.context)
+
+        // Resolve the cornerRadius and rippleColor attributes from the applied style
+        val attrs = intArrayOf(
+            R.attr.backgroundColor,
+            R.attr.titleTextColor
+        )
+
+        val typedArray = theme.obtainStyledAttributes(style, attrs)
+
+        // Extract the attributes from the typed array
+        val backgroundColor = typedArray.getColor(0, Color.TRANSPARENT)
+        val titleTextColor = typedArray.getColor(1, Color.BLACK) // Default to black if not set
+        typedArray.recycle()
+
+        // Apply the ripple drawable from your XML
+        val rippleDrawable = ResourcesCompat.getDrawable(
+            this.resources,
+            R.drawable.rounded_ripple_background, // Your ripple drawable
+            theme
+        ) as? RippleDrawable
+
+        rippleDrawable?.let { rd ->
+
+            // Modify the background color, corner radius, and stroke in the ripple's shape
+            val contentDrawable = rd.getDrawable(1) as? GradientDrawable
+            contentDrawable?.apply {
+                setColor(backgroundColor)
+                cornerRadius = defaultCornerRadius.dpToPx(context).toFloat()
+            }
+
+            // Set the ripple drawable as the background
+            this.background = rd
+        }
+        (this as? Button)?.setTextColor(titleTextColor)
+    }
+}
+
+// Utility function to convert dp to px for stroke width
+fun Int.dpToPx(context: Context): Int {
+    return (this * context.resources.displayMetrics.density).toInt()
+}
diff --git a/common/src/main/res/values/colors.xml b/common/src/main/res/values/colors.xml
index 307611426c..635ba80aa9 100644
--- a/common/src/main/res/values/colors.xml
+++ b/common/src/main/res/values/colors.xml
@@ -122,4 +122,6 @@
     <color name="gray_300">#AAAEB3</color>
     <color name="gray_600">#5D5F61</color>
 
+    <color name="red">#EA3943</color>
+    <color name="red_0.05">#0DEA3943</color>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index e58879fff7..1130033d9b 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -112,4 +112,5 @@
 
     <!-- basic formats -->
     <string name="percent" translatable="false">%d%%</string>
+    <string name="two_lines_number_text" translatable="false">%d\n%s</string>
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values/styles.xml b/common/src/main/res/values/styles.xml
index da01902211..46f5b161d7 100644
--- a/common/src/main/res/values/styles.xml
+++ b/common/src/main/res/values/styles.xml
@@ -961,6 +961,87 @@
         <item name="android:theme">@style/PrimaryButtonTheme.Large.LightBlue</item>
     </style>
 
+    <style name="VoteButtonTheme">
+        <item name="cornerRadius">7dp</item>
+        <item name="titleTextColor">@color/white</item>
+        <item name="backgroundColor">@color/content_primary</item>
+        <item name="strokeColor">@color/content_primary</item>
+        <item name="rippleColor">@color/ripple_light</item>
+        <item name="disabledBackgroundColor">@color/disabled_button_bg</item>
+    </style>
+
+    <style name="VoteButton" parent="Widget.AppCompat.Button.Borderless">
+        <item name="fontFamily">@font/inter_semibold</item>
+        <item name="android:textColor">@color/button_text</item>
+        <item name="android:background">@drawable/rounded_ripple_background</item>
+        <item name="android:theme">@style/VoteButtonTheme</item>
+        <item name="android:textSize">12sp</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="android:paddingStart">8dp</item>
+        <item name="android:paddingEnd">8dp</item>
+        <item name="android:paddingTop">4dp</item>
+        <item name="android:paddingBottom">4dp</item>
+        <item name="android:minHeight">40dp</item>
+    </style>
+
+    <style name="Button.Vote" parent="Widget.AppCompat.Button.Borderless">
+        <item name="fontFamily">@font/inter_semibold</item>
+        <item name="android:textColor">@color/button_text</item>
+        <item name="android:background">@drawable/rounded_ripple_background</item>
+        <item name="android:theme">@style/VoteButtonTheme</item>
+        <item name="android:textSize">12sp</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="android:paddingStart">8dp</item>
+        <item name="android:paddingEnd">8dp</item>
+        <item name="android:paddingTop">4dp</item>
+        <item name="android:paddingBottom">4dp</item>
+        <item name="android:minHeight">40dp</item>
+    </style>
+
+    <style name="VoteButton.LightBlue">
+        <item name="backgroundColor">@color/dash_blue_0.05</item>
+        <item name="strokeColor">@android:color/transparent</item>
+        <item name="titleTextColor">@color/dash_blue</item>
+        <item name="rippleColor">@color/button_ripple_color</item>
+    </style>
+
+    <style name="Button.Vote.LightBlue">
+        <item name="android:theme">@style/VoteButton.LightBlue</item>
+    </style>
+
+    <style name="VoteButton.LightRed">
+        <item name="backgroundColor">@color/red_0.05</item>
+        <item name="strokeColor">@android:color/transparent</item>
+        <item name="titleTextColor">@color/red</item>
+        <item name="rippleColor">@color/button_ripple_color</item>
+    </style>
+
+    <style name="Button.Vote.LightRed">
+        <item name="android:theme">@style/VoteButton.LightRed</item>
+    </style>
+
+    <style name="VoteButton.Blue">
+        <item name="backgroundColor">@color/dash_blue</item>
+        <item name="strokeColor">@android:color/transparent</item>
+        <item name="titleTextColor">@color/dash_white</item>
+        <item name="rippleColor">@color/button_ripple_color</item>
+    </style>
+
+    <style name="Button.Vote.Blue">
+        <item name="android:theme">@style/VoteButton.Blue</item>
+    </style>
+
+    <style name="VoteButton.Red">
+        <item name="backgroundColor">@color/red</item>
+        <item name="strokeColor">@android:color/transparent</item>
+        <item name="titleTextColor">@color/dash_white</item>
+        <item name="rippleColor">@color/button_ripple_color</item>
+    </style>
+
+    <style name="Button.Vote.Red">
+        <item name="android:theme">@style/VoteButton.Red</item>
+    </style>
+
     <style name="Button.Primary.Small">
         <item name="android:textSize">13sp</item>
         <item name="android:minHeight">30dp</item>
diff --git a/wallet/AndroidManifest.xml b/wallet/AndroidManifest.xml
index afa5533af2..8cac05c4fa 100644
--- a/wallet/AndroidManifest.xml
+++ b/wallet/AndroidManifest.xml
@@ -420,6 +420,12 @@
             android:exported="false"
             android:foregroundServiceType="connectedDevice" /-->
 
+        <!-- WorkManager -->
+        <service
+            android:name="androidx.work.impl.foreground.SystemForegroundService"
+            android:foregroundServiceType="dataSync"
+            android:exported="false" />
+
         <!-- Prompt Google Play services to install the backported photo picker module -->
         <!-- required to support Android 7 to 12 -->
         <service android:name="com.google.android.gms.metadata.ModuleDependencies" android:enabled="false" android:exported="false">
diff --git a/wallet/res/layout/fragment_username_requests.xml b/wallet/res/layout/fragment_username_requests.xml
index 4261eb48e1..fb719f9da7 100644
--- a/wallet/res/layout/fragment_username_requests.xml
+++ b/wallet/res/layout/fragment_username_requests.xml
@@ -94,6 +94,16 @@
                 android:text="@string/username_voting_subtitle"
                 app:layout_constraintTop_toTopOf="parent" />
 
+            <TextView
+                android:id="@+id/subtitletwo"
+                style="@style/Body2.Secondary"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="15dp"
+                android:layout_marginTop="2dp"
+                android:text="@string/username_voting_subtitle_two"
+                app:layout_constraintTop_toBottomOf="@id/subtitle" />
+
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/filter_panel"
                 android:layout_width="match_parent"
@@ -102,7 +112,7 @@
                 android:layout_marginBottom="8dp"
                 android:layout_marginStart="15dp"
                 android:orientation="horizontal"
-                app:layout_constraintTop_toBottomOf="@id/subtitle">
+                app:layout_constraintTop_toBottomOf="@id/subtitletwo">
 
                 <TextView
                     android:id="@+id/filter_title"
diff --git a/wallet/res/layout/fragment_username_voting_info.xml b/wallet/res/layout/fragment_username_voting_info.xml
index ddcef33038..76c8a3fcdf 100644
--- a/wallet/res/layout/fragment_username_voting_info.xml
+++ b/wallet/res/layout/fragment_username_voting_info.xml
@@ -127,6 +127,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="2dp"
                 android:text="@string/usernames_blocked_subtitle"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="@+id/blocked_title"
                 app:layout_constraintTop_toBottomOf="@+id/blocked_title" />
@@ -200,8 +201,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="63dp"
-                android:layout_marginTop="14dp"
                 android:text="@string/keep_your_passphrase_safe"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/wallet/res/layout/username_request_group_view.xml b/wallet/res/layout/username_request_group_view.xml
index 7405d7857d..0050fe4ed2 100644
--- a/wallet/res/layout/username_request_group_view.xml
+++ b/wallet/res/layout/username_request_group_view.xml
@@ -26,50 +26,108 @@
     style="@style/ViewRaised"
     tools:context="de.schildbach.wallet.ui.username.adapters.UsernameRequestGroupViewHolder">
 
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/header"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent">
     <TextView
         android:id="@+id/username"
         style="@style/Body2.Medium"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:paddingVertical="17dp"
+        android:paddingVertical="0dp"
         android:layout_marginStart="15dp"
+        app:layout_constraintBottom_toTopOf="@id/link_badge"
+        app:layout_constraintVertical_chainStyle="packed"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="John" />
 
+    <ImageView
+        android:id="@+id/link_badge"
+        android:layout_width="28dp"
+        android:layout_height="20dp"
+        android:src="@drawable/ic_link"
+        android:layout_marginEnd="3dp"
+        android:padding="3dp"
+        android:theme="@style/LightBlueBadgeTheme"
+        app:layout_constraintTop_toBottomOf="@id/username"
+        app:layout_constraintStart_toStartOf="@id/username"
+        app:layout_constraintBottom_toBottomOf="parent"/>
+
     <TextView
-        android:id="@+id/block_votes"
-        style="@style/Body2.Medium.Red"
-        android:layout_width="0dp"
+        android:id="@+id/link_included"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingVertical="17dp"
-        android:layout_marginStart="15dp"
-        app:layout_constraintStart_toEndOf="@id/username"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="(1s Blocks)" />
+        android:text="link included"
+        style="@style/Caption.Blue"
+        app:layout_constraintTop_toTopOf="@id/link_badge"
+        app:layout_constraintStart_toEndOf="@id/link_badge" />
+
+<!--    <TextView-->
+<!--        android:id="@+id/block_votes"-->
+<!--        style="@style/Body2.Medium.Red"-->
+<!--        android:layout_width="0dp"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:paddingVertical="17dp"-->
+<!--        android:layout_marginStart="15dp"-->
+<!--        app:layout_constraintStart_toEndOf="@id/username"-->
+<!--        app:layout_constraintTop_toTopOf="parent"-->
+<!--        tools:text="(1s Blocks)" />-->
 
     <TextView
         android:id="@+id/requests_amount"
         style="@style/Overline.Tertiary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="38dp"
-        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_marginEnd="0dp"
+        android:layout_marginStart="6dp"
+        app:layout_constraintStart_toEndOf="@id/username"
         app:layout_constraintTop_toTopOf="@id/username"
         app:layout_constraintBottom_toBottomOf="@id/username"
         tools:text="4 requests" />
 
+    <Button
+        android:id="@+id/blocks_button"
+        style="@style/Button.Vote.LightRed"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_marginVertical="5dp"
+        android:layout_marginHorizontal="8dp"
+        app:layout_constraintEnd_toStartOf="@id/approvals_button"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        tools:text="1\nBlock"
+        />
+
+    <Button
+        android:id="@+id/approvals_button"
+        style="@style/Button.Vote.LightBlue"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_marginVertical="5dp"
+        android:layout_marginHorizontal="10dp"
+        app:layout_constraintEnd_toStartOf="@id/chevron"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        tools:text="3\nApprovals"
+        />
+
     <ImageView
         android:id="@+id/chevron"
         android:layout_width="11dp"
         android:layout_height="11dp"
-        android:src="@drawable/ic_arrow_back"
+        android:src="@drawable/ic_chevron"
         android:rotation="270"
         android:layout_marginEnd="17dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/username"
         app:layout_constraintBottom_toBottomOf="@id/username" />
 
+    </androidx.constraintlayout.widget.ConstraintLayout>
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/requests_list"
         android:layout_width="match_parent"
@@ -78,7 +136,7 @@
         android:paddingBottom="6dp"
         android:overScrollMode="never"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:layout_constraintTop_toBottomOf="@id/username"
+        app:layout_constraintTop_toBottomOf="@id/header"
         tools:listitem="@layout/username_request_view"
         tools:itemCount="5" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/wallet/res/layout/username_request_view.xml b/wallet/res/layout/username_request_view.xml
index 329373ed3a..b376342c4e 100644
--- a/wallet/res/layout/username_request_view.xml
+++ b/wallet/res/layout/username_request_view.xml
@@ -19,16 +19,19 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="55dp"
+    android:layout_height="wrap_content"
     android:clickable="true"
     android:focusable="true"
     android:background="?attr/selectableItemBackground"
     tools:context="de.schildbach.wallet.ui.username.adapters.UsernameRequestViewHolder">
 
     <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/info"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginStart="15dp"
+        android:background="@drawable/selectable_round_corners_border"
+        android:layout_marginHorizontal="4dp"
+        android:layout_marginVertical="10dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
@@ -37,6 +40,7 @@
             style="@style/Overline"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toTopOf="@id/link_badge"
@@ -64,34 +68,48 @@
             app:layout_constraintTop_toTopOf="@id/link_badge"
             app:layout_constraintStart_toEndOf="@id/link_badge" />
 
+        <Button
+            android:id="@+id/approvals_button"
+            style="@style/Button.Vote.LightBlue"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginHorizontal="8dp"
+            android:layout_marginVertical="5dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@id/info"
+            app:layout_constraintBottom_toBottomOf="@id/info"
+            tools:text="2\nApprovals"
+            />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <TextView
-        android:id="@+id/cancel_approval_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="10dp"
-        style="@style/Button.Tertiary.ExtraSmall"
-        android:text="@string/cancel_approval"
-        app:layout_constraintEnd_toStartOf="@id/vote_amount"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        />
+<!--    <TextView-->
+<!--        android:id="@+id/cancel_approval_button"-->
+<!--        android:layout_width="wrap_content"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:layout_marginEnd="10dp"-->
+<!--        style="@style/Button.Tertiary.ExtraSmall"-->
+<!--        android:text="@string/cancel_approval"-->
+<!--        app:layout_constraintEnd_toStartOf="@id/vote_amount"-->
+<!--        app:layout_constraintTop_toTopOf="parent"-->
+<!--        app:layout_constraintBottom_toBottomOf="parent"-->
+<!--        />-->
+
+
 
-    <TextView
-        android:id="@+id/vote_amount"
-        style="@style/Overline.Tertiary"
-        android:layout_width="0dp"
-        android:layout_height="20dp"
-        android:layout_marginEnd="15dp"
-        android:minWidth="20dp"
-        android:paddingHorizontal="7dp"
-        android:gravity="center"
-        android:textAlignment="gravity"
-        android:background="@drawable/rounded_background"
-        android:theme="@style/InactiveBadgeTheme"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        tools:text="10" />
+<!--    <TextView-->
+<!--        android:id="@+id/vote_amount"-->
+<!--        style="@style/Overline.Tertiary"-->
+<!--        android:layout_width="0dp"-->
+<!--        android:layout_height="20dp"-->
+<!--        android:layout_marginEnd="15dp"-->
+<!--        android:minWidth="20dp"-->
+<!--        android:paddingHorizontal="7dp"-->
+<!--        android:gravity="center"-->
+<!--        android:textAlignment="gravity"-->
+<!--        android:background="@drawable/rounded_background"-->
+<!--        android:theme="@style/InactiveBadgeTheme"-->
+<!--        app:layout_constraintEnd_toEndOf="parent"-->
+<!--        app:layout_constraintTop_toTopOf="parent"-->
+<!--        app:layout_constraintBottom_toBottomOf="parent"-->
+<!--        tools:text="10" />-->
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/wallet/res/navigation/nav_voting.xml b/wallet/res/navigation/nav_voting.xml
index cce66977aa..f05381875a 100644
--- a/wallet/res/navigation/nav_voting.xml
+++ b/wallet/res/navigation/nav_voting.xml
@@ -100,8 +100,8 @@
             app:argType="string" />
 
         <argument
-            android:name="approve"
-            app:argType="boolean" />
+            android:name="vote"
+            app:argType="string" />
 
         <action
             android:id="@+id/votingKeyInput_to_addKeys"
@@ -123,8 +123,8 @@
             android:name="requestId"
             app:argType="string" />
 
-        <argument android:name="approve"
-            app:argType="boolean" />
+        <argument android:name="vote"
+            app:argType="string" />
 
         <action
             android:id="@+id/addKeys_to_votingKeyInput"
diff --git a/wallet/res/values/strings-dashpay.xml b/wallet/res/values/strings-dashpay.xml
index fb879f6beb..02bb945df4 100644
--- a/wallet/res/values/strings-dashpay.xml
+++ b/wallet/res/values/strings-dashpay.xml
@@ -268,7 +268,8 @@
     <string name="usernames_blocked_title">Some usernames can be blocked</string>
     <string name="usernames_blocked_subtitle">If enough of the network determines that a username is inappropriate, they can block it</string>
     <string name="username_voting">Username Voting</string>
-    <string name="username_voting_subtitle">As a masternode owner you can vote to approve requested usernames before they are created on the network..</string>
+    <string name="username_voting_subtitle">As a masternode owner you can vote to approve requested usernames before they are created on the network.</string>
+    <string name="username_voting_subtitle_two">You can block the creation of the usernames that you feel are inappropriate.</string>
     <string name="voting_duplicates_only_title">Default filter setting</string>
     <string name="voting_duplicates_only_message">The default filter shows only duplicate usernames that you have NOT voted on, but you can see all contested usernames by changing the filter</string>
     <string name="all">All</string>
@@ -295,7 +296,15 @@
         <item>I have not approved</item>
         <item>Has Blocked votes</item>
     </string-array>
-
+    <string name="unblock_button">Unblock</string>
+    <plurals name="block_vote_button">
+        <item quantity="one">Block</item>
+        <item quantity="other">Blocks</item>
+    </plurals>
+    <plurals name="approval_button">
+        <item quantity="one">Approval</item>
+        <item quantity="other">Approvals</item>
+    </plurals>
     <string name="block_vote_count">%d Block(s)</string>
     <string name="request_your_username">Create your username</string>
     <string name="request_your_hint">Please note that you will not be able to change it in the future</string>
@@ -315,6 +324,7 @@
     <string name="request_details">Request details</string>
     <string name="request_details_subtitle">Review the posting bellow to verify the ownership of this username</string>
     <string name="vote_to_approve">Vote to Approve</string>
+    <string name="vote_to_block">Vote to Block</string>
     <string name="identity">Identity</string>
     <string name="results">Results</string>
     <string name="link">Link</string>
diff --git a/wallet/src/de/schildbach/wallet/database/dao/UsernameVoteDao.kt b/wallet/src/de/schildbach/wallet/database/dao/UsernameVoteDao.kt
index 8b0322f3ce..15ce929087 100644
--- a/wallet/src/de/schildbach/wallet/database/dao/UsernameVoteDao.kt
+++ b/wallet/src/de/schildbach/wallet/database/dao/UsernameVoteDao.kt
@@ -21,17 +21,23 @@ import androidx.room.*
 import de.schildbach.wallet.database.entity.UsernameVote
 import kotlinx.coroutines.flow.Flow
 
+/**
+ * For this table, username is normalized
+ */
 @Dao
 interface UsernameVoteDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insert(usernameVote: UsernameVote)
 
-    @Query("SELECT * FROM username_votes WHERE username = :username")
+    @Query("SELECT * FROM username_votes WHERE username = :username ORDER BY timestamp")
     suspend fun getVotes(username: String): List<UsernameVote>
 
-    @Query("SELECT * FROM username_votes WHERE username = :username")
+    @Query("SELECT * FROM username_votes WHERE username = :username ORDER BY timestamp")
     fun observeVotes(username: String): Flow<List<UsernameVote>>
 
     @Query("DELETE FROM username_votes")
     suspend fun clear()
+
+    @Query("DELETE FROM username_votes WHERE username == :username")
+    suspend fun remove(username: String)
 }
diff --git a/wallet/src/de/schildbach/wallet/database/entity/UsernameRequest.kt b/wallet/src/de/schildbach/wallet/database/entity/UsernameRequest.kt
index 1dfe368217..ce0ed792d1 100644
--- a/wallet/src/de/schildbach/wallet/database/entity/UsernameRequest.kt
+++ b/wallet/src/de/schildbach/wallet/database/entity/UsernameRequest.kt
@@ -19,6 +19,9 @@ package de.schildbach.wallet.database.entity
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import org.bitcoinj.core.Base58
+import org.bitcoinj.core.Sha256Hash
+import org.dashj.platform.sdk.platform.Names
 
 @Entity(tableName = "username_requests")
 data class UsernameRequest(
@@ -35,7 +38,18 @@ data class UsernameRequest(
 ) {
     companion object {
         fun getRequestId(identity: String, username: String): String {
-            return String.format("%s-%s", identity, username)
+            return String.format("%s-%s", identity, Names.normalizeString(username))
         }
+        fun block(username: String, normalizedLabel: String) = UsernameRequest(
+            "",
+            username,
+            normalizedLabel,
+            0L,
+            Base58.encode(Sha256Hash.ZERO_HASH.bytes),
+            null,
+            0,
+            0,
+            false
+        )
     }
 }
diff --git a/wallet/src/de/schildbach/wallet/database/entity/UsernameVote.kt b/wallet/src/de/schildbach/wallet/database/entity/UsernameVote.kt
index c96d4cd885..6543ec58c2 100644
--- a/wallet/src/de/schildbach/wallet/database/entity/UsernameVote.kt
+++ b/wallet/src/de/schildbach/wallet/database/entity/UsernameVote.kt
@@ -34,6 +34,6 @@ data class UsernameVote(
         const val APPROVE = "approve"
         const val LOCK = "lock"
         const val ABSTAIN = "abstain"
-        const val MAX_VOTES = 6
+        const val MAX_VOTES = 5 // max allowed by Platform for a masternode
     }
 }
diff --git a/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt b/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt
index 5292df3dd4..fe3a6199cb 100644
--- a/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt
+++ b/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt
@@ -34,6 +34,7 @@ import de.schildbach.wallet.database.dao.InvitationsDao
 import de.schildbach.wallet.database.dao.TransactionMetadataChangeCacheDao
 import de.schildbach.wallet.database.dao.TransactionMetadataDocumentDao
 import de.schildbach.wallet.database.dao.UsernameRequestDao
+import de.schildbach.wallet.database.dao.UsernameVoteDao
 import de.schildbach.wallet.database.entity.BlockchainIdentityConfig
 import de.schildbach.wallet.database.entity.BlockchainIdentityData
 import de.schildbach.wallet.database.entity.DashPayContactRequest
@@ -127,6 +128,7 @@ class PlatformSynchronizationService @Inject constructor(
     private val dashPayContactRequestDao: DashPayContactRequestDao,
     private val invitationsDao: InvitationsDao,
     private val usernameRequestDao: UsernameRequestDao,
+    private val usernameVoteDao: UsernameVoteDao,
     private val identityConfig: BlockchainIdentityConfig
 ) : PlatformSyncService {
 
@@ -1064,30 +1066,35 @@ class PlatformSynchronizationService @Inject constructor(
                                 platform.platform.names.deserialize(serialized)
                             )
                         }
-
-                        if (contestedDocument != null) {
-                            val identityVerifyDocument = IdentityVerify(platform.platform).get(identifier, name)
-
-                            val requestId = UsernameRequest.getRequestId(identifier.toString(), name)
-                            val previousUsernameRequest = usernameRequestDao.getRequest(requestId)
-
-                            val usernameRequest = UsernameRequest(
-                                requestId = requestId,
-                                username = contestedDocument.label,
-                                normalizedLabel = name,
-                                createdAt = contestedDocument.createdAt ?: -1L,
-                                identity = identifier.toString(),
-                                link = identityVerifyDocument?.url,
-                                votes = contender.votes,
-                                lockVotes = voteContender.lockVoteTally,
-                                isApproved = previousUsernameRequest?.isApproved ?: false
-                            )
-                            usernameRequestDao.insert(usernameRequest)
+                        val hasWinner = voteContender.winner.isPresent
+
+                        if (!hasWinner) {
+                            if (contestedDocument != null) {
+                                val identityVerifyDocument = IdentityVerify(platform.platform).get(identifier, name)
+
+                                val requestId = UsernameRequest.getRequestId(identifier.toString(), name)
+                                val previousUsernameRequest = usernameRequestDao.getRequest(requestId)
+
+                                val usernameRequest = UsernameRequest(
+                                    requestId = requestId,
+                                    username = contestedDocument.label,
+                                    normalizedLabel = name,
+                                    createdAt = contestedDocument.createdAt ?: -1L,
+                                    identity = identifier.toString(),
+                                    link = identityVerifyDocument?.url,
+                                    votes = contender.votes,
+                                    lockVotes = voteContender.lockVoteTally,
+                                    isApproved = previousUsernameRequest?.isApproved ?: false
+                                )
+                                usernameRequestDao.insert(usernameRequest)
+                            }
                         } else {
                             // voting is complete
                             usernameRequestDao.remove(
                                 UsernameRequest.getRequestId(identifier.toString(), name)
                             )
+                            // remove related votes
+                            usernameVoteDao.remove(name)
                         }
                     }
                 } catch(e: Exception) {
diff --git a/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesOperation.kt b/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesOperation.kt
index 167abd709c..e1b5de4964 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesOperation.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesOperation.kt
@@ -19,15 +19,18 @@ package de.schildbach.wallet.ui.dashpay.work
 
 import android.annotation.SuppressLint
 import android.app.Application
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.liveData
+import androidx.lifecycle.switchMap
 import androidx.work.*
 import de.schildbach.wallet.Constants
+import de.schildbach.wallet.livedata.Resource
 import de.schildbach.wallet.security.SecurityGuard
 import org.bitcoinj.core.ECKey
 import org.dashj.platform.dpp.voting.ResourceVoteChoice
 import org.slf4j.LoggerFactory
 
 class BroadcastUsernameVotesOperation(val application: Application) {
-
     class BroadcastUsernameVotesOperationException(message: String) : java.lang.Exception(message)
 
     companion object {
@@ -36,36 +39,86 @@ class BroadcastUsernameVotesOperation(val application: Application) {
         private const val WORK_NAME = "BroadcastUsernameVotes.WORK#"
 
         fun uniqueWorkName(usernames: String) = WORK_NAME + usernames
+
+        fun allOperationsStatus(application: Application): LiveData<MutableMap<String, Resource<WorkInfo>>> {
+            val workManager: WorkManager = WorkManager.getInstance(application)
+            return workManager.getWorkInfosByTagLiveData(SendContactRequestWorker::class.qualifiedName!!).switchMap {
+                return@switchMap liveData {
+                    if (it.isNullOrEmpty()) {
+                        return@liveData
+                    }
+
+                    val result = mutableMapOf<String, Resource<WorkInfo>>()
+                    it.forEach {
+                        var toUserId = ""
+                        it.tags.forEach { tag ->
+                            if (tag.startsWith("usernames:")) {
+                                toUserId = tag.replace("usernames:", "")
+                            }
+                        }
+                        result[toUserId] = convertState(it)
+                    }
+                    emit(result)
+                }
+            }
+        }
+
+        private fun convertState(workInfo: WorkInfo): Resource<WorkInfo> {
+            return when (workInfo.state) {
+                WorkInfo.State.SUCCEEDED -> {
+                    Resource.success(workInfo)
+                }
+                WorkInfo.State.FAILED -> {
+                    val errorMessage = BaseWorker.extractError(workInfo.outputData)
+                    if (errorMessage != null) {
+                        Resource.error(errorMessage, workInfo)
+                    } else {
+                        Resource.error(Exception(), workInfo)
+                    }
+                }
+                WorkInfo.State.CANCELLED -> {
+                    Resource.canceled(workInfo)
+                }
+                else -> {
+                    Resource.loading(workInfo)
+                }
+            }
+        }
     }
 
     private val workManager: WorkManager = WorkManager.getInstance(application)
 
-    /**
-     * Gets the list of all BroadcastUsernameVotesOperation WorkInfo's
-     */
-    val allOperationsData = workManager.getWorkInfosByTagLiveData(BroadcastUsernameVotesWorker::class.qualifiedName!!)
+//    /**
+//     * Gets the list of all BroadcastUsernameVotesOperation WorkInfo's
+//     */
+//    val allOperationsLiveData = workManager.getWorkInfosByTagLiveData(BroadcastUsernameVotesWorker::class.qualifiedName!!)
 
     @SuppressLint("EnqueueWork")
-    fun create(usernames: List<String>, voteChoices: List<ResourceVoteChoice>, masternodeKeys: List<ByteArray>): WorkContinuation {
-
+    fun create(
+        usernames: List<String>,
+        voteChoices: List<ResourceVoteChoice>,
+        masternodeKeys: List<ByteArray>
+    ): WorkContinuation {
         val password = SecurityGuard().retrievePassword()
         val verifyIdentityWorker = OneTimeWorkRequestBuilder<BroadcastUsernameVotesWorker>()
-                .setInputData(
-                    workDataOf(
-                        BroadcastUsernameVotesWorker.KEY_PASSWORD to password,
-                        BroadcastUsernameVotesWorker.KEY_USERNAMES to usernames.toTypedArray(),
-                        BroadcastUsernameVotesWorker.KEY_VOTE_CHOICES to voteChoices.map { it.toString() }.toTypedArray(),
-                        BroadcastUsernameVotesWorker.KEY_MASTERNODE_KEYS to masternodeKeys.map {
-                            ECKey.fromPrivate(it).getPrivateKeyAsWiF(Constants.NETWORK_PARAMETERS)
-                        }.toTypedArray()
-                    )
+            .setInputData(
+                workDataOf(
+                    BroadcastUsernameVotesWorker.KEY_PASSWORD to password,
+                    BroadcastUsernameVotesWorker.KEY_USERNAMES to usernames.toTypedArray(),
+                    BroadcastUsernameVotesWorker.KEY_VOTE_CHOICES to voteChoices.map { it.toString() }.toTypedArray(),
+                    BroadcastUsernameVotesWorker.KEY_MASTERNODE_KEYS to masternodeKeys.map {
+                        ECKey.fromPrivate(it).getPrivateKeyAsWiF(Constants.NETWORK_PARAMETERS)
+                    }.toTypedArray()
                 )
-                .addTag("usernames:$usernames")
-                .build()
+            )
+            .addTag("usernames:$usernames")
+            .build()
         log.info("creating BroadcastUsernameVotesOperation({}, {})", usernames, voteChoices)
         return WorkManager.getInstance(application)
-                .beginUniqueWork(uniqueWorkName(usernames.joinToString(",")),
-                    ExistingWorkPolicy.KEEP,
-                    verifyIdentityWorker)
+            .beginUniqueWork(
+                uniqueWorkName(usernames.joinToString(",")),
+                ExistingWorkPolicy.KEEP,
+                verifyIdentityWorker
+            )
     }
 }
\ No newline at end of file
diff --git a/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesWorker.kt b/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesWorker.kt
index 9034ab50d6..609e44f925 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesWorker.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesWorker.kt
@@ -18,25 +18,22 @@ package de.schildbach.wallet.ui.dashpay.work
 
 import android.content.Context
 import androidx.hilt.work.HiltWorker
-import androidx.work.Data
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
-import com.bumptech.glide.load.engine.Resource
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import de.schildbach.wallet.Constants
-import de.schildbach.wallet.WalletApplication
 import de.schildbach.wallet.service.platform.PlatformBroadcastService
 import de.schildbach.wallet.service.platform.PlatformSyncService
-import de.schildbach.wallet.ui.dashpay.PlatformRepo
 import org.bitcoinj.core.DumpedPrivateKey
 import org.bitcoinj.crypto.KeyCrypterException
 import org.bouncycastle.crypto.params.KeyParameter
 import org.dash.wallet.common.WalletDataProvider
 import org.dash.wallet.common.services.analytics.AnalyticsConstants
 import org.dash.wallet.common.services.analytics.AnalyticsService
+import org.dashj.platform.dpp.voting.ContestedDocumentResourceVotePoll
 import org.dashj.platform.dpp.voting.ResourceVoteChoice
-import org.dashj.platform.sdk.ContestedDocumentResourceVotePoll
+import org.dashj.platform.sdk.PlatformValue
 import org.slf4j.LoggerFactory
 
 @HiltWorker
@@ -48,7 +45,6 @@ class BroadcastUsernameVotesWorker @AssistedInject constructor(
     val platformSyncService: PlatformSyncService,
     val walletDataProvider: WalletDataProvider
 ) : BaseWorker(context, parameters) {
-
     companion object {
         private val log = LoggerFactory.getLogger(BroadcastUsernameVotesWorker::class.java)
 
@@ -89,10 +85,23 @@ class BroadcastUsernameVotesWorker @AssistedInject constructor(
             // this will update the DB and trigger observers
             platformSyncService.updateUsernameRequestsWithVotes()
             analytics.logEvent(AnalyticsConstants.UsernameVoting.VOTE_SUCCESS, mapOf())
+            val arrayOfnames = votes.map {
+                val item = ((it.resourceVote.votePoll as? ContestedDocumentResourceVotePoll)?.indexValues?.get(1) ?: "null")
+                when (item) {
+                    is PlatformValue -> {
+                        when (item.tag) {
+                            PlatformValue.Tag.Text -> item.text
+                            else -> item.toString()
+                        }
+                    }
+                    is String -> item
+                    else -> item.toString()
+                }
+            }.toTypedArray()
             Result.success(
                 workDataOf(
                     KEY_USERNAMES to if(votes.isNotEmpty()) {
-                        votes.map { (it.resourceVote.votePoll as? ContestedDocumentResourceVotePoll)?.index_values?.get(1) ?: "null" }.toTypedArray()
+                        arrayOfnames
                     } else {
                         listOf("").toTypedArray()
                     },
@@ -101,8 +110,11 @@ class BroadcastUsernameVotesWorker @AssistedInject constructor(
         } catch (ex: Exception) {
             analytics.logEvent(AnalyticsConstants.UsernameVoting.VOTE_ERROR, mapOf())
             analytics.logError(ex, "Username Voting: failed to broadcast votes")
-            Result.failure(workDataOf(
-                    KEY_ERROR_MESSAGE to formatExceptionMessage("broadcast username vote", ex)))
+            Result.failure(
+                workDataOf(
+                    KEY_ERROR_MESSAGE to formatExceptionMessage("broadcast username vote", ex)
+                )
+            )
         }
     }
 }
\ No newline at end of file
diff --git a/wallet/src/de/schildbach/wallet/ui/username/AddVotingKeysFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/AddVotingKeysFragment.kt
index b6d9d2cca9..a0215ff08e 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/AddVotingKeysFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/AddVotingKeysFragment.kt
@@ -5,6 +5,7 @@ import android.view.View
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
+import de.schildbach.wallet.database.entity.UsernameVote
 import de.schildbach.wallet.ui.username.adapters.IPAddressAdapter
 import de.schildbach.wallet.ui.username.utils.votingViewModels
 import de.schildbach.wallet_test.R
@@ -27,19 +28,20 @@ class AddVotingKeysFragment : Fragment(R.layout.fragment_add_voting_keys) {
         }
 
         binding.submitButton.setRoundedRippleBackground(
-            if (!args.approve) R.style.PrimaryButtonTheme_Large_Red else R.style.PrimaryButtonTheme_Large_Blue
+            if (args.vote != UsernameVote.APPROVE) R.style.PrimaryButtonTheme_Large_Red else R.style.PrimaryButtonTheme_Large_Blue
         )
         binding.submitButton.setOnClickListener {
-            if (args.approve) {
-                viewModel.vote(args.requestId)
-            } else {
-                viewModel.block(args.requestId)
-            }
+//            when (args.vote) {
+//                UsernameVote.APPROVE -> viewModel.vote(args.requestId)
+//                UsernameVote.LOCK -> viewModel.block(args.requestId)
+//                UsernameVote.ABSTAIN -> viewModel.revokeVote(args.requestId)
+//            }
+            viewModel.submitVote(args.requestId, args.vote)
             findNavController().popBackStack(R.id.usernameRequestsFragment, false)
         }
 
         binding.addKeyButton.setOnClickListener {
-            safeNavigate(AddVotingKeysFragmentDirections.addKeysToVotingKeyInput(args.requestId, args.approve))
+            safeNavigate(AddVotingKeysFragmentDirections.addKeysToVotingKeyInput(args.requestId, args.vote))
         }
 
         val adapter = IPAddressAdapter()
diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestDetailsFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestDetailsFragment.kt
index 57497755aa..2eb450b7cd 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestDetailsFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestDetailsFragment.kt
@@ -54,13 +54,13 @@ class UsernameRequestDetailsFragment : Fragment(R.layout.fragment_username_reque
                 if (request.isApproved) R.string.cancel_approval else R.string.vote_to_approve
             )
 
-            viewModel.observeVotesCount(request.username).observe(viewLifecycleOwner) { myVoteCount ->
+            viewModel.observeVotesCount(request.normalizedLabel).observe(viewLifecycleOwner) { myVoteCount ->
                 binding.voteButton.isEnabled = (myVoteCount < UsernameVote.MAX_VOTES)
             }
 
             binding.voteButton.setOnClickListener {
                 lifecycleScope.launch {
-                    val usernameVotes = viewModel.getVotes(request.username)
+                    val usernameVotes = viewModel.getVotes(request.normalizedLabel)
                     when {
                         (usernameVotes.size == UsernameVote.MAX_VOTES - 1) -> {
                             AdaptiveDialog.create(
@@ -81,7 +81,7 @@ class UsernameRequestDetailsFragment : Fragment(R.layout.fragment_username_reque
                             AdaptiveDialog.create(
                                 icon = null,
                                 getString(R.string.username_vote_none_left),
-                                getString(R.string.username_vote_none_left_message),
+                                getString(R.string.username_vote_none_left_message, UsernameVote.MAX_VOTES),
                                 getString(R.string.button_ok)
                             ).showAsync(requireActivity())
                         }
diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
index 2380408f13..45c7f2d59f 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
@@ -43,9 +43,13 @@ import org.dash.wallet.common.ui.viewBinding
 import org.dash.wallet.common.util.KeyboardUtil
 import org.dash.wallet.common.util.observe
 import org.dash.wallet.common.util.safeNavigate
+import org.slf4j.LoggerFactory
 
 @AndroidEntryPoint
 class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
+    companion object {
+        private val log = LoggerFactory.getLogger(UsernameRequestsFragment::class.java)
+    }
     private val viewModel by votingViewModels<UsernameRequestsViewModel>()
     private val binding by viewBinding(FragmentUsernameRequestsBinding::bind)
     private var itemList = listOf<UsernameRequestGroupView>()
@@ -64,46 +68,46 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
         binding.filterBtn.setOnClickListener {
             safeNavigate(UsernameRequestsFragmentDirections.requestsToFilters())
         }
-        val adapter = UsernameRequestGroupAdapter { request ->
-            lifecycleScope.launch {
-                if (request.requestId != "") {
-                    viewModel.logEvent(AnalyticsConstants.UsernameVoting.DETAILS)
-                    safeNavigate(UsernameRequestsFragmentDirections.requestsToDetails(request.requestId))
-                } else {
-                    val usernameVotes = viewModel.getVotes(request.username)
-                    when {
-                        (usernameVotes.size == UsernameVote.MAX_VOTES - 1) -> {
-                            if (AdaptiveDialog.create(
-                                    icon = null,
-                                    getString(R.string.username_vote_one_left),
-                                    getString(R.string.username_vote_one_left_message, UsernameVote.MAX_VOTES - 1),
-                                    getString(R.string.cancel),
-                                    getString(R.string.button_ok)
-                                ).showAsync(requireActivity()) == true
-                            ) {
-                                doBlockVote(request)
-                            }
-                        }
-
-                        // NOT IN THE DESIGN
-                        usernameVotes.size == UsernameVote.MAX_VOTES -> {
-                            AdaptiveDialog.create(
-                                icon = null,
-                                "No votes left",
-                                "You cannot submit anymore votes on this username",
-                                getString(R.string.button_ok)
-                            ).show(requireActivity()) {
-                                // do nothing
-                            }
-                        }
-
-                        else -> {
-                            doBlockVote(request)
-                        }
+        val adapter = UsernameRequestGroupAdapter(
+            { request -> //performVote(request)
+                lifecycleScope.launch {
+                    if (request.requestId != "") {
+                        viewModel.logEvent(AnalyticsConstants.UsernameVoting.DETAILS)
+                        safeNavigate(UsernameRequestsFragmentDirections.requestsToDetails(request.requestId))
+                    } else {
+                        performVote(request)
+//                        when {
+//                            (usernameVotes.size == UsernameVote.MAX_VOTES - 1) -> {
+//                                if (AdaptiveDialog.create(
+//                                        icon = null,
+//                                        getString(R.string.username_vote_one_left),
+//                                        getString(R.string.username_vote_one_left_message, UsernameVote.MAX_VOTES - 1),
+//                                        getString(R.string.cancel),
+//                                        getString(R.string.button_ok)
+//                                    ).showAsync(requireActivity()) == true
+//                                ) {
+//                                    doBlockVote(request)
+//                                }
+//                            }
+//                            usernameVotes.size == UsernameVote.MAX_VOTES -> {
+//                                AdaptiveDialog.create(
+//                                    icon = null,
+//                                    "No votes left",
+//                                    "You cannot submit anymore votes on this username",
+//                                    getString(R.string.button_ok)
+//                                ).show(requireActivity()) {
+//                                    // do nothing
+//                                }
+//                            }
+//                            else -> {
+//                                doBlockVote(request)
+//                            }
+//                        }
                     }
                 }
-            }
-        }
+            },
+            { request -> performVote(request) }
+        )
         binding.requestGroups.adapter = adapter
 
         binding.search.setOnFocusChangeListener { _, isFocused ->
@@ -146,6 +150,7 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
 
             setState(state.filteredUsernameRequests)
             setList(adapter, state.filteredUsernameRequests)
+            //setVotes(state.votes)
 
             if (state.voteSubmitted) {
                 showVoteIndicator(binding, false)
@@ -166,9 +171,58 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
                 populateAppliedFilters(state)
             }
         }
+
+        viewModel.voteSubmissionLiveData.observe(viewLifecycleOwner) { voteData ->
+            log.info("vote data: {}", voteData)
+        }
     }
 
-    private fun doBlockVote(it: UsernameRequest) {
+    private fun performVote(request: UsernameRequest) {
+        lifecycleScope.launch {
+            // handle voting
+            val blockVote = request.requestId == ""
+            val usernameVotes = viewModel.getVotes(request.username)
+            when {
+                (usernameVotes.size == UsernameVote.MAX_VOTES - 1) -> {
+                    if (AdaptiveDialog.create(
+                            icon = null,
+                            getString(R.string.username_vote_one_left),
+                            getString(R.string.username_vote_one_left_message, UsernameVote.MAX_VOTES - 1),
+                            getString(R.string.cancel),
+                            getString(R.string.button_ok)
+                        ).showAsync(requireActivity()) == true
+                    ) {
+                        if (blockVote) {
+                            doBlockVote(request)
+                        } else {
+                            doVote(request)
+                        }
+                    }
+                }
+
+                usernameVotes.size == UsernameVote.MAX_VOTES -> {
+                    AdaptiveDialog.create(
+                        icon = null,
+                        getString(R.string.username_vote_none_left),
+                        getString(R.string.username_vote_none_left_message, UsernameVote.MAX_VOTES),
+                        getString(R.string.button_ok)
+                    ).show(requireActivity()) {
+                        // do nothing
+                    }
+                }
+
+                else -> {
+                    if (blockVote) {
+                        doBlockVote(request)
+                    } else {
+                        doVote(request)
+                    }
+                }
+            }
+        }
+    }
+
+    private suspend fun doBlockVote(request: UsernameRequest) {
         // perform block vote
         if (viewModel.keysAmount > 0) {
             safeNavigate(
@@ -215,6 +269,10 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
         binding.requestGroups.scrollToPosition(scrollPosition)
     }
 
+//    private fun setVotes(adapter: UsernameRequestGroupAdapter, votes: List<UsernameVote>) {
+//        adapter.updateVotes(votes)
+//    }
+
     private fun filterByQuery(items: List<UsernameRequestGroupView>, query: String?): List<UsernameRequestGroupView> {
         if (query.isNullOrEmpty()) {
             return items
diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
index fc6f57d56f..937ab3a986 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
@@ -71,6 +71,7 @@ import kotlin.random.Random
 
 data class UsernameRequestsUIState(
     val filteredUsernameRequests: List<UsernameRequestGroupView> = listOf(),
+    val usernameVotes: Map<String, List<UsernameVote>> = mapOf(),
     val showFirstTimeInfo: Boolean = false,
     val voteSubmitted: Boolean = false,
     val voteCancelled: Boolean = false
@@ -135,11 +136,14 @@ class UsernameRequestsViewModel @Inject constructor(
     val keysAmount: Int
         get() = masternodes.value.size
 
+    val voteSubmissionLiveData = BroadcastUsernameVotesOperation.allOperationsStatus(walletApplication)
+
     init {
         dashPayConfig.observe(DashPayConfig.VOTING_INFO_SHOWN)
             .onEach { isShown -> _uiState.update { it.copy(showFirstTimeInfo = isShown != true) } }
             .launchIn(viewModelScope)
 
+
         _filterState.flatMapLatest {
             observeUsernames()
                 .map { duplicates ->
@@ -205,11 +209,11 @@ class UsernameRequestsViewModel @Inject constructor(
     }
 
     suspend fun getVotes(username: String): List<UsernameVote> {
-        return usernameVoteDao.getVotes(username)
+        return usernameVoteDao.getVotes(Names.normalizeString(username))
     }
 
     fun observeVotesCount(username: String): Flow<Int> {
-        return usernameVoteDao.observeVotes(username).flatMapLatest { flowOf(it.size) }
+        return usernameVoteDao.observeVotes(Names.normalizeString(username)).flatMapLatest { flowOf(it.size) }
     }
 
     fun applyFilters(
@@ -237,7 +241,7 @@ class UsernameRequestsViewModel @Inject constructor(
             return
         }
         logEvent(AnalyticsConstants.UsernameVoting.VOTE)
-        viewModelScope.launch {
+        viewModelScope.launch(Dispatchers.IO) {
             usernameRequestDao.getRequest(requestId)?.let { request ->
                 BroadcastUsernameVotesOperation(walletApplication).create(
                     listOf(request.normalizedLabel),
@@ -247,14 +251,14 @@ class UsernameRequestsViewModel @Inject constructor(
 
                 usernameRequestDao.removeApproval(request.username)
                 usernameRequestDao.update(request.copy(votes = request.votes + keysAmount, isApproved = true))
-                _uiState.update { it.copy(voteSubmitted = true) }
                 usernameVoteDao.insert(
                     UsernameVote(
-                        request.username,
+                        request.normalizedLabel,
                         request.identity,
                         UsernameVote.APPROVE
                     )
                 )
+                _uiState.update { it.copy(voteSubmitted = true) }
             }
         }
     }
@@ -264,7 +268,7 @@ class UsernameRequestsViewModel @Inject constructor(
             return
         }
         logEvent(AnalyticsConstants.UsernameVoting.VOTE_CANCEL)
-        viewModelScope.launch {
+        viewModelScope.launch(Dispatchers.IO) {
             usernameRequestDao.getRequest(requestId)?.let { request ->
                 BroadcastUsernameVotesOperation(walletApplication).create(
                     listOf(request.normalizedLabel),
@@ -272,14 +276,14 @@ class UsernameRequestsViewModel @Inject constructor(
                     masternodes.value.map { it.votingPrivateKey }
                 ).enqueue()
                 usernameRequestDao.update(request.copy(votes = request.votes - keysAmount, isApproved = false))
-                _uiState.update { it.copy(voteCancelled = true) }
                 usernameVoteDao.insert(
                     UsernameVote(
-                        request.username,
+                        request.normalizedLabel,
                         request.identity,
                         UsernameVote.ABSTAIN
                     )
                 )
+                _uiState.update { it.copy(voteCancelled = true) }
             }
         }
     }
@@ -289,7 +293,7 @@ class UsernameRequestsViewModel @Inject constructor(
             return
         }
 
-        viewModelScope.launch {
+        viewModelScope.launch(Dispatchers.IO) {
             val filteredRequests = _uiState.value.filteredUsernameRequests
             val requestIds = filteredRequests.flatMap {
                 it.requests
diff --git a/wallet/src/de/schildbach/wallet/ui/username/VotingKeyInputFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/VotingKeyInputFragment.kt
index fe983bfa13..a191c5e481 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/VotingKeyInputFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/VotingKeyInputFragment.kt
@@ -74,7 +74,7 @@ class VotingKeyInputFragment : Fragment(R.layout.fragment_voting_key_input) {
                         safeNavigate(
                             VotingKeyInputFragmentDirections.votingKeyInputToAddKeys(
                                 args.requestId,
-                                args.approve
+                                args.vote
                             )
                         )
                     }
diff --git a/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupAdapter.kt b/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupAdapter.kt
index 9ece706562..38c74e3b1f 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupAdapter.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupAdapter.kt
@@ -16,9 +16,15 @@
  */
 package de.schildbach.wallet.ui.username.adapters
 
+import android.content.res.ColorStateList
+import android.graphics.PorterDuff
+import android.graphics.drawable.GradientDrawable
+import android.graphics.drawable.RippleDrawable
+import android.graphics.drawable.StateListDrawable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import androidx.core.content.ContextCompat
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
@@ -28,17 +34,64 @@ import androidx.recyclerview.widget.RecyclerView
 import de.schildbach.wallet.database.entity.UsernameRequest
 import de.schildbach.wallet.database.entity.UsernameVote
 import de.schildbach.wallet_test.R
-import de.schildbach.wallet_test.databinding.BlockUsernameRequestViewBinding
 import de.schildbach.wallet_test.databinding.UsernameRequestGroupViewBinding
 import de.schildbach.wallet_test.databinding.UsernameRequestViewBinding
 import org.dash.wallet.common.ui.decorators.ListDividerDecorator
-import org.dash.wallet.common.ui.setRoundedBackground
-import java.time.LocalDateTime
-import java.time.ZoneOffset
-import java.time.format.DateTimeFormatter
+import org.dash.wallet.common.ui.applyStyle
+import org.dash.wallet.common.ui.setRoundedRippleBackground
+import org.dash.wallet.common.ui.setRoundedRippleBackgroundButtonStyle
+import org.dashj.platform.sdk.platform.Names
+import java.text.SimpleDateFormat
+
+import java.util.Date
+import java.util.Locale
+
+//fun Button.setVoteThemeColors(
+//    backgroundColor: ColorStateList,
+//    textColor: ColorStateList
+//) {
+//    // Get the RippleDrawable background
+//    val rippleDrawable = background as RippleDrawable
+//
+//    // Get the selector drawable (second layer)
+//    val selectorDrawable = rippleDrawable.getDrawable(1) as StateListDrawable
+//
+//    // Update disabled state drawable
+//    val disabledShape = (selectorDrawable.getStateDrawable(0) as GradientDrawable)
+//    disabledShape.setColor(backgroundColor)
+//
+//    // Update enabled state drawable
+//    val enabledShape = (selectorDrawable.getStateDrawable(1) as GradientDrawable)
+//
+//    enabledShape.setColor(backgroundColor)
+//    setTextColor(textColor)
+//}
+
+fun Button.setVoteThemeColors(
+    backgroundColor: Int,
+    textColor: Int
+) {
+    try {
+        val backgroundColor = context.getColor(backgroundColor)
+        val rippleDrawable = background as RippleDrawable
+        val backgroundDrawable = rippleDrawable.getDrawable(1).current as? GradientDrawable
+
+        // Set background color directly on the background drawable
+        backgroundDrawable?.setColor(backgroundColor)
+
+        // Set text color
+        setTextColor(context.getColor(textColor))
+    } catch (e: Exception) {
+        // Fallback
+        background.setColorFilter(backgroundColor, PorterDuff.Mode.SRC_IN)
+        setTextColor(textColor)
+    }
+}
+
 
 class UsernameRequestGroupAdapter(
-    private val usernameClickListener: (UsernameRequest) -> Unit
+    private val usernameDetailsClickListener: (UsernameRequest) -> Unit,
+    private val voteClickListener: (UsernameRequest) -> Unit
 ): ListAdapter<UsernameRequestGroupView, UsernameRequestGroupViewHolder>(
     DiffCallback()
 ) {
@@ -64,11 +117,17 @@ class UsernameRequestGroupAdapter(
 
     override fun onBindViewHolder(holder: UsernameRequestGroupViewHolder, position: Int) {
         val item = currentList[position]
-        holder.bind(item, usernameClickListener)
+        val hasMoreThanOneRequest = item.requests.size > 1
+        holder.bind(item, usernameDetailsClickListener, voteClickListener)
         holder.binding.root.setOnClickListener {
-            val index = currentList.indexOfFirst { it.username == item.username }
-            currentList[index].isExpanded = !currentList[index].isExpanded
-            notifyItemChanged(index)
+            // expand if there is more than 1 request, otherwise show details
+            if (hasMoreThanOneRequest) {
+                val index = currentList.indexOfFirst { it.username == item.username }
+                currentList[index].isExpanded = !currentList[index].isExpanded
+                notifyItemChanged(index)
+            } else {
+                usernameDetailsClickListener.invoke(item.requests.first())
+            }
         }
     }
 }
@@ -76,20 +135,80 @@ class UsernameRequestGroupAdapter(
 class UsernameRequestGroupViewHolder(
     val binding: UsernameRequestGroupViewBinding
 ): RecyclerView.ViewHolder(binding.root) {
-    fun bind(option: UsernameRequestGroupView, usernameClickListener: (UsernameRequest) -> Unit) {
+    fun bind(option: UsernameRequestGroupView, usernameClickListener: (UsernameRequest) -> Unit, voteClickListener: (UsernameRequest) -> Unit) {
+        val hasMoreThanOneRequest = option.requests.size > 1
         binding.username.text = option.username
+        binding.requestsAmount.isVisible = hasMoreThanOneRequest
         binding.requestsAmount.text = binding.root.resources.getString(R.string.n_requests, option.requests.size)
         binding.requestsList.isVisible = option.isExpanded
+        binding.chevron.isVisible = hasMoreThanOneRequest
         binding.chevron.rotation = if (option.isExpanded) 90f else 270f
+        binding.linkBadge.isVisible = !hasMoreThanOneRequest
+        binding.linkIncluded.isVisible = !hasMoreThanOneRequest
 
-        binding.blockVotes.text = binding.root.context.getString(R.string.block_vote_count, option.lockVotes())
-        binding.blockVotes.isVisible = option.lockVotes() != 0
+        //binding.blockVotes.text = binding.root.context.getString(R.string.block_vote_count, option.lockVotes())
+        //binding.blockVotes.isVisible = option.lockVotes() != 0
+        val context = binding.root.context
+        binding.blocksButton.text = context.getString(R.string.two_lines_number_text, option.lockVotes(), context.resources.getQuantityString(R.plurals.block_vote_button, option.lockVotes()))
+        binding.blocksButton.setOnClickListener {
+            usernameClickListener.invoke(UsernameRequest.block(option.username, Names.normalizeString(option.username)))
+        }
+        binding.approvalsButton.isVisible = !hasMoreThanOneRequest
+        binding.approvalsButton.text = context.getString(R.string.two_lines_number_text, option.requests.maxOf { it.votes }, context.resources.getQuantityString(R.plurals.approval_button, option.requests.maxOf { it.votes }))
+        binding.approvalsButton.setOnClickListener {
+            // vote for the first request, which is the only request
+            usernameClickListener.invoke(option.requests.first())
+        }
 
+        // change the button colors based on our vote(s)
+        val lastVote = option.votes.lastOrNull()
+        when (lastVote?.type) {
+            UsernameVote.APPROVE -> {
+                binding.blocksButton.text = context.getString(R.string.two_lines_number_text, option.lockVotes(), context.resources.getQuantityString(R.plurals.block_vote_button, option.lockVotes()))
 
-        if (option.isExpanded) {
-            val adapter = UsernameRequestAdapter(option.votes) {
-                usernameClickListener.invoke(it)
+                //binding.approvalsButton.applyStyle(R.style.VoteButton_Blue)
+                //binding.blocksButton.applyStyle(R.style.VoteButton_LightRed)
+
+                binding.blocksButton.setVoteThemeColors(R.color.red_0_05, R.color.red)
+                binding.approvalsButton.setVoteThemeColors(R.color.dash_blue, R.color.dash_white)
+            }
+            UsernameVote.LOCK, UsernameVote.ABSTAIN -> {
+                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)
             }
+            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)
+            }
+        }
+//        option.votes.lastOrNull()?.let { vote ->
+//            when (vote.type) {
+//                UsernameVote.LOCK, UsernameVote.ABSTAIN -> {
+//                    binding.blocksButton.setRoundedBackground(R.style.Button_Vote_Red)
+//                    binding.approvalsButton.setRoundedBackground(R.style.Button_Vote_LightBlue)
+//                }
+//                UsernameVote.APPROVE -> {
+//                    binding.blocksButton.setRoundedBackground(R.style.Button_Vote_LightRed)
+//                    binding.approvalsButton.setRoundedBackground(R.style.Button_Vote_Blue)
+//                }
+//            }
+//        } ?: {
+//            binding.blocksButton.setRoundedBackground(R.style.Button_Vote_LightRed)
+//            binding.approvalsButton.setRoundedBackground(R.style.Button_Vote_LightBlue)
+//        }
+        if (option.isExpanded) {
+            val adapter = UsernameRequestAdapter(
+                option.votes,
+                { request -> usernameClickListener.invoke(request) },
+                { request -> voteClickListener.invoke(request) }
+            )
             binding.requestsList.adapter = adapter
             val divider = ContextCompat.getDrawable(binding.root.context, R.drawable.list_divider)!!
             val decorator = ListDividerDecorator(
@@ -99,32 +218,32 @@ class UsernameRequestGroupViewHolder(
                 marginEnd = 0
             )
             binding.requestsList.addItemDecoration(decorator)
-            val listWithBlock = arrayListOf<UsernameRequest>()
-            listWithBlock.addAll(option.requests)
-            val firstItem = listWithBlock.first()
-            listWithBlock.add(
-                UsernameRequest(
-                    "",
-                    firstItem.username,
-                    firstItem.normalizedLabel,
-                    -1L,
-                    "",
-                    null,
-                    0,
-                    firstItem.lockVotes,
-                    false
-                )
-            )
-            adapter.submitList(listWithBlock)
+//            val listWithBlock = arrayListOf<UsernameRequest>()
+//            listWithBlock.addAll(option.requests)
+//            val firstItem = listWithBlock.first()
+//            listWithBlock.add(
+//                UsernameRequest(
+//                    "",
+//                    firstItem.username,
+//                    firstItem.normalizedLabel,
+//                    -1L,
+//                    "",
+//                    null,
+//                    0,
+//                    firstItem.lockVotes,
+//                    false
+//                )
+//            )
+            adapter.submitList(option.requests)
         }
     }
 }
 
 class UsernameRequestAdapter(
-    private val votes: List<UsernameVote>,
-    private val clickListener: (UsernameRequest) -> Unit
+    private var votes: List<UsernameVote>,
+    private val clickListener: (UsernameRequest) -> Unit,
+    private val voteClickListener: (UsernameRequest) -> Unit
 ) : ListAdapter<UsernameRequest, AbstractUsernameRequestViewHolder>(DiffCallback()) {
-
     class DiffCallback : DiffUtil.ItemCallback<UsernameRequest>() {
         override fun areItemsTheSame(oldItem: UsernameRequest, newItem: UsernameRequest): Boolean {
             return oldItem.requestId == newItem.requestId
@@ -145,12 +264,7 @@ class UsernameRequestAdapter(
 
             return UsernameRequestViewHolder(binding)
         } else {
-            val binding = BlockUsernameRequestViewBinding.inflate(
-                LayoutInflater.from(parent.context),
-                parent,
-                false
-            )
-            return BlockViewHolder(binding)
+            error("invalid viewType: $viewType")
         }
     }
 
@@ -166,72 +280,120 @@ class UsernameRequestAdapter(
         val item = currentList[position]
         holder.bind(item, votes)
 
-        holder.setOnClickListener(item) {
-            clickListener.invoke(item)
-        }
+        holder.setOnClickListener(item, {
+                clickListener.invoke(item)
+            }, {
+                voteClickListener.invoke(item)
+            }
+        )
+    }
+
+    fun updateVotes(votes: List<UsernameVote>) {
+        this.votes = votes
+        currentList
+            .indexOfFirst { it.normalizedLabel == votes.first().username }
+            ?.let {
+                notifyItemChanged(it)
+            }
     }
 }
 abstract class AbstractUsernameRequestViewHolder(root: View): RecyclerView.ViewHolder(root) {
     abstract fun bind(request: UsernameRequest, votes: List<UsernameVote>)
-    abstract fun setOnClickListener(usernameRequest: UsernameRequest, listener: (UsernameRequest) -> Unit)
+    abstract fun setOnClickListener(usernameRequest: UsernameRequest, listener: (UsernameRequest) -> Unit, voteClickListener: (UsernameRequest) -> Unit)
+    //abstract fun setOnVoteClickListener(usernameRequest: UsernameRequest, listener: (UsernameRequest) -> Unit)
+
 }
 
 class UsernameRequestViewHolder(
     val binding: UsernameRequestViewBinding
 ): AbstractUsernameRequestViewHolder(binding.root) {
     override fun bind(request: UsernameRequest, votes: List<UsernameVote>) {
-        binding.dateRegistered.text = DateTimeFormatter.ofPattern("dd MMM yyyy · hh:mm a").format(
-            LocalDateTime.ofEpochSecond(request.createdAt / 1000, 0, ZoneOffset.UTC)
-        )
+        val context = binding.root.context
+        val dateFormat = SimpleDateFormat("dd MMM yyyy · hh:mm a", Locale.getDefault())
+        binding.dateRegistered.text = dateFormat.format(Date(request.createdAt))
+//            DateTimeFormatter.ofPattern("dd MMM yyyy · hh:mm a").format(
+//            LocalDateTime.ofEpochSecond(request.createdAt / 1000, 0, ZoneOffset.UTC)
+//        )
 
-        binding.voteAmount.setRoundedBackground(
-            if (request.isApproved) {
-                R.style.BlueBadgeTheme
-            } else {
-                R.style.InactiveBadgeTheme
+        binding.approvalsButton.text = context.getString(R.string.two_lines_number_text, request.votes, context.resources.getQuantityString(R.plurals.approval_button, request.votes))
+//        binding.approvalsButton.setOnClickListener {
+//            // vote for the first request, which is the only request
+//            usernameClickListener.invoke(option.requests.first())
+//        }
+//        votes.lastOrNull()?.let { vote ->
+//            when (vote.type) {
+//                UsernameVote.LOCK, UsernameVote.ABSTAIN -> {
+//                    binding.approvalsButton.applyStyle(R.style.VoteButton_LightBlue)
+//                }
+//                UsernameVote.APPROVE -> {
+//                    binding.approvalsButton.applyStyle(R.style.VoteButton_Blue)
+//                }
+//            }
+//        } ?: {
+//            binding.approvalsButton.applyStyle(R.style.VoteButton_LightBlue)
+//        }
+        val lastVote = votes.lastOrNull()
+        when (lastVote?.type) {
+            UsernameVote.APPROVE -> {
+                binding.approvalsButton.setVoteThemeColors(R.color.dash_blue, R.color.dash_white)
             }
-        )
+            UsernameVote.LOCK, UsernameVote.ABSTAIN -> {
+                binding.approvalsButton.setVoteThemeColors(R.color.dash_blue_0_05, R.color.dash_blue)
+            }
+            else -> {
+                binding.approvalsButton.setVoteThemeColors(R.color.dash_blue_0_05, R.color.dash_blue)
+            }
+        }
 
-        binding.voteAmount.setTextColor(
-            binding.voteAmount.resources.getColor(
-                if (request.isApproved) {
-                    R.color.white
-                } else {
-                    R.color.content_tertiary
-                },
-                null
-            )
-        )
 
-        binding.voteAmount.text = request.votes.toString()
+//        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
+        //val lastVote = votes.lastOrNull()
+        //binding.cancelApprovalButton.isVisible = lastVote != null && lastVote.identity == request.identity && lastVote.type == UsernameVote.APPROVE
     }
 
-    override fun setOnClickListener(usernameRequest: UsernameRequest, listener: (UsernameRequest) -> Unit) {
+    override fun setOnClickListener(usernameRequest: UsernameRequest, listener: (UsernameRequest) -> Unit, voteClickListener: (UsernameRequest) -> Unit) {
         binding.root.setOnClickListener {
             listener.invoke(usernameRequest)
         }
-        binding.cancelApprovalButton.setOnClickListener {
-            listener.invoke(usernameRequest)
+        binding.approvalsButton.setOnClickListener {
+            voteClickListener.invoke(usernameRequest)
         }
     }
 }
 
-class BlockViewHolder(val binding: BlockUsernameRequestViewBinding)
-    : AbstractUsernameRequestViewHolder(binding.root) {
-
-    override fun bind(request: UsernameRequest, votes: List<UsernameVote>) {
-        val lastVote = votes.lastOrNull()
-        //binding.cancelBlockButton.isVisible = lastVote != null && lastVote.identity == request.identity && lastVote.type == UsernameVote.APPROVE
-    }
-
-    override fun setOnClickListener(usernameRequest: UsernameRequest, listener: (UsernameRequest) -> Unit) {
-        binding.root.setOnClickListener {
-            listener.invoke(usernameRequest)
-        }
-    }
-}
+//class BlockViewHolder(val binding: BlockUsernameRequestViewBinding)
+//    : AbstractUsernameRequestViewHolder(binding.root) {
+//
+//    override fun bind(request: UsernameRequest, votes: List<UsernameVote>) {
+//        val lastVote = votes.lastOrNull()
+//        //binding.cancelBlockButton.isVisible = lastVote != null && lastVote.identity == request.identity && lastVote.type == UsernameVote.APPROVE
+//    }
+//
+//    override fun setOnClickListener(usernameRequest: UsernameRequest, listener: (UsernameRequest) -> Unit) {
+//        binding.root.setOnClickListener {
+//            listener.invoke(usernameRequest)
+//        }
+//    }
+//}
diff --git a/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUserNameViewModel.kt b/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUserNameViewModel.kt
index 331489be57..013d4abd1f 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUserNameViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUserNameViewModel.kt
@@ -35,6 +35,7 @@ import de.schildbach.wallet.service.CoinJoinMode
 import de.schildbach.wallet.ui.dashpay.CreateIdentityService
 import de.schildbach.wallet.ui.dashpay.PlatformRepo
 import de.schildbach.wallet.ui.dashpay.work.BroadcastIdentityVerifyOperation
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -288,7 +289,7 @@ class RequestUserNameViewModel @Inject constructor(
     }
 
     fun verify() {
-        viewModelScope.launch {
+        viewModelScope.launch(Dispatchers.IO) {
             identityConfig.set(BlockchainIdentityConfig.REQUESTED_USERNAME_LINK, _requestedUserNameLink.value ?: "")
             identityConfig.get(IDENTITY_ID)?.let { identityId ->
                 val usernameRequest = usernameRequestDao.getRequest(

From 637f51a280bf37e8a9233ab79756e195a5326b2a Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Thu, 24 Oct 2024 18:12:34 -0700
Subject: [PATCH 06/58] feat: add keys changes

---
 .../res/layout/fragment_add_voting_keys.xml   | 49 +++++++---
 wallet/res/values/strings-dashpay.xml         |  1 +
 .../wallet/ui/dashpay/utils/DashPayConfig.kt  |  2 +
 .../ui/username/AddVotingKeysFragment.kt      | 18 ++++
 .../ui/username/UsernameRequestsFragment.kt   | 53 ++++++++--
 .../ui/username/UsernameRequestsViewModel.kt  | 98 +++++++++++++++----
 6 files changed, 184 insertions(+), 37 deletions(-)

diff --git a/wallet/res/layout/fragment_add_voting_keys.xml b/wallet/res/layout/fragment_add_voting_keys.xml
index 7bcf001a80..eb1525503a 100644
--- a/wallet/res/layout/fragment_add_voting_keys.xml
+++ b/wallet/res/layout/fragment_add_voting_keys.xml
@@ -58,16 +58,7 @@
                 tools:itemCount="5"
                 tools:listitem="@layout/view_masternode_ip" />
 
-            <TextView
-                android:id="@+id/votes_cast_text"
-                style="@style/Overline.Secondary"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
-                android:gravity="center"
-                android:textAlignment="gravity"
-                tools:text="@string/multiple_votes_cast" />
-        </LinearLayout>
+            </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 
     <LinearLayout
@@ -81,7 +72,7 @@
         android:paddingEnd="20dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/submit_button">
+        app:layout_constraintBottom_toTopOf="@id/dont_ask_again_button">
 
         <ImageView
             android:layout_width="wrap_content"
@@ -98,6 +89,27 @@
             android:layout_height="wrap_content" />
     </LinearLayout>
 
+    <LinearLayout
+        android:id="@+id/dont_ask_again_button"
+        style="@style/Button.Tertiary.Large.Blue"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginHorizontal="15dp"
+        android:layout_marginBottom="10dp"
+        android:paddingEnd="20dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/submit_button">
+
+        <TextView
+            style="@style/Subtitle2.Blue"
+            android:textSize="15sp"
+            android:text="@string/dont_ask_again"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+    </LinearLayout>
+
     <Button
         android:id="@+id/submit_button"
         style="@style/Button.Primary.Large.Blue"
@@ -105,5 +117,18 @@
         android:layout_height="wrap_content"
         android:layout_margin="15dp"
         android:text="@string/submit"
-        app:layout_constraintBottom_toBottomOf="parent" />
+        app:layout_constraintBottom_toTopOf="@id/votes_cast_text" />
+    <TextView
+        android:id="@+id/votes_cast_text"
+        style="@style/Overline.Secondary"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        android:gravity="center"
+        android:textAlignment="gravity"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        tools:text="@string/multiple_votes_cast" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/wallet/res/values/strings-dashpay.xml b/wallet/res/values/strings-dashpay.xml
index 02bb945df4..4962fc4cc8 100644
--- a/wallet/res/values/strings-dashpay.xml
+++ b/wallet/res/values/strings-dashpay.xml
@@ -348,6 +348,7 @@
     <string name="masternode_ip">Masternode IP address</string>
     <string name="multiple_votes_cast">%d votes will be cast as you have multiple voting keys stored in the wallet</string>
     <string name="add_masternode_key">Add Masternode Voting Key</string>
+    <string name="dont_ask_again">Don\'t ask me again</string>
     <string name="vote_submitted">Your vote was submitted</string>
     <string name="vote_cancelled">Your vote was cancelled</string>
     <string name="quick_vote">Quick Voting</string>
diff --git a/wallet/src/de/schildbach/wallet/ui/dashpay/utils/DashPayConfig.kt b/wallet/src/de/schildbach/wallet/ui/dashpay/utils/DashPayConfig.kt
index 274560ce61..3dfadaa624 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/utils/DashPayConfig.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/utils/DashPayConfig.kt
@@ -53,6 +53,8 @@ open class DashPayConfig @Inject constructor(
         val HAS_DASH_PAY_INFO_SCREEN_BEEN_SHOWN = booleanPreferencesKey("has_dash_pay_info_screen_been_shown")
         val VOTING_INFO_SHOWN = booleanPreferencesKey("voting_info_shown")
         val MIX_DASH_SHOWN = booleanPreferencesKey("mix_dash_shown")
+        val KEYS_DONT_ASK_AGAIN = booleanPreferencesKey("dont_ask_again_for_keys")
+        val FIRST_TIME_VOTING = booleanPreferencesKey("first_time_voting")
     }
 
     open suspend fun areNotificationsDisabled(): Boolean {
diff --git a/wallet/src/de/schildbach/wallet/ui/username/AddVotingKeysFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/AddVotingKeysFragment.kt
index a0215ff08e..6aade6f56d 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/AddVotingKeysFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/AddVotingKeysFragment.kt
@@ -2,7 +2,10 @@ package de.schildbach.wallet.ui.username
 
 import android.os.Bundle
 import android.view.View
+import androidx.core.view.isGone
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import de.schildbach.wallet.database.entity.UsernameVote
@@ -10,6 +13,9 @@ import de.schildbach.wallet.ui.username.adapters.IPAddressAdapter
 import de.schildbach.wallet.ui.username.utils.votingViewModels
 import de.schildbach.wallet_test.R
 import de.schildbach.wallet_test.databinding.FragmentAddVotingKeysBinding
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.dash.wallet.common.ui.setRoundedRippleBackground
 import org.dash.wallet.common.ui.viewBinding
 import org.dash.wallet.common.util.observe
@@ -53,5 +59,17 @@ class AddVotingKeysFragment : Fragment(R.layout.fragment_add_voting_keys) {
             })
             binding.votesCastText.text = getString(R.string.multiple_votes_cast, it.size)
         }
+
+        binding.dontAskAgainButton.setOnClickListener {
+            lifecycleScope.launch(Dispatchers.IO) {
+                viewModel.setDontAskAgain()
+            }
+            binding.dontAskAgainButton.isVisible = true
+        }
+        lifecycleScope.launch {
+            val isFirstTime = withContext(Dispatchers.IO) { viewModel.isFirstTimeVoting() }
+            binding.dontAskAgainButton.isVisible = !isFirstTime
+            viewModel.setSecondTimeVoting()
+        }
     }
 }
diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
index 45c7f2d59f..955e130815 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
@@ -224,15 +224,54 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
 
     private suspend fun doBlockVote(request: UsernameRequest) {
         // perform block vote
-        if (viewModel.keysAmount > 0) {
-            safeNavigate(
-                UsernameRequestsFragmentDirections.requestsToAddVotingKeysFragment(
-                    it.normalizedLabel,
-                    false
+        val vote = when (viewModel.getVotes(request.normalizedLabel).lastOrNull()?.type) {
+            UsernameVote.LOCK -> UsernameVote.ABSTAIN
+            else -> UsernameVote.LOCK
+        }
+        if (viewModel.shouldMaybeAskForMoreKeys()) {
+            if (viewModel.keysAmount > 0) {
+                safeNavigate(
+                    UsernameRequestsFragmentDirections.requestsToAddVotingKeysFragment(
+                        request.normalizedLabel,
+                        vote
+                    )
+                )
+            } else {
+                safeNavigate(
+                    UsernameRequestsFragmentDirections.requestsToVotingKeyInputFragment(
+                        request.requestId,
+                        vote
+                    )
                 )
-            )
+            }
         } else {
-            safeNavigate(UsernameRequestsFragmentDirections.requestsToVotingKeyInputFragment(it.requestId, false))
+            viewModel.submitVote(request.requestId, vote)
+        }
+    }
+
+    private suspend fun doVote(request: UsernameRequest) {
+        val lastVote = viewModel.getVotes(request.normalizedLabel).lastOrNull()
+        val voteType = when {
+            lastVote == null -> UsernameVote.APPROVE
+            lastVote.type == UsernameVote.APPROVE && lastVote.identity == request.identity -> UsernameVote.ABSTAIN
+            else -> UsernameVote.APPROVE
+        }
+        if (viewModel.shouldMaybeAskForMoreKeys()) {
+            if (viewModel.keysAmount > 0) {
+                safeNavigate(
+                    UsernameRequestsFragmentDirections.requestsToAddVotingKeysFragment(
+                        request.requestId,
+                        voteType
+                    )
+                )
+            } else {
+                safeNavigate(
+                    UsernameRequestsFragmentDirections.requestsToVotingKeyInputFragment(
+                        request.requestId,
+                        voteType
+                    )
+                )
+            }
         }
     }
     private fun showFirstTimeInfo() {
diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
index 937ab3a986..65a4b19150 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
@@ -186,7 +186,6 @@ class UsernameRequestsViewModel @Inject constructor(
             if ((it.type == AuthenticationKeyChain.KeyChainType.MASTERNODE_VOTING ||
                 it.type == AuthenticationKeyChain.KeyChainType.MASTERNODE_OWNER) &&
                 it.status == AuthenticationKeyStatus.CURRENT) {
-
                 val entries = masternodeListManager.listAtChainTip.getMasternodesByVotingKey(KeyId.fromBytes(it.key.pubKeyHash))
                 entries.forEach { masternode ->
                     importedMasternodeKeyDao.insert(
@@ -511,27 +510,90 @@ class UsernameRequestsViewModel @Inject constructor(
             return
         }
         logEvent(AnalyticsConstants.UsernameVoting.BLOCK)
-        viewModelScope.launch {
-           // usernameRequestDao.getRequest(requestId)?.let { request ->
-                BroadcastUsernameVotesOperation(walletApplication).create(
-                    listOf(username),
-                    listOf(ResourceVoteChoice.lock()),
-                    masternodes.value.map { it.votingPrivateKey }
-                ).enqueue()
-                //usernameRequestDao.update(request.copy(lockVotes = request.lockVotes + keysAmount, isApproved = true))
-                _uiState.update { it.copy(voteSubmitted = true) }
-                usernameVoteDao.insert(
-                    UsernameVote(
-                        username,
-                        "",
-                        UsernameVote.LOCK
-                    )
+        viewModelScope.launch(Dispatchers.IO) {
+            BroadcastUsernameVotesOperation(walletApplication).create(
+                listOf(username),
+                listOf(ResourceVoteChoice.lock()),
+                masternodes.value.map { it.votingPrivateKey }
+            ).enqueue()
+            //usernameRequestDao.update(request.copy(lockVotes = request.lockVotes + keysAmount, isApproved = true))
+
+            // TODO: put after actually submitting a vote
+            usernameVoteDao.insert(
+                UsernameVote(
+                    Names.normalizeString(username),
+                    "",
+                    UsernameVote.LOCK
                 )
-            }
-        //}
+            )
+            _uiState.update { it.copy(voteSubmitted = true) }
+        }
     }
 
     fun logEvent(event: String) {
         analytics.logEvent(event, mapOf())
     }
+
+    fun submitVote(requestId: String, vote: String) {
+        when (vote) {
+            UsernameVote.APPROVE -> vote(requestId)
+            UsernameVote.LOCK -> block(requestId)
+            UsernameVote.ABSTAIN -> revokeVote(requestId)
+        }
+    }
+
+    fun setDontAskAgain() {
+        viewModelScope.launch(Dispatchers.IO) {
+            dashPayConfig.set(DashPayConfig.KEYS_DONT_ASK_AGAIN, true)
+        }
+    }
+
+    suspend fun shouldMaybeAskForMoreKeys() = dashPayConfig.get(DashPayConfig.KEYS_DONT_ASK_AGAIN) ?: true
+
+    suspend fun setSecondTimeVoting() {
+        dashPayConfig.set(DashPayConfig.FIRST_TIME_VOTING, false)
+    }
+
+    suspend fun isFirstTimeVoting() = dashPayConfig.get(DashPayConfig.FIRST_TIME_VOTING) ?: true
+
+    fun invalidKeyType(wifKey: String): InvalidKeyType {
+        return try {
+            DumpedPrivateKey.fromBase58(Constants.NETWORK_PARAMETERS, wifKey).key
+            InvalidKeyType.NOT_INVALID // shouldn't happen
+        } catch (e: AddressFormatException.WrongNetwork) {
+            try {
+                Address.fromBase58(Constants.NETWORK_PARAMETERS, wifKey)
+                InvalidKeyType.ADDRESS
+            } catch (e: AddressFormatException) {
+                InvalidKeyType.WRONG_NETWORK
+            }
+        } catch (e: AddressFormatException.InvalidChecksum) {
+            try {
+                if (Base58.decode(wifKey).size < 39)
+                    InvalidKeyType.SHORT
+                else InvalidKeyType.CHECKSUM
+            } catch (e: AddressFormatException.InvalidCharacter) {
+                InvalidKeyType.CHARACTER
+            }
+        } catch (e: AddressFormatException.InvalidCharacter) {
+            try {
+                if (Base58.decode(wifKey).size < 32)
+                    InvalidKeyType.SHORT
+                else InvalidKeyType.CHECKSUM
+            } catch (e: AddressFormatException.InvalidCharacter) {
+                InvalidKeyType.CHARACTER
+            }
+        } catch (e: Exception) {
+            // is it an address
+            try {
+                val decodedBytes = Utils.HEX.decode(wifKey)
+                if (decodedBytes.size == 33) {
+                    InvalidKeyType.PUBLIC_KEY_HEX
+                }
+                InvalidKeyType.PRIVATE_KEY_HEX
+            } catch (e: Exception) {
+                InvalidKeyType.UNKNOWN
+            }
+        }
+    }
 }

From 8380f242f0d5c347156694991aed7356170d1fcb Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Thu, 24 Oct 2024 18:12:44 -0700
Subject: [PATCH 07/58] feat: add keys errors

---
 wallet/res/values/strings-dashpay.xml         | 11 ++++++++++
 .../UsernameRequestDetailsFragment.kt         | 22 +++++++++++--------
 .../ui/username/UsernameRequestsViewModel.kt  | 14 ++++++++++++
 .../ui/username/VotingKeyInputFragment.kt     | 16 +++++++++++++-
 4 files changed, 53 insertions(+), 10 deletions(-)

diff --git a/wallet/res/values/strings-dashpay.xml b/wallet/res/values/strings-dashpay.xml
index 4962fc4cc8..22f75fca7a 100644
--- a/wallet/res/values/strings-dashpay.xml
+++ b/wallet/res/values/strings-dashpay.xml
@@ -343,6 +343,15 @@
     <string name="voting_key_hint">Masternode Voting Private Key</string>
     <string name="voting_key_input_error">You have entered an invalid key</string>
     <string name="voting_key_input_not_active_error">You have entered a key that is not associated to an active Masternode</string>
+    <string name="voting_key_input_invalid_private_key_wrong_network_testnet">You have entered a key that is for testnet, but this is mainnet. It should look like this: %s</string>
+    <string name="voting_key_input_invalid_private_key_wrong_network_mainnet">You have entered a key that is for mainnet, but this is testnet. It should look like this: %s</string>
+    <string name="voting_key_input_invalid_private_key_address">You have entered an address key instead of a masternode voting private key. It should be in WIF format (%s)</string>
+    <string name="voting_key_input_invalid_private_key_private_key_hex">You have entered a key in hex format, but it should be in WIF format (%s)</string>
+    <string name="voting_key_input_invalid_private_key_public_key_hex">You have entered a key in hex format, but it should be in WIF format (%s)</string>
+    <string name="voting_key_input_invalid_private_key_too_short">You have entered a private key that is too short.  Here is an example (%s)</string>
+    <string name="voting_key_input_invalid_private_key_incorrect">You have entered a private key that with some incorrect characters.  Here is an example (%s)</string>
+    <string name="voting_key_input_invalid_private_key_invalid_char">You have entered a private key has an invalid character.  Here is an example (%s)</string>
+
     <string name="voting_key_add">Add your voting keys</string>
     <string name="voting_key_add_subtitle">The IP address(es) below are associated with this wallet</string>
     <string name="masternode_ip">Masternode IP address</string>
@@ -427,4 +436,6 @@
     <string name="mix_dash_mix">Mix Balance</string>
     <string name="mix_dash_title">Mix your Dash</string>
     <string name="mix_dash_message">To help prevent other people from seeing who you make payments to, it is recommended to mix your balance before you create your username.</string>
+    <string name="dash_private_key_mainnet" translatable="false">XKm5koXHMm7UrVV3ki2pbGA8yZztiSR2F9x6ucEyCSuqTHBMjJix</string>
+    <string name="dash_private_key_testnet" translatable="false">cUR2TrX4U6t6g9kRfDoBbwF2WRKBNjV3gK7HwTgQgmUUQCKXcT3N</string>
 </resources>
diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestDetailsFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestDetailsFragment.kt
index 2eb450b7cd..84c7317db8 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestDetailsFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestDetailsFragment.kt
@@ -71,7 +71,7 @@ class UsernameRequestDetailsFragment : Fragment(R.layout.fragment_username_reque
                                 getString(R.string.button_ok)
                             ).show(requireActivity()) {
                                 if (it == true) {
-                                    doVote(request)
+                                    lifecycleScope.launch { doVote(request) }
                                 }
                             }
                         }
@@ -87,7 +87,7 @@ class UsernameRequestDetailsFragment : Fragment(R.layout.fragment_username_reque
                         }
 
                         else -> {
-                            doVote(request)
+                            lifecycleScope.launch { doVote(request) }
                         }
                     }
                 }
@@ -97,26 +97,30 @@ class UsernameRequestDetailsFragment : Fragment(R.layout.fragment_username_reque
         viewModel.selectUsernameRequest(args.requestId)
     }
 
-    private fun doVote(request: UsernameRequest) {
-        if (request.isApproved) {
-            viewModel.revokeVote(args.requestId)
-            findNavController().popBackStack(R.id.usernameRequestsFragment, false)
-        } else {
+    private suspend fun doVote(request: UsernameRequest) {
+        val lastVote = viewModel.getVotes(request.normalizedLabel).lastOrNull()
+        val voteType = when {
+            lastVote == null -> UsernameVote.APPROVE
+            lastVote.type == UsernameVote.APPROVE && lastVote.identity == request.identity -> UsernameVote.ABSTAIN
+            else -> UsernameVote.APPROVE
+        }
+        if (viewModel.shouldMaybeAskForMoreKeys()) {
             if (viewModel.keysAmount > 0) {
                 safeNavigate(
                     UsernameRequestDetailsFragmentDirections.detailsToAddKeys(
                         args.requestId,
-                        true
+                        voteType
                     )
                 )
             } else {
                 safeNavigate(
                     UsernameRequestDetailsFragmentDirections.detailsToVotingKeyInput(
                         args.requestId,
-                        true
+                        voteType
                     )
                 )
             }
         }
+
     }
 }
diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
index 65a4b19150..692db3017b 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
@@ -49,11 +49,13 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import org.bitcoinj.core.Address
 import org.bitcoinj.core.AddressFormatException
 import org.bitcoinj.core.Base58
 import org.bitcoinj.core.DumpedPrivateKey
 import org.bitcoinj.core.ECKey
 import org.bitcoinj.core.KeyId
+import org.bitcoinj.core.Utils
 import org.bitcoinj.evolution.SimplifiedMasternodeListManager
 import org.bitcoinj.wallet.AuthenticationKeyChain
 import org.bitcoinj.wallet.authentication.AuthenticationKeyStatus
@@ -69,6 +71,18 @@ import javax.inject.Inject
 import kotlin.math.min
 import kotlin.random.Random
 
+enum class InvalidKeyType {
+    WRONG_NETWORK,
+    ADDRESS,
+    PUBLIC_KEY_HEX,
+    PRIVATE_KEY_HEX,
+    NOT_INVALID,
+    CHARACTER,
+    SHORT,
+    CHECKSUM,
+    UNKNOWN
+}
+
 data class UsernameRequestsUIState(
     val filteredUsernameRequests: List<UsernameRequestGroupView> = listOf(),
     val usernameVotes: Map<String, List<UsernameVote>> = mapOf(),
diff --git a/wallet/src/de/schildbach/wallet/ui/username/VotingKeyInputFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/VotingKeyInputFragment.kt
index a191c5e481..74d74fd921 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/VotingKeyInputFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/VotingKeyInputFragment.kt
@@ -31,6 +31,7 @@ import de.schildbach.wallet_test.R
 import de.schildbach.wallet_test.databinding.FragmentVotingKeyInputBinding
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import org.bitcoinj.core.NetworkParameters
 import org.dash.wallet.common.ui.viewBinding
 import org.dash.wallet.common.util.KeyboardUtil
 import org.dash.wallet.common.util.onUserInteraction
@@ -84,7 +85,20 @@ class VotingKeyInputFragment : Fragment(R.layout.fragment_voting_key_input) {
                     binding.inputError.isVisible = true
                 }
             } else {
-                binding.inputError.text = getString(R.string.voting_key_input_error)
+                // determine the type of invalid key
+                val isMainnet = de.schildbach.wallet.Constants.NETWORK_PARAMETERS.id == NetworkParameters.ID_MAINNET
+                val errorMessageId = when (viewModel.invalidKeyType(wifKey)) {
+                    InvalidKeyType.WRONG_NETWORK -> if (isMainnet) R.string.voting_key_input_invalid_private_key_wrong_network_testnet else R.string.voting_key_input_invalid_private_key_wrong_network_mainnet
+                    InvalidKeyType.ADDRESS -> R.string.voting_key_input_invalid_private_key_address
+                    InvalidKeyType.PRIVATE_KEY_HEX -> R.string.voting_key_input_invalid_private_key_private_key_hex
+                    InvalidKeyType.PUBLIC_KEY_HEX -> R.string.voting_key_input_invalid_private_key_public_key_hex
+                    InvalidKeyType.SHORT -> R.string.voting_key_input_invalid_private_key_too_short
+                    InvalidKeyType.CHECKSUM -> R.string.voting_key_input_invalid_private_key_incorrect
+                    InvalidKeyType.CHARACTER -> R.string.voting_key_input_invalid_private_key_invalid_char
+
+                    else -> R.string.voting_key_input_error
+                }
+                binding.inputError.text = getString(errorMessageId, getString(if (isMainnet) R.string.dash_private_key_mainnet else R.string.dash_private_key_testnet))
                 binding.inputWrapper.isErrorEnabled = true
                 binding.inputError.isVisible = true
             }

From c6376bac2d71343654a17b85b79637c7702b777f Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Mon, 28 Oct 2024 15:53:53 -0700
Subject: [PATCH 08/58] feat: enable ANR tracing in logs

---
 wallet/src/de/schildbach/wallet/WalletApplication.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/wallet/src/de/schildbach/wallet/WalletApplication.java b/wallet/src/de/schildbach/wallet/WalletApplication.java
index 881ce9e0f8..bcb6b0b861 100644
--- a/wallet/src/de/schildbach/wallet/WalletApplication.java
+++ b/wallet/src/de/schildbach/wallet/WalletApplication.java
@@ -143,6 +143,7 @@
 import de.schildbach.wallet.transactions.WalletMostRecentTransactionsObserver;
 import de.schildbach.wallet.security.PinRetryController;
 import de.schildbach.wallet.util.AllowLockTimeRiskAnalysis;
+import de.schildbach.wallet.util.AnrSupervisor;
 import de.schildbach.wallet.util.CrashReporter;
 import de.schildbach.wallet.util.LogMarkerFilter;
 import de.schildbach.wallet.util.MnemonicCodeExt;
@@ -188,6 +189,7 @@ public class WalletApplication extends MultiDexApplication
     public Activity currentActivity;
 
     private AutoLogout autoLogout;
+    private AnrSupervisor anrSupervisor;
 
     @Inject
     RestartService restartService;
@@ -326,6 +328,8 @@ private void logState() {
         }
 
         resetBlockchainSyncProgress();
+        anrSupervisor = new AnrSupervisor();
+        anrSupervisor.start();
     }
 
     private void syncExploreData() {

From b698f1a601809915aab1fc2afeb5b5433d1acb65 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Mon, 28 Oct 2024 15:55:15 -0700
Subject: [PATCH 09/58] fix: use Dispatchers.IO for RequestUserNameViewModel

---
 .../wallet/ui/username/voting/RequestUserNameViewModel.kt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 013d4abd1f..f2322f5e20 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUserNameViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUserNameViewModel.kt
@@ -127,7 +127,7 @@ class RequestUserNameViewModel @Inject constructor(
     private val _myUsernameRequest = MutableStateFlow<UsernameRequest?>(null)
 
     init {
-        viewModelScope.launch {
+        viewModelScope.launch(Dispatchers.IO) {
             _requestedUserNameLink.value = identityConfig.get(BlockchainIdentityConfig.REQUESTED_USERNAME_LINK)
         }
         identityConfig.observe(IDENTITY_ID)
@@ -191,7 +191,7 @@ class RequestUserNameViewModel @Inject constructor(
     fun submit() {
         // Reset ui state for retry if needed
         resetUiForRetrySubmit()
-        viewModelScope.launch {
+        viewModelScope.launch(Dispatchers.IO) {
             updateConfig()
             // send the request / create username, assume not retry
             val reuseTransaction = identity?.let {
@@ -248,7 +248,7 @@ class RequestUserNameViewModel @Inject constructor(
     }
 
     fun checkUsername(requestedUserName: String?) {
-        viewModelScope.launch {
+        viewModelScope.launch(Dispatchers.IO) {
             requestedUserName?.let { username ->
                 val usernameSearchResult = platformRepo.getUsername(username)
                 val usernameExists = when (usernameSearchResult.status) {
@@ -311,7 +311,7 @@ class RequestUserNameViewModel @Inject constructor(
     }
 
     fun cancelRequest() {
-        viewModelScope.launch {
+        viewModelScope.launch(Dispatchers.IO) {
             identityConfig.set(BlockchainIdentityConfig.USERNAME, "")
             identityConfig.set(BlockchainIdentityConfig.REQUESTED_USERNAME_LINK, "")
             identityConfig.set(BlockchainIdentityConfig.CANCELED_REQUESTED_USERNAME_LINK, true)

From 81f6172d2ec00105e98c6a0eddd771639b86ac2f Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Mon, 28 Oct 2024 15:58:23 -0700
Subject: [PATCH 10/58] refactor: change vote system to return a tuple

---
 .../platform/PlatformBroadcastService.kt      | 42 +++++++++++--------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/wallet/src/de/schildbach/wallet/service/platform/PlatformBroadcastService.kt b/wallet/src/de/schildbach/wallet/service/platform/PlatformBroadcastService.kt
index 1d9648452b..02961d5c87 100644
--- a/wallet/src/de/schildbach/wallet/service/platform/PlatformBroadcastService.kt
+++ b/wallet/src/de/schildbach/wallet/service/platform/PlatformBroadcastService.kt
@@ -44,13 +44,17 @@ import org.slf4j.LoggerFactory
 import java.io.ByteArrayOutputStream
 import javax.inject.Inject
 
-
 interface PlatformBroadcastService {
     suspend fun broadcastUpdatedProfile(dashPayProfile: DashPayProfile, encryptionKey: KeyParameter): DashPayProfile
     suspend fun sendContactRequest(toUserId: String): DashPayContactRequest
     suspend fun sendContactRequest(toUserId: String, encryptionKey: KeyParameter): DashPayContactRequest
     suspend fun broadcastIdentityVerify(username: String, url: String, encryptionKey: KeyParameter?): IdentityVerifyDocument
-    suspend fun broadcastUsernameVotes(usernames: List<String>, resourceVoteChoices: List<ResourceVoteChoice>, masternodeKeys: List<ByteArray>, encryptionKey: KeyParameter?): List<Vote>
+    suspend fun broadcastUsernameVotes(
+        usernames: List<String>,
+        resourceVoteChoices: List<ResourceVoteChoice>,
+        masternodeKeys: List<ByteArray>,
+        encryptionKey: KeyParameter?
+    ): List<Triple<ResourceVoteChoice, Vote?, Exception?>>
 }
 
 class PlatformDocumentBroadcastService @Inject constructor(
@@ -58,12 +62,12 @@ class PlatformDocumentBroadcastService @Inject constructor(
     val platformRepo: PlatformRepo,
     val analytics: AnalyticsService,
     val walletDataProvider: WalletDataProvider,
-    val platformSyncService: PlatformSyncService) : PlatformBroadcastService {
-
+    val platformSyncService: PlatformSyncService
+) : PlatformBroadcastService {
     companion object {
         private val log: Logger = LoggerFactory.getLogger(PlatformDocumentBroadcastService::class.java)
     }
-    
+
     @Throws(Exception::class)
     override suspend fun sendContactRequest(toUserId: String): DashPayContactRequest {
         if (walletDataProvider.wallet!!.isEncrypted) {
@@ -132,9 +136,9 @@ class PlatformDocumentBroadcastService @Inject constructor(
         resourceVoteChoices: List<ResourceVoteChoice>,
         masternodeKeys: List<ByteArray>,
         encryptionKey: KeyParameter?
-    ): List<Vote> {
+    ): List<Triple<ResourceVoteChoice, Vote?, Exception?>> {
         Preconditions.checkArgument(usernames.size == resourceVoteChoices.size)
-        val votes = arrayListOf<Vote>()
+        val votes = arrayListOf<Triple<ResourceVoteChoice, Vote?, Exception?>>()
         masternodeKeys.forEach { masternodeKeyBytes ->
             // determine identity
             val masternodeKey = ECKey.fromPrivate(masternodeKeyBytes)
@@ -151,17 +155,21 @@ class PlatformDocumentBroadcastService @Inject constructor(
 
                     usernames.forEachIndexed { index, username ->
                         val resourceVoteChoice = resourceVoteChoices[index]
-                        val vote = platform.names.broadcastVote(
-                            resourceVoteChoice,
-                            username,
-                            masternode.proTxHash,
-                            votingIdentityPublicKey,
-                            SimpleSignerCallback(
-                                mapOf(votingIdentityPublicKey to masternodeKey),
-                                encryptionKey
+                        try {
+                            val vote = platform.names.broadcastVote(
+                                resourceVoteChoice,
+                                username,
+                                masternode.proTxHash,
+                                votingIdentityPublicKey,
+                                SimpleSignerCallback(
+                                    mapOf(votingIdentityPublicKey to masternodeKey),
+                                    encryptionKey
+                                )
                             )
-                        )
-                        votes.add(vote)
+                            votes.add(Triple(resourceVoteChoice, vote, null))
+                        } catch (e: Exception) {
+                            votes.add(Triple(resourceVoteChoice, null, e))
+                        }
                     }
                 } catch (e: Exception) {
                     log.info("broadcast username vote failed:", e)

From 553ebecf4095ae0e90b25987dba76f2a1d574f72 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Mon, 28 Oct 2024 15:59:06 -0700
Subject: [PATCH 11/58] refactor: change vote queries to use get_vote_polls

---
 .../service/platform/PlatformSyncService.kt   | 128 ++++++++++++++++++
 1 file changed, 128 insertions(+)

diff --git a/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt b/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt
index fe3a6199cb..09ef34c862 100644
--- a/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt
+++ b/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt
@@ -75,6 +75,8 @@ import org.dashj.platform.contracts.wallet.TxMetadataItem
 import org.dashj.platform.dashpay.ContactRequest
 import org.dashj.platform.dashpay.UsernameRequestStatus
 import org.dashj.platform.dpp.identifier.Identifier
+import org.dashj.platform.dpp.voting.ContestedDocumentResourceVotePoll
+import org.dashj.platform.sdk.PlatformValue
 import org.dashj.platform.sdk.platform.DomainDocument
 import org.dashj.platform.wallet.IdentityVerify
 import org.slf4j.Logger
@@ -100,6 +102,7 @@ interface PlatformSyncService {
     suspend fun updateContactRequests()
     fun postUpdateBloomFilters()
     suspend fun updateUsernameRequestsWithVotes()
+    suspend fun updateUsernameRequestWithVotes(username: String)
     suspend fun checkUsernameVotingStatus()
 
     fun addContactsUpdatedListener(listener: OnContactsUpdated)
@@ -1050,6 +1053,82 @@ class PlatformSynchronizationService @Inject constructor(
     }
 
     override suspend fun updateUsernameRequestsWithVotes() {
+        checkUsernameVotingStatus()
+        log.info("updateUsernameRequestsWithVotes starting")
+        try {
+            log.info("updateUsernameRequestsWithVotes: getCurrentVotePolls start")
+            val votePolls = platform.platform.names.getCurrentVotePolls()
+            log.info("updateUsernameRequestsWithVotes: getCurrentVotePolls end")
+            // usernameRequestDao.clear()
+            // val myIdentifier = platformRepo.blockchainIdentity.uniqueIdentifier
+            for (votePoll in votePolls) {
+                try {
+                    val name :String? = when (votePoll) {
+                        is ContestedDocumentResourceVotePoll -> {
+                            when (votePoll.indexValues[1]) {
+                                is String -> votePoll.indexValues[1] as String
+                                is PlatformValue -> {
+                                    val value = votePoll.indexValues[1] as PlatformValue
+                                    when (value.tag) {
+                                        PlatformValue.Tag.Text -> value.text
+                                        else -> null
+                                    }
+                                }
+                                else -> null
+                            }
+                        }
+                        else -> null
+                    }
+
+                    name?.let { normalizedLabel ->
+                        val voteContender = platformRepo.getVoteContenders(normalizedLabel)
+
+                        voteContender.map.forEach { (identifier, contender) ->
+
+                            val contestedDocument = contender.seralizedDocument?.let { serialized ->
+                                DomainDocument(
+                                    platform.platform.names.deserialize(serialized)
+                                )
+                            }
+
+                            if (contestedDocument != null) {
+                                val identityVerifyDocument = IdentityVerify(platform.platform).get(identifier, name)
+
+                                val requestId = UsernameRequest.getRequestId(identifier.toString(), normalizedLabel)
+                                val previousUsernameRequest = usernameRequestDao.getRequest(requestId)
+
+                                val usernameRequest = UsernameRequest(
+                                    requestId = requestId,
+                                    username = contestedDocument.label,
+                                    normalizedLabel = name,
+                                    createdAt = contestedDocument.createdAt ?: -1L,
+                                    identity = identifier.toString(),
+                                    link = identityVerifyDocument?.url,
+                                    votes = contender.votes,
+                                    lockVotes = voteContender.lockVoteTally,
+                                    isApproved = previousUsernameRequest?.isApproved ?: false
+                                )
+                                usernameRequestDao.insert(usernameRequest)
+                            } else {
+                                // voting is complete
+                                usernameRequestDao.remove(
+                                    UsernameRequest.getRequestId(identifier.toString(), name)
+                                )
+                            }
+                        }
+                    }
+                } catch(e: Exception) {
+                    log.warn("problem getting vote polls", e)
+                }
+            }
+        } catch (e: Exception) {
+            log.info("problem obtaining votes:", e)
+        } finally {
+            log.info("updateUsernameRequestsWithVotes complete")
+        }
+    }
+
+    /*override*/ suspend fun updateUsernameRequestsWithVotes_old() {
         checkUsernameVotingStatus()
         try {
             val contestedNames = platform.platform.names.getContestedNames()
@@ -1106,6 +1185,55 @@ class PlatformSynchronizationService @Inject constructor(
         }
     }
 
+    /**
+     * update databases for a single username (normalized)
+     */
+    override suspend fun updateUsernameRequestWithVotes(name: String) {
+        try {
+            val voteContender = platformRepo.getVoteContenders(name)
+
+            voteContender.map.forEach { (identifier, contender) ->
+                val contestedDocument = contender.seralizedDocument?.let { serialized ->
+                    DomainDocument(
+                        platform.platform.names.deserialize(serialized)
+                    )
+                }
+                val hasWinner = voteContender.winner.isPresent
+
+                if (!hasWinner) {
+                    if (contestedDocument != null) {
+                        val identityVerifyDocument = IdentityVerify(platform.platform).get(identifier, name)
+
+                        val requestId = UsernameRequest.getRequestId(identifier.toString(), name)
+                        val previousUsernameRequest = usernameRequestDao.getRequest(requestId)
+
+                        val usernameRequest = UsernameRequest(
+                            requestId = requestId,
+                            username = contestedDocument.label,
+                            normalizedLabel = name,
+                            createdAt = contestedDocument.createdAt ?: -1L,
+                            identity = identifier.toString(),
+                            link = identityVerifyDocument?.url,
+                            votes = contender.votes,
+                            lockVotes = voteContender.lockVoteTally,
+                            isApproved = previousUsernameRequest?.isApproved ?: false
+                        )
+                        usernameRequestDao.insert(usernameRequest)
+                    }
+                } else {
+                    // voting is complete
+                    usernameRequestDao.remove(
+                        UsernameRequest.getRequestId(identifier.toString(), name)
+                    )
+                    // remove related votes
+                    usernameVoteDao.remove(name)
+                }
+            }
+        } catch (e: Exception) {
+            log.info("problem obtaining votes for {}:", name, e)
+        }
+    }
+
     override suspend fun triggerPreBlockDownloadComplete() {
         finishPreBlockDownload()
     }

From 4fb22161dafc0ced274683b6311b84764ca397e9 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Tue, 29 Oct 2024 10:45:54 -0700
Subject: [PATCH 12/58] fix: improve Username Voting screen and voting

---
 .../selectable_round_corners_border_light.xml |  17 ++
 wallet/res/layout/username_request_view.xml   |   6 +-
 wallet/res/values/strings-dashpay.xml         |  11 +-
 .../wallet/database/dao/UsernameRequestDao.kt |   7 +
 .../wallet/database/dao/UsernameVoteDao.kt    |   3 +
 .../wallet/database/entity/UsernameRequest.kt |   8 +
 .../wallet/database/entity/UsernameVote.kt    |  14 ++
 .../service/platform/PlatformSyncService.kt   |  88 +++++++---
 .../work/BroadcastUsernameVotesOperation.kt   |  18 +-
 .../work/BroadcastUsernameVotesWorker.kt      | 163 ++++++++++++++++--
 .../UsernameRequestDetailsFragment.kt         |   3 +-
 .../ui/username/UsernameRequestsFragment.kt   |  91 ++++++++--
 .../ui/username/UsernameRequestsViewModel.kt  |  40 ++++-
 .../adapters/UsernameRequestGroupAdapter.kt   |  87 +++-------
 14 files changed, 421 insertions(+), 135 deletions(-)
 create mode 100644 wallet/res/drawable-v21/selectable_round_corners_border_light.xml

diff --git a/wallet/res/drawable-v21/selectable_round_corners_border_light.xml b/wallet/res/drawable-v21/selectable_round_corners_border_light.xml
new file mode 100644
index 0000000000..7104f03418
--- /dev/null
+++ b/wallet/res/drawable-v21/selectable_round_corners_border_light.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/button_ripple_light">
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="8dp" />
+            <solid android:color="@android:color/white" />
+            <stroke android:color="@color/button_ripple_light" android:width="1dp"/>
+        </shape>
+    </item>
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <corners android:radius="8dp" />
+            <solid android:color="@android:color/holo_red_dark" />
+        </shape>
+    </item>
+</ripple>
diff --git a/wallet/res/layout/username_request_view.xml b/wallet/res/layout/username_request_view.xml
index b376342c4e..f107f02037 100644
--- a/wallet/res/layout/username_request_view.xml
+++ b/wallet/res/layout/username_request_view.xml
@@ -22,6 +22,8 @@
     android:layout_height="wrap_content"
     android:clickable="true"
     android:focusable="true"
+    android:layout_marginHorizontal="4dp"
+    android:layout_marginVertical="4dp"
     android:background="?attr/selectableItemBackground"
     tools:context="de.schildbach.wallet.ui.username.adapters.UsernameRequestViewHolder">
 
@@ -29,9 +31,7 @@
         android:id="@+id/info"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@drawable/selectable_round_corners_border"
-        android:layout_marginHorizontal="4dp"
-        android:layout_marginVertical="10dp"
+        android:background="@drawable/selectable_round_corners_border_light"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
diff --git a/wallet/res/values/strings-dashpay.xml b/wallet/res/values/strings-dashpay.xml
index 22f75fca7a..09824f11e0 100644
--- a/wallet/res/values/strings-dashpay.xml
+++ b/wallet/res/values/strings-dashpay.xml
@@ -358,8 +358,15 @@
     <string name="multiple_votes_cast">%d votes will be cast as you have multiple voting keys stored in the wallet</string>
     <string name="add_masternode_key">Add Masternode Voting Key</string>
     <string name="dont_ask_again">Don\'t ask me again</string>
-    <string name="vote_submitted">Your vote was submitted</string>
-    <string name="vote_cancelled">Your vote was cancelled</string>
+    <string name="vote_submitting">Submitting your vote for %s username</string>
+    <string name="vote_submitted">Voted for %s username</string>
+    <string name="cancel_submitting">Canceling your vote for %s username</string>
+    <string name="cancel_submitted">Canceled vote for %s username</string>
+    <string name="block_submitting">Blocking for %s username</string>
+    <string name="block_submitted">You blocked %s username</string>
+    <string name="vote_submitted_error">Error voting for %s username</string>
+    <string name="cancel_submitted_error">Error canceling vote for %s username</string>
+    <string name="block_submitted_error">Error blocking %s username</string>
     <string name="quick_vote">Quick Voting</string>
     <string name="quick_vote_subtitle">By tapping the \"Vote for All\" button, you will automatically vote for all of the filtered usernames (%d) that were submitted first</string>
     <string name="vote_for_all">Vote for All</string>
diff --git a/wallet/src/de/schildbach/wallet/database/dao/UsernameRequestDao.kt b/wallet/src/de/schildbach/wallet/database/dao/UsernameRequestDao.kt
index 0519bdecb1..b42a0c7092 100644
--- a/wallet/src/de/schildbach/wallet/database/dao/UsernameRequestDao.kt
+++ b/wallet/src/de/schildbach/wallet/database/dao/UsernameRequestDao.kt
@@ -76,4 +76,11 @@ interface UsernameRequestDao {
         """
     )
     suspend fun removeApproval(normalizedLabel: String)
+
+    @Query(
+        """
+        SELECT * FROM username_requests
+         """
+    )
+    suspend fun getAll(): List<UsernameRequest>
 }
diff --git a/wallet/src/de/schildbach/wallet/database/dao/UsernameVoteDao.kt b/wallet/src/de/schildbach/wallet/database/dao/UsernameVoteDao.kt
index 15ce929087..db38599522 100644
--- a/wallet/src/de/schildbach/wallet/database/dao/UsernameVoteDao.kt
+++ b/wallet/src/de/schildbach/wallet/database/dao/UsernameVoteDao.kt
@@ -40,4 +40,7 @@ interface UsernameVoteDao {
 
     @Query("DELETE FROM username_votes WHERE username == :username")
     suspend fun remove(username: String)
+
+    @Query("SELECT * FROM username_votes")
+    suspend fun getAllVotes(): List<UsernameVote>
 }
diff --git a/wallet/src/de/schildbach/wallet/database/entity/UsernameRequest.kt b/wallet/src/de/schildbach/wallet/database/entity/UsernameRequest.kt
index ce0ed792d1..a8cc0b9aa3 100644
--- a/wallet/src/de/schildbach/wallet/database/entity/UsernameRequest.kt
+++ b/wallet/src/de/schildbach/wallet/database/entity/UsernameRequest.kt
@@ -52,4 +52,12 @@ data class UsernameRequest(
             false
         )
     }
+
+    override fun equals(other: Any?): Boolean {
+        return other is UsernameRequest && requestId == other.requestId
+    }
+
+    override fun hashCode(): Int {
+        return requestId.hashCode()
+    }
 }
diff --git a/wallet/src/de/schildbach/wallet/database/entity/UsernameVote.kt b/wallet/src/de/schildbach/wallet/database/entity/UsernameVote.kt
index 6543ec58c2..21d10da73f 100644
--- a/wallet/src/de/schildbach/wallet/database/entity/UsernameVote.kt
+++ b/wallet/src/de/schildbach/wallet/database/entity/UsernameVote.kt
@@ -19,6 +19,7 @@ package de.schildbach.wallet.database.entity
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import org.dashj.platform.dpp.voting.ResourceVoteChoice
 
 @Entity(tableName = "username_votes")
 data class UsernameVote(
@@ -30,10 +31,23 @@ data class UsernameVote(
     val timestamp: Long = System.currentTimeMillis()
 ) {
     constructor(username: String, identity: String, type: String): this(0, username, identity, type)
+    constructor(username: String, identity: String, resourceVoteChoice: ResourceVoteChoice) : this(
+        0,
+        username,
+        identity,
+        getVoteString(resourceVoteChoice)
+    )
     companion object {
         const val APPROVE = "approve"
         const val LOCK = "lock"
         const val ABSTAIN = "abstain"
         const val MAX_VOTES = 5 // max allowed by Platform for a masternode
+
+        fun getVoteString(resourceVoteChoice: ResourceVoteChoice) = when {
+            resourceVoteChoice.toString().startsWith("TowardsIdentity") -> UsernameVote.APPROVE
+            resourceVoteChoice.toString().lowercase() == "lock" -> UsernameVote.LOCK
+            resourceVoteChoice.toString().lowercase() == "abstain" -> UsernameVote.ABSTAIN
+            else -> error("unhandled vote type: $resourceVoteChoice")
+        }
     }
 }
diff --git a/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt b/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt
index 09ef34c862..b7ed3491ff 100644
--- a/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt
+++ b/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt
@@ -233,8 +233,8 @@ class PlatformSynchronizationService @Inject constructor(
                     val timeWindow = if (Constants.NETWORK_PARAMETERS.id == NetworkParameters.ID_MAINNET) TimeUnit.DAYS.toMillis(14) else TimeUnit.MINUTES.toMillis(90)
                     if (System.currentTimeMillis() - blockchainIdentityData.votingPeriodStart!! >= timeWindow) {
                         val resource = platformRepo.getUsername(blockchainIdentityData.username!!)
-                        if (resource.status == Status.SUCCESS) {
-                            val domainDocument = DomainDocument(resource.data!!)
+                        if (resource.status == Status.SUCCESS && resource.data != null) {
+                            val domainDocument = DomainDocument(resource.data)
                             if (domainDocument.dashUniqueIdentityId == blockchainIdentityData.identity?.id) {
                                 blockchainIdentityData.creationState =
                                     BlockchainIdentityData.CreationState.DONE_AND_DISMISS
@@ -379,7 +379,6 @@ class PlatformSynchronizationService @Inject constructor(
         } finally {
             updatingContacts.set(false)
 
-
             counterForReport++
             if (counterForReport % 8 == 0) {
                 // record the report to the logs every 2 minutes
@@ -1052,6 +1051,8 @@ class PlatformSynchronizationService @Inject constructor(
         log.info("publishing updates to tx metadata items complete")
     }
 
+    // uses get_vote_polls to get active vote polls, but must check remaining
+    // items in the username_requests table and remove them
     override suspend fun updateUsernameRequestsWithVotes() {
         checkUsernameVotingStatus()
         log.info("updateUsernameRequestsWithVotes starting")
@@ -1061,6 +1062,8 @@ class PlatformSynchronizationService @Inject constructor(
             log.info("updateUsernameRequestsWithVotes: getCurrentVotePolls end")
             // usernameRequestDao.clear()
             // val myIdentifier = platformRepo.blockchainIdentity.uniqueIdentifier
+            val currentRequestList = usernameRequestDao.getAll().toMutableList()
+            val currentUsernames = arrayListOf<String>()
             for (votePoll in votePolls) {
                 try {
                     val name :String? = when (votePoll) {
@@ -1085,42 +1088,71 @@ class PlatformSynchronizationService @Inject constructor(
 
                         voteContender.map.forEach { (identifier, contender) ->
 
-                            val contestedDocument = contender.seralizedDocument?.let { serialized ->
-                                DomainDocument(
-                                    platform.platform.names.deserialize(serialized)
-                                )
-                            }
-
-                            if (contestedDocument != null) {
-                                val identityVerifyDocument = IdentityVerify(platform.platform).get(identifier, name)
-
-                                val requestId = UsernameRequest.getRequestId(identifier.toString(), normalizedLabel)
-                                val previousUsernameRequest = usernameRequestDao.getRequest(requestId)
+                            if (voteContender.winner.isEmpty) {
+                                val contestedDocument = contender.seralizedDocument?.let { serialized ->
+                                    DomainDocument(
+                                        platform.platform.names.deserialize(serialized)
+                                    )
+                                }
 
-                                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)
+                                if (contestedDocument != null) {
+                                    val identityVerifyDocument = IdentityVerify(platform.platform).get(identifier, name)
+
+                                    val requestId = UsernameRequest.getRequestId(identifier.toString(), normalizedLabel)
+                                    val previousUsernameRequest = usernameRequestDao.getRequest(requestId)
+
+                                    val usernameRequest = UsernameRequest(
+                                        requestId = requestId,
+                                        username = contestedDocument.label,
+                                        normalizedLabel = name,
+                                        createdAt = contestedDocument.createdAt ?: -1L,
+                                        identity = identifier.toString(),
+                                        link = identityVerifyDocument?.url,
+                                        votes = contender.votes,
+                                        lockVotes = voteContender.lockVoteTally,
+                                        isApproved = previousUsernameRequest?.isApproved ?: false
+                                    )
+                                    usernameRequestDao.insert(usernameRequest)
+                                    currentRequestList.remove(usernameRequest)
+                                    currentUsernames.add(usernameRequest.normalizedLabel)
+                                } else {
+                                    // voting is complete
+                                    usernameRequestDao.remove(
+                                        UsernameRequest.getRequestId(identifier.toString(), name)
+                                    )
+                                    // remove related votes
+                                    usernameVoteDao.remove(name)
+                                }
                             } else {
-                                // voting is complete
+                                // there is a winner
                                 usernameRequestDao.remove(
                                     UsernameRequest.getRequestId(identifier.toString(), name)
                                 )
+                                // remove related votes
+                                usernameVoteDao.remove(name)
                             }
                         }
                     }
-                } catch(e: Exception) {
+                } catch (e: Exception) {
                     log.warn("problem getting vote polls", e)
                 }
             }
+
+            // check the remaining items to ensure voting has ended
+            currentRequestList.forEach { request ->
+                val voteContender = platformRepo.getVoteContenders(request.normalizedLabel)
+                if (voteContender.winner.isPresent) {
+                    usernameRequestDao.remove(request.requestId)
+                }
+                // remove related votes
+                usernameVoteDao.remove(request.normalizedLabel)
+            }
+            // check votes and remove those from previous vote polls
+            usernameVoteDao.getAllVotes().forEach { vote ->
+                if (!currentUsernames.contains(vote.username)) {
+                    usernameVoteDao.remove(vote.username)
+                }
+            }
         } catch (e: Exception) {
             log.info("problem obtaining votes:", e)
         } finally {
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 e1b5de4964..120db3ed67 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesOperation.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesOperation.kt
@@ -34,29 +34,36 @@ class BroadcastUsernameVotesOperation(val application: Application) {
     class BroadcastUsernameVotesOperationException(message: String) : java.lang.Exception(message)
 
     companion object {
+        var lastTimestamp: Long = System.currentTimeMillis()
         private val log = LoggerFactory.getLogger(BroadcastUsernameVotesOperation::class.java)
 
         private const val WORK_NAME = "BroadcastUsernameVotes.WORK#"
 
-        fun uniqueWorkName(usernames: String) = WORK_NAME + usernames
+        fun uniqueWorkName(usernames: String) = "$WORK_NAME$usernames-${System.currentTimeMillis()}"
 
         fun allOperationsStatus(application: Application): LiveData<MutableMap<String, Resource<WorkInfo>>> {
             val workManager: WorkManager = WorkManager.getInstance(application)
-            return workManager.getWorkInfosByTagLiveData(SendContactRequestWorker::class.qualifiedName!!).switchMap {
+            return workManager.getWorkInfosByTagLiveData(BroadcastUsernameVotesWorker::class.qualifiedName!!).switchMap {
                 return@switchMap liveData {
                     if (it.isNullOrEmpty()) {
                         return@liveData
                     }
 
                     val result = mutableMapOf<String, Resource<WorkInfo>>()
-                    it.forEach {
+                    it.filter { workInfo ->
+                        val timestampTag = workInfo.tags.firstOrNull { it.startsWith("timestamp:") }
+                        timestampTag?.let {
+                            val timestamp = it.removePrefix("timestamp:").toLongOrNull()
+                            timestamp != null && timestamp > lastTimestamp
+                        } ?: false
+                    }.forEach { workInfo ->
                         var toUserId = ""
-                        it.tags.forEach { tag ->
+                        workInfo.tags.forEach { tag ->
                             if (tag.startsWith("usernames:")) {
                                 toUserId = tag.replace("usernames:", "")
                             }
                         }
-                        result[toUserId] = convertState(it)
+                        result[toUserId] = convertState(workInfo)
                     }
                     emit(result)
                 }
@@ -112,6 +119,7 @@ class BroadcastUsernameVotesOperation(val application: Application) {
                 )
             )
             .addTag("usernames:$usernames")
+            .addTag("timestamp:${System.currentTimeMillis()}") // Add timestamp as a tag
             .build()
         log.info("creating BroadcastUsernameVotesOperation({}, {})", usernames, voteChoices)
         return WorkManager.getInstance(application)
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 609e44f925..169fda33c7 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesWorker.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesWorker.kt
@@ -23,6 +23,10 @@ import androidx.work.workDataOf
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import de.schildbach.wallet.Constants
+import de.schildbach.wallet.database.dao.UsernameRequestDao
+import de.schildbach.wallet.database.dao.UsernameVoteDao
+import de.schildbach.wallet.database.entity.UsernameRequest
+import de.schildbach.wallet.database.entity.UsernameVote
 import de.schildbach.wallet.service.platform.PlatformBroadcastService
 import de.schildbach.wallet.service.platform.PlatformSyncService
 import org.bitcoinj.core.DumpedPrivateKey
@@ -31,8 +35,12 @@ import org.bouncycastle.crypto.params.KeyParameter
 import org.dash.wallet.common.WalletDataProvider
 import org.dash.wallet.common.services.analytics.AnalyticsConstants
 import org.dash.wallet.common.services.analytics.AnalyticsService
+import org.dashj.platform.dpp.identifier.Identifier
 import org.dashj.platform.dpp.voting.ContestedDocumentResourceVotePoll
+import org.dashj.platform.dpp.voting.ResourceVote
 import org.dashj.platform.dpp.voting.ResourceVoteChoice
+import org.dashj.platform.dpp.voting.TowardsIdentity
+import org.dashj.platform.dpp.voting.Vote
 import org.dashj.platform.sdk.PlatformValue
 import org.slf4j.LoggerFactory
 
@@ -43,7 +51,9 @@ class BroadcastUsernameVotesWorker @AssistedInject constructor(
     val analytics: AnalyticsService,
     val platformBroadcastService: PlatformBroadcastService,
     val platformSyncService: PlatformSyncService,
-    val walletDataProvider: WalletDataProvider
+    val walletDataProvider: WalletDataProvider,
+    val usernameRequestDao: UsernameRequestDao,
+    val usernameVoteDao: UsernameVoteDao
 ) : BaseWorker(context, parameters) {
     companion object {
         private val log = LoggerFactory.getLogger(BroadcastUsernameVotesWorker::class.java)
@@ -64,6 +74,7 @@ class BroadcastUsernameVotesWorker @AssistedInject constructor(
         val masternodeKeys = inputData.getStringArray(KEY_MASTERNODE_KEYS)
             ?: return Result.failure(workDataOf(KEY_ERROR_MESSAGE to "missing KEY_MASTERNODE_KEYS parameter"))
 
+        // TODO: add decryption later?
         val encryptionKey: KeyParameter
         try {
             encryptionKey = walletDataProvider.wallet!!.keyCrypter!!.deriveKey(password)
@@ -74,19 +85,46 @@ class BroadcastUsernameVotesWorker @AssistedInject constructor(
         }
 
         return try {
-            log.info("creating BroadcastUsernameVotesWorker({}, {})", usernames, voteChoices)
+            log.info("executing BroadcastUsernameVotesWorker({}, {})", usernames, voteChoices)
+            log.info("voting BroadcastUsernameVotesWorker({}, {})", usernames, voteChoices)
 
-            val votes = platformBroadcastService.broadcastUsernameVotes(
+            // comment this out for now
+            val votingResults = platformBroadcastService.broadcastUsernameVotes(
                 usernames.toList(),
                 voteChoices.map { ResourceVoteChoice.from(it) },
                 masternodeKeys.map { DumpedPrivateKey.fromBase58(Constants.NETWORK_PARAMETERS, it).key.privKeyBytes },
                 encryptionKey
             )
+            log.info("voted BroadcastUsernameVotesWorker({}, {})", usernames, voteChoices)
+            // mock the voting results
+//            val votingResults = arrayListOf<Triple<ResourceVoteChoice, Vote?, Exception?>>()
+//            usernames.forEachIndexed { i, username ->
+//                votingResults.add(
+//                    Triple(
+//                        ResourceVoteChoice.from(voteChoices[i]),
+//                        Vote(
+//                            ResourceVote(
+//                                ResourceVoteChoice.from(voteChoices[i]),
+//                                ContestedDocumentResourceVotePoll(
+//                                    SystemIds.dpnsDataContractId,
+//                                    "domain",
+//                                    "parentDomainAndLabel",
+//                                    listOf("dash", username)
+//                                )
+//                            )
+//                        ),
+//                        null
+//                    )
+//                )
+//            }
             // this will update the DB and trigger observers
-            platformSyncService.updateUsernameRequestsWithVotes()
+            // this is taking too long...
+            //platformSyncService.updateUsernameRequestsWithVotes()
+
+            // update local database
             analytics.logEvent(AnalyticsConstants.UsernameVoting.VOTE_SUCCESS, mapOf())
-            val arrayOfnames = votes.map {
-                val item = ((it.resourceVote.votePoll as? ContestedDocumentResourceVotePoll)?.indexValues?.get(1) ?: "null")
+            val arrayOfnames: Array<String> = votingResults.map {
+                val item = ((it.second?.resourceVote?.votePoll as? ContestedDocumentResourceVotePoll)?.indexValues?.get(1) ?: "null")
                 when (item) {
                     is PlatformValue -> {
                         when (item.tag) {
@@ -98,23 +136,116 @@ class BroadcastUsernameVotesWorker @AssistedInject constructor(
                     else -> item.toString()
                 }
             }.toTypedArray()
-            Result.success(
-                workDataOf(
-                    KEY_USERNAMES to if(votes.isNotEmpty()) {
-                        arrayOfnames
-                    } else {
-                        listOf("").toTypedArray()
-                    },
-                )
-            )
+            votingResults.forEach {
+                when (val votePoll = it.second?.resourceVote?.votePoll as? ContestedDocumentResourceVotePoll) {
+                    is ContestedDocumentResourceVotePoll -> {
+                        val normalizedLabel = when (val item = votePoll?.indexValues?.get(1)) {
+                            is PlatformValue -> {
+                                when (item.tag) {
+                                    PlatformValue.Tag.Text -> item.text
+                                    else -> null
+                                }
+                            }
+                            is String -> item
+                            else -> null
+                        }
+                        val identity = when (it.first) {
+                            is TowardsIdentity -> {
+                                (it.first as TowardsIdentity).identifier
+                            }
+                            else -> null
+                        }
+                        normalizedLabel?.let { label ->
+                            updateUsernameVotes(label, identity, masternodeKeys.size, it.first)
+                        }
+                    }
+                }
+            }
+            val errorCount = votingResults.count { it.third != null }
+            when (errorCount) {
+                0 -> {
+                    // all were successful
+                    log.info("all votes succeeded: total submitted {}", errorCount, votingResults.size)
+                    Result.success(
+                        workDataOf(
+                            KEY_USERNAMES to if (votingResults.isNotEmpty()) {
+                                arrayOfnames
+                            } else {
+                                listOf("").toTypedArray()
+                            },
+                            KEY_VOTE_CHOICES to votingResults.map {
+                                it.first.toString()
+                            }.toTypedArray()
+                        )
+                    )
+                }
+                votingResults.size -> {
+                    // all have failed
+                    log.error("all votes failed: errors: {} vs total submitted {}", errorCount, votingResults.size)
+                    // java.lang.Exception: Attempted to unwrap a Failure: Dapi client error: Transport(Status { code: InvalidArgument, message: "Masternode vote is already present for masternode EbitFAjpGsuf7qKPpsQMZw2ZKZ8rs2S1PdqKvYA8J2Ux voting for ContestedDocumentResourceVotePoll(ContestedDocumentResourceVotePoll { contract_id: GWRSAVFMjXx8HpQFaNJMqBV7MBgMK4br5UESsB4S31Ec, document_type_name: domain, index_name: parentNameAndLabel, index_values: [string dash, string test-1101] })", metadata: MetadataMap { headers: {"drive-error-data-bin": "oW9zZXJpYWxpemVkRXJyb3KYbwIYKxjKDQkQABgqGO0YuRh/GLMDGOkYexgdGLEVGIMYvhhiGLMY2xiLGGEYRxj/GKgYSxiYGDAYnxjOGHEAGOYYaBjGGFkYrxhmGK4Y4RjnGCwYGBhtGN4YexhbGH4KGB0YcRgqCRjEDRhXGCEY9hgiGL8YUxjFGDEYVQYYZBhvGG0YYRhpGG4SGHAYYRhyGGUYbhh0GE4YYRhtGGUYQRhuGGQYTBhhGGIYZRhsAhIEGGQYYRhzGGgSCRh0GGUYcxh0GC0YMRgxGDAYMQ==", "code": "40304", "grpc-accept-encoding": "identity", "grpc-encoding": "identity", "content-type": "application/grpc+proto", "date": "Mon, 28 Oct 2024 22:27:37 GMT", "x-envoy-upstream-service-time": "55", "server": "envoy"} }, source: None }, Address { ban_count: 0, banned_until: None, uri: https://52.89.154.48:1443/ })
+                    votingResults.forEach {
+                        it.third?.let { e ->
+                            log.error("error with vote: {}", it.first, e)
+                        }
+                    }
+                    Result.failure(
+                        workDataOf(
+                            KEY_USERNAMES to if (votingResults.isNotEmpty()) {
+                                arrayOfnames
+                            } else {
+                                listOf("").toTypedArray()
+                            },
+                            KEY_VOTE_CHOICES to votingResults.map {
+                                it.first.toString()
+                            }.toTypedArray()
+                        )
+                    )
+                }
+                else -> {
+                    // some have failed, how can we report this?
+                    log.error("not all votes succeeeded: errors: {} vs total submitted {}", errorCount, votingResults.size)
+                    votingResults.forEach {
+                        it.third?.let { e ->
+                            log.error("error with vote: {}", it.first, e)
+                        }
+                    }
+                    Result.success(
+                        workDataOf(
+                            KEY_USERNAMES to usernames,
+                            KEY_VOTE_CHOICES to voteChoices
+                        )
+                    )
+                }
+            }
         } catch (ex: Exception) {
             analytics.logEvent(AnalyticsConstants.UsernameVoting.VOTE_ERROR, mapOf())
             analytics.logError(ex, "Username Voting: failed to broadcast votes")
             Result.failure(
                 workDataOf(
-                    KEY_ERROR_MESSAGE to formatExceptionMessage("broadcast username vote", ex)
+                    KEY_ERROR_MESSAGE to formatExceptionMessage("broadcast username vote", ex),
+                    KEY_USERNAMES to usernames,
+                    KEY_VOTE_CHOICES to voteChoices
                 )
             )
+        } finally {
+            log.info("finshed BroadcastUsernameVotesWorker({}, {})", usernames, voteChoices)
         }
     }
+
+    private suspend fun updateUsernameVotes(
+        normalizedLabel: String,
+        identity: Identifier?,
+        keyCount: Int,
+        voteType: ResourceVoteChoice
+    ) {
+        // usernameRequestDao.removeApproval(request.username)
+        // usernameRequestDao.update(request.copy(votes = request.votes + keyCount, isApproved = true))
+        usernameVoteDao.insert(
+            UsernameVote(
+                normalizedLabel,
+                identity?.toString() ?: "",
+                voteType
+            )
+        )
+    }
 }
\ No newline at end of file
diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestDetailsFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestDetailsFragment.kt
index 84c7317db8..c075292cf2 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestDetailsFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestDetailsFragment.kt
@@ -120,7 +120,8 @@ class UsernameRequestDetailsFragment : Fragment(R.layout.fragment_username_reque
                     )
                 )
             }
+        } else {
+            viewModel.submitVote(request.requestId, voteType)
         }
-
     }
 }
diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
index 955e130815..33a0c69183 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
@@ -30,6 +30,8 @@ import dagger.hilt.android.AndroidEntryPoint
 import de.schildbach.wallet.Constants
 import de.schildbach.wallet.database.entity.UsernameRequest
 import de.schildbach.wallet.database.entity.UsernameVote
+import de.schildbach.wallet.livedata.Status
+import de.schildbach.wallet.ui.dashpay.work.BroadcastUsernameVotesWorker
 import de.schildbach.wallet.ui.username.adapters.UsernameRequestGroupAdapter
 import de.schildbach.wallet.ui.username.adapters.UsernameRequestGroupView
 import de.schildbach.wallet.ui.username.utils.votingViewModels
@@ -43,6 +45,10 @@ import org.dash.wallet.common.ui.viewBinding
 import org.dash.wallet.common.util.KeyboardUtil
 import org.dash.wallet.common.util.observe
 import org.dash.wallet.common.util.safeNavigate
+import org.dashj.platform.dpp.voting.AbstainVoteChoice
+import org.dashj.platform.dpp.voting.LockVoteChoice
+import org.dashj.platform.dpp.voting.ResourceVoteChoice
+import org.dashj.platform.dpp.voting.TowardsIdentity
 import org.slf4j.LoggerFactory
 
 @AndroidEntryPoint
@@ -143,7 +149,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()
             }
@@ -152,13 +158,13 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
             setList(adapter, state.filteredUsernameRequests)
             //setVotes(state.votes)
 
-            if (state.voteSubmitted) {
-                showVoteIndicator(binding, false)
-            }
-
-            if (state.voteCancelled) {
-                showVoteIndicator(binding, true)
-            }
+//            if (state.voteSubmitted) {
+//                showVoteIndicator(binding, false)
+//            }
+//
+//            if (state.voteCancelled) {
+//                showVoteIndicator(binding, true)
+//            }
         }
 
         viewModel.filterState.observe(viewLifecycleOwner) { state ->
@@ -174,6 +180,36 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
 
         viewModel.voteSubmissionLiveData.observe(viewLifecycleOwner) { voteData ->
             log.info("vote data: {}", voteData)
+            voteData.forEach { (t, u) ->
+                try {
+                    val usernames =
+                        u.data?.outputData?.getStringArray(BroadcastUsernameVotesWorker.KEY_USERNAMES)?.toList()
+                    val votes =
+                        u.data?.outputData?.getStringArray(BroadcastUsernameVotesWorker.KEY_VOTE_CHOICES)?.toList()
+                    when (u.status) {
+                        Status.LOADING -> {
+                            log.info("  loading: {} {}", t, u.data?.outputData)
+                            //showVoteIndicator(binding, votes, usernames, u.status)
+                        }
+
+                        Status.SUCCESS -> {
+                            log.info("  success: {} {}", t, u.data?.outputData)
+                            showVoteIndicator(binding, votes!!, usernames!!, u.status)
+                        }
+
+                        Status.ERROR -> {
+                            log.info("  error: {} {}", t, u.data?.outputData)
+                            showVoteIndicator(binding, votes!!, usernames!!, u.status)
+                        }
+
+                        Status.CANCELED -> {
+                            log.info("  error: {} {}", t, u.data?.outputData)
+                        }
+                    }
+                } catch (e: Exception) {
+                    log.error("error processing vote information", e)
+                }
+            }
         }
     }
 
@@ -272,6 +308,8 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
                     )
                 )
             }
+        } else {
+            viewModel.submitVote(request.requestId, voteType)
         }
     }
     private fun showFirstTimeInfo() {
@@ -339,8 +377,41 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
         binding.filteredByTxt.text = appliedFilterNames.joinToString(", ")
     }
 
-    private fun showVoteIndicator(binding: FragmentUsernameRequestsBinding, isCancelled: Boolean) {
-        binding.voteSubmittedTxt.text = getString(if (isCancelled) R.string.vote_cancelled else R.string.vote_submitted)
+    private fun showVoteIndicator(binding: FragmentUsernameRequestsBinding, votes: List<String>, usernames: List<String>, status: Status) {
+        if (votes.isEmpty()) {
+            return
+        }
+        val resourceVoteChoice = ResourceVoteChoice.from(votes.first())
+        val isCancelled = resourceVoteChoice == AbstainVoteChoice()
+        val username = if (usernames.size > 1) getString(R.string.quick_vote) else usernames.first()
+        viewModel.updateBroadcastVotesTimestamp()
+        viewModel.updateUsernameRequestsWithVotes()
+        if (viewModel.currentVote?.any { usernames.contains(it.username) } == true) {
+            log.info("there is a match?")
+            //return
+        }
+        val toastText = when (status) {
+            Status.SUCCESS -> when (resourceVoteChoice) {
+                is AbstainVoteChoice -> getString(R.string.cancel_submitted, username)
+                is LockVoteChoice -> getString(R.string.block_submitted, username)
+                is TowardsIdentity -> getString(R.string.vote_submitted, username)
+                else -> error("invalid vote choice: $resourceVoteChoice")
+            }
+            Status.LOADING -> when (resourceVoteChoice) {
+                is AbstainVoteChoice -> getString(R.string.cancel_submitting, username)
+                is LockVoteChoice -> getString(R.string.block_submitting, username)
+                is TowardsIdentity -> getString(R.string.vote_submitting, username)
+                else -> error("invalid vote choice: $resourceVoteChoice")
+            }
+            Status.ERROR -> when (resourceVoteChoice) {
+                is AbstainVoteChoice -> getString(R.string.cancel_submitted_error, username)
+                is LockVoteChoice -> getString(R.string.block_submitted_error, username)
+                is TowardsIdentity -> getString(R.string.vote_submitted_error, username)
+                else -> error("invalid vote choice: $resourceVoteChoice")
+            }
+            Status.CANCELED -> return
+        }
+        binding.voteSubmittedTxt.text = toastText
         binding.voteSubmittedIcon.isVisible = !isCancelled
         binding.voteSubmittedIndicator.alpha = 0f
         binding.voteSubmittedIndicator.isVisible = true
diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
index 692db3017b..a936b77742 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
@@ -117,6 +117,7 @@ class UsernameRequestsViewModel @Inject constructor(
     private val walletApplication: WalletApplication,
     private val analytics: AnalyticsService
 ): ViewModel() {
+    var currentVote: ArrayList<UsernameVote>? = null
     private val workerJob = SupervisorJob()
     private val viewModelWorkerScope = CoroutineScope(Dispatchers.IO + workerJob)
 
@@ -264,7 +265,14 @@ class UsernameRequestsViewModel @Inject constructor(
 
                 usernameRequestDao.removeApproval(request.username)
                 usernameRequestDao.update(request.copy(votes = request.votes + keysAmount, isApproved = true))
-                usernameVoteDao.insert(
+//                usernameVoteDao.insert(
+//                    UsernameVote(
+//                        request.normalizedLabel,
+//                        request.identity,
+//                        UsernameVote.APPROVE
+//                    )
+//                )
+                currentVote = arrayListOf(
                     UsernameVote(
                         request.normalizedLabel,
                         request.identity,
@@ -289,10 +297,17 @@ class UsernameRequestsViewModel @Inject constructor(
                     masternodes.value.map { it.votingPrivateKey }
                 ).enqueue()
                 usernameRequestDao.update(request.copy(votes = request.votes - keysAmount, isApproved = false))
-                usernameVoteDao.insert(
+//                usernameVoteDao.insert(
+//                    UsernameVote(
+//                        request.normalizedLabel,
+//                        request.identity,
+//                        UsernameVote.ABSTAIN
+//                    )
+//                )
+                currentVote = arrayListOf(
                     UsernameVote(
                         request.normalizedLabel,
-                        request.identity,
+                        "",
                         UsernameVote.ABSTAIN
                     )
                 )
@@ -533,7 +548,14 @@ class UsernameRequestsViewModel @Inject constructor(
             //usernameRequestDao.update(request.copy(lockVotes = request.lockVotes + keysAmount, isApproved = true))
 
             // TODO: put after actually submitting a vote
-            usernameVoteDao.insert(
+//            usernameVoteDao.insert(
+//                UsernameVote(
+//                    Names.normalizeString(username),
+//                    "",
+//                    UsernameVote.LOCK
+//                )
+//            )
+            currentVote = arrayListOf(
                 UsernameVote(
                     Names.normalizeString(username),
                     "",
@@ -610,4 +632,14 @@ class UsernameRequestsViewModel @Inject constructor(
             }
         }
     }
+
+    fun updateBroadcastVotesTimestamp() {
+        BroadcastUsernameVotesOperation.lastTimestamp = System.currentTimeMillis()
+    }
+
+    fun updateUsernameRequestsWithVotes() {
+        viewModelScope.launch(Dispatchers.IO) {
+            platformSyncService.updateUsernameRequestsWithVotes()
+        }
+    }
 }
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 38c74e3b1f..196ff6eee1 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupAdapter.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupAdapter.kt
@@ -46,27 +46,6 @@ import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
 
-//fun Button.setVoteThemeColors(
-//    backgroundColor: ColorStateList,
-//    textColor: ColorStateList
-//) {
-//    // Get the RippleDrawable background
-//    val rippleDrawable = background as RippleDrawable
-//
-//    // Get the selector drawable (second layer)
-//    val selectorDrawable = rippleDrawable.getDrawable(1) as StateListDrawable
-//
-//    // Update disabled state drawable
-//    val disabledShape = (selectorDrawable.getStateDrawable(0) as GradientDrawable)
-//    disabledShape.setColor(backgroundColor)
-//
-//    // Update enabled state drawable
-//    val enabledShape = (selectorDrawable.getStateDrawable(1) as GradientDrawable)
-//
-//    enabledShape.setColor(backgroundColor)
-//    setTextColor(textColor)
-//}
-
 fun Button.setVoteThemeColors(
     backgroundColor: Int,
     textColor: Int
@@ -88,7 +67,6 @@ fun Button.setVoteThemeColors(
     }
 }
 
-
 class UsernameRequestGroupAdapter(
     private val usernameDetailsClickListener: (UsernameRequest) -> Unit,
     private val voteClickListener: (UsernameRequest) -> Unit
@@ -162,7 +140,7 @@ class UsernameRequestGroupViewHolder(
 
         // change the button colors based on our vote(s)
         val lastVote = option.votes.lastOrNull()
-        when (lastVote?.type) {
+        when (lastVote?.type?.lowercase()) {
             UsernameVote.APPROVE -> {
                 binding.blocksButton.text = context.getString(R.string.two_lines_number_text, option.lockVotes(), context.resources.getQuantityString(R.plurals.block_vote_button, option.lockVotes()))
 
@@ -171,14 +149,18 @@ class UsernameRequestGroupViewHolder(
 
                 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)
             }
-            UsernameVote.LOCK, UsernameVote.ABSTAIN -> {
+            UsernameVote.LOCK -> {
                 binding.blocksButton.text = context.getString(R.string.two_lines_number_text, option.lockVotes(), context.getString(R.string.unblock_button))
                 //binding.blocksButton.setRoundedRippleBackgroundButtonStyle(R.style.VoteButton_Red)
                 //binding.blocksButton.applyStyle(R.style.VoteButton_Red)
                 //binding.approvalsButton.applyStyle(R.style.VoteButton_LightBlue)
                 binding.blocksButton.setVoteThemeColors(R.color.red, R.color.dash_white)
                 binding.approvalsButton.setVoteThemeColors(R.color.dash_blue_0_05, R.color.dash_blue)
+                //binding.blocksButton.setRoundedRippleBackground(R.style.VoteButton_Red)
+                //binding.blocksButton.setRoundedRippleBackground(R.style.VoteButton_LightBlue)
             }
             else -> {
                 binding.blocksButton.text = context.getString(R.string.two_lines_number_text, option.lockVotes(), context.resources.getQuantityString(R.plurals.block_vote_button, option.lockVotes()))
@@ -186,23 +168,11 @@ class UsernameRequestGroupViewHolder(
                 //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)
             }
         }
-//        option.votes.lastOrNull()?.let { vote ->
-//            when (vote.type) {
-//                UsernameVote.LOCK, UsernameVote.ABSTAIN -> {
-//                    binding.blocksButton.setRoundedBackground(R.style.Button_Vote_Red)
-//                    binding.approvalsButton.setRoundedBackground(R.style.Button_Vote_LightBlue)
-//                }
-//                UsernameVote.APPROVE -> {
-//                    binding.blocksButton.setRoundedBackground(R.style.Button_Vote_LightRed)
-//                    binding.approvalsButton.setRoundedBackground(R.style.Button_Vote_Blue)
-//                }
-//            }
-//        } ?: {
-//            binding.blocksButton.setRoundedBackground(R.style.Button_Vote_LightRed)
-//            binding.approvalsButton.setRoundedBackground(R.style.Button_Vote_LightBlue)
-//        }
+
         if (option.isExpanded) {
             val adapter = UsernameRequestAdapter(
                 option.votes,
@@ -210,30 +180,14 @@ 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)
-//            val listWithBlock = arrayListOf<UsernameRequest>()
-//            listWithBlock.addAll(option.requests)
-//            val firstItem = listWithBlock.first()
-//            listWithBlock.add(
-//                UsernameRequest(
-//                    "",
-//                    firstItem.username,
-//                    firstItem.normalizedLabel,
-//                    -1L,
-//                    "",
-//                    null,
-//                    0,
-//                    firstItem.lockVotes,
-//                    false
-//                )
+//            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)
         }
     }
@@ -300,8 +254,6 @@ class UsernameRequestAdapter(
 abstract class AbstractUsernameRequestViewHolder(root: View): RecyclerView.ViewHolder(root) {
     abstract fun bind(request: UsernameRequest, votes: List<UsernameVote>)
     abstract fun setOnClickListener(usernameRequest: UsernameRequest, listener: (UsernameRequest) -> Unit, voteClickListener: (UsernameRequest) -> Unit)
-    //abstract fun setOnVoteClickListener(usernameRequest: UsernameRequest, listener: (UsernameRequest) -> Unit)
-
 }
 
 class UsernameRequestViewHolder(
@@ -335,7 +287,11 @@ class UsernameRequestViewHolder(
         val lastVote = votes.lastOrNull()
         when (lastVote?.type) {
             UsernameVote.APPROVE -> {
-                binding.approvalsButton.setVoteThemeColors(R.color.dash_blue, R.color.dash_white)
+                if (lastVote.identity == request.identity) {
+                    binding.approvalsButton.setVoteThemeColors(R.color.dash_blue, R.color.dash_white)
+                } else {
+                    binding.approvalsButton.setVoteThemeColors(R.color.dash_blue_0_05, R.color.dash_blue)
+                }
             }
             UsernameVote.LOCK, UsernameVote.ABSTAIN -> {
                 binding.approvalsButton.setVoteThemeColors(R.color.dash_blue_0_05, R.color.dash_blue)
@@ -345,7 +301,6 @@ class UsernameRequestViewHolder(
             }
         }
 
-
 //        binding.voteAmount.setRoundedBackground(
 //            if (request.isApproved) {
 //                R.style.BlueBadgeTheme

From adef6feaf4bf1817dc5b6dfef33aef1cdeb4b560 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Tue, 29 Oct 2024 11:18:53 -0700
Subject: [PATCH 13/58] feature: add delete masternode key functionality

---
 common/src/main/res/drawable/ic_x.xml         |  9 ++++
 wallet/res/layout/view_masternode_ip.xml      | 51 +++++++++++++------
 .../database/dao/ImportedMasternodeKeyDao.kt  |  4 ++
 .../ui/username/AddVotingKeysFragment.kt      | 12 ++---
 .../ui/username/UsernameRequestsViewModel.kt  | 11 ++++
 .../ui/username/adapters/IPAddressAdapter.kt  |  9 ++--
 6 files changed, 72 insertions(+), 24 deletions(-)
 create mode 100644 common/src/main/res/drawable/ic_x.xml

diff --git a/common/src/main/res/drawable/ic_x.xml b/common/src/main/res/drawable/ic_x.xml
new file mode 100644
index 0000000000..30f36a07a3
--- /dev/null
+++ b/common/src/main/res/drawable/ic_x.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="11dp"
+    android:height="12dp"
+    android:viewportWidth="11"
+    android:viewportHeight="12">
+  <path
+      android:pathData="M0.891,10.936C0.785,10.83 0.715,10.707 0.682,10.567C0.648,10.428 0.648,10.288 0.682,10.148C0.715,10.009 0.783,9.888 0.885,9.787L4.668,5.997L0.885,2.214C0.783,2.117 0.715,1.998 0.682,1.858C0.652,1.715 0.652,1.573 0.682,1.433C0.715,1.293 0.785,1.171 0.891,1.065C0.993,0.959 1.113,0.889 1.253,0.855C1.397,0.822 1.539,0.822 1.678,0.855C1.822,0.889 1.945,0.957 2.046,1.059L5.83,4.842L9.613,1.059C9.714,0.957 9.835,0.889 9.975,0.855C10.114,0.822 10.254,0.822 10.394,0.855C10.533,0.889 10.656,0.961 10.762,1.071C10.868,1.173 10.937,1.293 10.971,1.433C11.009,1.573 11.009,1.712 10.971,1.852C10.937,1.992 10.87,2.112 10.768,2.214L6.991,5.997L10.768,9.787C10.87,9.888 10.937,10.009 10.971,10.148C11.005,10.288 11.005,10.428 10.971,10.567C10.937,10.707 10.868,10.83 10.762,10.936C10.656,11.041 10.533,11.111 10.394,11.145C10.254,11.179 10.114,11.179 9.975,11.145C9.835,11.111 9.714,11.043 9.613,10.942L5.83,7.159L2.046,10.942C1.945,11.043 1.824,11.111 1.685,11.145C1.545,11.179 1.403,11.179 1.259,11.145C1.12,11.111 0.997,11.041 0.891,10.936Z"
+      android:fillColor="#B0B6BC"/>
+</vector>
diff --git a/wallet/res/layout/view_masternode_ip.xml b/wallet/res/layout/view_masternode_ip.xml
index dcb3a3343b..dc93bc57e7 100644
--- a/wallet/res/layout/view_masternode_ip.xml
+++ b/wallet/res/layout/view_masternode_ip.xml
@@ -14,28 +14,49 @@
   ~ You should have received a copy of the GNU General Public License
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_marginVertical="5dp"
     android:paddingHorizontal="15dp"
     android:paddingVertical="10dp"
     android:background="@drawable/rounded_background"
     android:theme="@style/SecondaryBackground">
-
-    <TextView
-        style="@style/Overline.Secondary"
-        android:layout_width="match_parent"
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/masternode_ip" />
+        android:orientation="vertical"
 
-    <TextView
-        android:id="@+id/ip_address"
-        style="@style/Body2"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="2dp"
-        tools:text="XXX.XXX.XX.X1" />
-</LinearLayout>
\ No newline at end of file
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent">
+
+        <TextView
+            style="@style/Overline.Secondary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/masternode_ip" />
+
+        <TextView
+            android:id="@+id/ip_address"
+            style="@style/Body2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            tools:text="XXX.XXX.XX.X1" />
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/remove_masternode"
+        android:layout_width="11dp"
+        android:layout_height="11dp"
+        android:padding="12dp"
+        android:layout_marginEnd="15dp"
+        android:background="@drawable/ic_x"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/wallet/src/de/schildbach/wallet/database/dao/ImportedMasternodeKeyDao.kt b/wallet/src/de/schildbach/wallet/database/dao/ImportedMasternodeKeyDao.kt
index 15a96627f2..57534bef57 100644
--- a/wallet/src/de/schildbach/wallet/database/dao/ImportedMasternodeKeyDao.kt
+++ b/wallet/src/de/schildbach/wallet/database/dao/ImportedMasternodeKeyDao.kt
@@ -20,6 +20,7 @@ package de.schildbach.wallet.database.dao
 import androidx.room.*
 import de.schildbach.wallet.database.entity.ImportedMasternodeKey
 import kotlinx.coroutines.flow.Flow
+import org.bitcoinj.core.Sha256Hash
 
 // This table only stores imported masternode keys
 // Masternode keys that are managed by the "Masternode keys" screen are not
@@ -41,4 +42,7 @@ interface ImportedMasternodeKeyDao {
 
     @Query("DELETE FROM imported_masternode_keys")
     suspend fun clear()
+
+    @Query("DELETE FROM imported_masternode_keys WHERE proTxHash = :proTxHash")
+    suspend fun remove(proTxHash: Sha256Hash)
 }
diff --git a/wallet/src/de/schildbach/wallet/ui/username/AddVotingKeysFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/AddVotingKeysFragment.kt
index 6aade6f56d..5161bf12d8 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/AddVotingKeysFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/AddVotingKeysFragment.kt
@@ -33,15 +33,13 @@ class AddVotingKeysFragment : Fragment(R.layout.fragment_add_voting_keys) {
             findNavController().popBackStack()
         }
 
+        viewModel.masternodes.observe(viewLifecycleOwner) {
+            binding.submitButton.isEnabled = it.isNotEmpty()
+        }
         binding.submitButton.setRoundedRippleBackground(
             if (args.vote != UsernameVote.APPROVE) R.style.PrimaryButtonTheme_Large_Red else R.style.PrimaryButtonTheme_Large_Blue
         )
         binding.submitButton.setOnClickListener {
-//            when (args.vote) {
-//                UsernameVote.APPROVE -> viewModel.vote(args.requestId)
-//                UsernameVote.LOCK -> viewModel.block(args.requestId)
-//                UsernameVote.ABSTAIN -> viewModel.revokeVote(args.requestId)
-//            }
             viewModel.submitVote(args.requestId, args.vote)
             findNavController().popBackStack(R.id.usernameRequestsFragment, false)
         }
@@ -50,7 +48,9 @@ class AddVotingKeysFragment : Fragment(R.layout.fragment_add_voting_keys) {
             safeNavigate(AddVotingKeysFragmentDirections.addKeysToVotingKeyInput(args.requestId, args.vote))
         }
 
-        val adapter = IPAddressAdapter()
+        val adapter = IPAddressAdapter() {masternodeIp ->
+            viewModel.removeMasternode(masternodeIp)
+        }
         binding.ipAddresses.adapter = adapter
 
         viewModel.masternodes.observe(viewLifecycleOwner) {
diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
index a936b77742..4ece10ba23 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
@@ -66,6 +66,7 @@ import org.dash.wallet.common.services.analytics.AnalyticsService
 import org.dashj.platform.dpp.identifier.Identifier
 import org.dashj.platform.dpp.voting.ResourceVoteChoice
 import org.dashj.platform.sdk.platform.Names
+import java.net.InetSocketAddress
 import java.util.UUID
 import javax.inject.Inject
 import kotlin.math.min
@@ -642,4 +643,14 @@ class UsernameRequestsViewModel @Inject constructor(
             platformSyncService.updateUsernameRequestsWithVotes()
         }
     }
+
+    fun removeMasternode(masternodeIp: String) {
+        val masternodeList = masternodeListManager.masternodeList
+        val masternode = masternodeList.getMNByAddress(InetSocketAddress(masternodeIp, Constants.NETWORK_PARAMETERS.port))
+        if (masternode != null) {
+            viewModelWorkerScope.launch {
+                importedMasternodeKeyDao.remove(masternode.proTxHash)
+            }
+        }
+    }
 }
diff --git a/wallet/src/de/schildbach/wallet/ui/username/adapters/IPAddressAdapter.kt b/wallet/src/de/schildbach/wallet/ui/username/adapters/IPAddressAdapter.kt
index 2d71ae1854..d81daef652 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/adapters/IPAddressAdapter.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/adapters/IPAddressAdapter.kt
@@ -24,7 +24,7 @@ import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import de.schildbach.wallet_test.databinding.ViewMasternodeIpBinding
 
-class IPAddressAdapter : ListAdapter<String, IPAddressViewHolder>(DiffCallback()) {
+class IPAddressAdapter(private val deleteClickListener: (String) -> Unit) : ListAdapter<String, IPAddressViewHolder>(DiffCallback()) {
     class DiffCallback : DiffUtil.ItemCallback<String>() {
         override fun areItemsTheSame(oldItem: String, newItem: String): Boolean {
             return oldItem == newItem
@@ -42,7 +42,7 @@ class IPAddressAdapter : ListAdapter<String, IPAddressViewHolder>(DiffCallback()
             false
         )
 
-        return IPAddressViewHolder(binding)
+        return IPAddressViewHolder(binding, deleteClickListener)
     }
 
     override fun onBindViewHolder(holder: IPAddressViewHolder, position: Int) {
@@ -51,8 +51,11 @@ class IPAddressAdapter : ListAdapter<String, IPAddressViewHolder>(DiffCallback()
     }
 }
 
-class IPAddressViewHolder(val binding: ViewMasternodeIpBinding): RecyclerView.ViewHolder(binding.root) {
+class IPAddressViewHolder(val binding: ViewMasternodeIpBinding, private val deleteClickListener: (String) -> Unit): RecyclerView.ViewHolder(binding.root) {
     fun bind(ipAddress: String) {
         binding.ipAddress.text = ipAddress
+        binding.removeMasternode.setOnClickListener {
+            deleteClickListener.invoke(ipAddress)
+        }
     }
 }

From 0d3fdfd6947741a11b8c2e720671a9c59389155f Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Wed, 30 Oct 2024 06:42:55 -0700
Subject: [PATCH 14/58] rix: remove Dispatchers.IO from checkUsername

---
 .../wallet/ui/username/voting/RequestUserNameViewModel.kt | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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 f2322f5e20..ba3a91e04f 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUserNameViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUserNameViewModel.kt
@@ -35,8 +35,10 @@ import de.schildbach.wallet.service.CoinJoinMode
 import de.schildbach.wallet.ui.dashpay.CreateIdentityService
 import de.schildbach.wallet.ui.dashpay.PlatformRepo
 import de.schildbach.wallet.ui.dashpay.work.BroadcastIdentityVerifyOperation
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -86,6 +88,8 @@ class RequestUserNameViewModel @Inject constructor(
     val coinJoinConfig: CoinJoinConfig,
     val analytics: AnalyticsService
 ) : ViewModel() {
+    private val workerJob = SupervisorJob()
+    private val viewModelWorkerScope = CoroutineScope(Dispatchers.IO + workerJob)
     private val _uiState = MutableStateFlow(RequestUserNameUIState())
     val uiState: StateFlow<RequestUserNameUIState> = _uiState.asStateFlow()
 
@@ -161,7 +165,7 @@ class RequestUserNameViewModel @Inject constructor(
                     }
                 }
             }
-            .launchIn(viewModelScope)
+            .launchIn(viewModelWorkerScope)
 
         coinJoinConfig.observeMode()
             .flatMapLatest { coinJoinMode ->
@@ -248,7 +252,7 @@ class RequestUserNameViewModel @Inject constructor(
     }
 
     fun checkUsername(requestedUserName: String?) {
-        viewModelScope.launch(Dispatchers.IO) {
+        viewModelScope.launch {
             requestedUserName?.let { username ->
                 val usernameSearchResult = platformRepo.getUsername(username)
                 val usernameExists = when (usernameSearchResult.status) {

From cf38951f6fc3979e3df5696baafb97a11d5644c7 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Wed, 30 Oct 2024 06:43:12 -0700
Subject: [PATCH 15/58] rix: remove Dispatchers.IO from checkUsername

---
 .../wallet/ui/username/voting/RequestUserNameViewModel.kt       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 ba3a91e04f..28605c1156 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUserNameViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUserNameViewModel.kt
@@ -252,7 +252,7 @@ class RequestUserNameViewModel @Inject constructor(
     }
 
     fun checkUsername(requestedUserName: String?) {
-        viewModelScope.launch {
+        viewModelScope.launch(Dispatchers.IO) {
             requestedUserName?.let { username ->
                 val usernameSearchResult = platformRepo.getUsername(username)
                 val usernameExists = when (usernameSearchResult.status) {

From 0557194233b44eae51d77a5c94f91037e9955ce0 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Wed, 30 Oct 2024 07:58:33 -0700
Subject: [PATCH 16/58] fix: use withContext(Dispatchers.IO)

---
 .../voting/RequestUserNameViewModel.kt        | 79 +++++++++++--------
 1 file changed, 44 insertions(+), 35 deletions(-)

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 28605c1156..e0bb698aa4 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUserNameViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUserNameViewModel.kt
@@ -49,6 +49,7 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.bitcoinj.core.Coin
 import org.bitcoinj.wallet.Wallet
 import org.dash.wallet.common.WalletDataProvider
@@ -131,8 +132,10 @@ class RequestUserNameViewModel @Inject constructor(
     private val _myUsernameRequest = MutableStateFlow<UsernameRequest?>(null)
 
     init {
-        viewModelScope.launch(Dispatchers.IO) {
-            _requestedUserNameLink.value = identityConfig.get(BlockchainIdentityConfig.REQUESTED_USERNAME_LINK)
+        viewModelScope.launch {
+            _requestedUserNameLink.value = withContext(Dispatchers.IO) {
+                identityConfig.get(BlockchainIdentityConfig.REQUESTED_USERNAME_LINK)
+            }
         }
         identityConfig.observe(IDENTITY_ID)
             .filterNotNull()
@@ -199,8 +202,7 @@ class RequestUserNameViewModel @Inject constructor(
             updateConfig()
             // send the request / create username, assume not retry
             val reuseTransaction = identity?.let {
-                it.usernameRequested == UsernameRequestStatus.LOCKED ||
-                        it.usernameRequested == UsernameRequestStatus.LOST_VOTE
+                it.usernameRequested == UsernameRequestStatus.LOCKED || it.usernameRequested == UsernameRequestStatus.LOST_VOTE
             } ?: false
             triggerIdentityCreation(reuseTransaction)
         }
@@ -252,7 +254,7 @@ class RequestUserNameViewModel @Inject constructor(
     }
 
     fun checkUsername(requestedUserName: String?) {
-        viewModelScope.launch(Dispatchers.IO) {
+        viewModelScope.launch {
             requestedUserName?.let { username ->
                 val usernameSearchResult = platformRepo.getUsername(username)
                 val usernameExists = when (usernameSearchResult.status) {
@@ -261,24 +263,27 @@ class RequestUserNameViewModel @Inject constructor(
                     }
                     else -> false
                 }
-                val contenders = platformRepo.getVoteContenders(username)
-                val usernameContested = false // TODO: make the call
-                var maxApprovalVotes = 0
-                val firstCreatedAt = try {
-                    contenders.map.values.minOf { contender ->
-                        val document =  contender.seralizedDocument?.let {
-                            DomainDocument(platformRepo.platform.names.deserialize(it))
+                var usernameContested: Boolean
+                var firstCreatedAt = -1L
+                val usernameBlocked = withContext(Dispatchers.IO) {
+                    val contenders = platformRepo.getVoteContenders(username)
+                    usernameContested = contenders.map.isNotEmpty()
+                    var maxApprovalVotes = 0
+                    firstCreatedAt = try {
+                        contenders.map.values.minOf { contender ->
+                            val document = contender.seralizedDocument?.let {
+                                DomainDocument(platformRepo.platform.names.deserialize(it))
+                            }
+                            maxApprovalVotes = max(contender.votes, maxApprovalVotes)
+                            document?.createdAt ?: -1
                         }
-                        maxApprovalVotes = max(contender.votes, maxApprovalVotes)
-                        document?.createdAt ?: -1
+                    } catch (e: NoSuchElementException) {
+                        -1L
                     }
-                } catch (e: NoSuchElementException) {
-                    -1L
-                }
-
-                // is the name blocked
-                val usernameBlocked = firstCreatedAt == -1L && contenders.lockVoteTally > maxApprovalVotes
 
+                    // is the name blocked
+                    firstCreatedAt == -1L && contenders.lockVoteTally > maxApprovalVotes
+                }
                 _uiState.update {
                     it.copy(
                         usernameCheckSuccess = true,
@@ -293,32 +298,36 @@ class RequestUserNameViewModel @Inject constructor(
     }
 
     fun verify() {
-        viewModelScope.launch(Dispatchers.IO) {
-            identityConfig.set(BlockchainIdentityConfig.REQUESTED_USERNAME_LINK, _requestedUserNameLink.value ?: "")
-            identityConfig.get(IDENTITY_ID)?.let { identityId ->
-                val usernameRequest = usernameRequestDao.getRequest(
-                    UsernameRequest.getRequestId(
-                        identityId,
-                        requestedUserName!!
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                identityConfig.set(BlockchainIdentityConfig.REQUESTED_USERNAME_LINK, _requestedUserNameLink.value ?: "")
+                identityConfig.get(IDENTITY_ID)?.let { identityId ->
+                    val usernameRequest = usernameRequestDao.getRequest(
+                        UsernameRequest.getRequestId(
+                            identityId,
+                            requestedUserName!!
+                        )
                     )
-                )
-                usernameRequest!!.link = _requestedUserNameLink.value
-                usernameRequestDao.update(usernameRequest)
+                    usernameRequest!!.link = _requestedUserNameLink.value
+                    usernameRequestDao.update(usernameRequest)
+                }
             }
             _uiState.update {
                 it.copy(
                     usernameVerified = true
                 )
             }
-            //submit()
         }
     }
 
+    @Deprecated("requests cannot be canceled")
     fun cancelRequest() {
-        viewModelScope.launch(Dispatchers.IO) {
-            identityConfig.set(BlockchainIdentityConfig.USERNAME, "")
-            identityConfig.set(BlockchainIdentityConfig.REQUESTED_USERNAME_LINK, "")
-            identityConfig.set(BlockchainIdentityConfig.CANCELED_REQUESTED_USERNAME_LINK, true)
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                identityConfig.set(BlockchainIdentityConfig.USERNAME, "")
+                identityConfig.set(BlockchainIdentityConfig.REQUESTED_USERNAME_LINK, "")
+                identityConfig.set(BlockchainIdentityConfig.CANCELED_REQUESTED_USERNAME_LINK, true)
+            }
         }
     }
 

From a70ae80e8a852c3a3ea3c6977e524ecddfbadda5 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Wed, 30 Oct 2024 08:02:51 -0700
Subject: [PATCH 17/58] fix: use withContext(Dispatchers.IO)

---
 .../wallet/ui/username/voting/RequestUserNameViewModel.kt     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 e0bb698aa4..dcdb31bfa6 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUserNameViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUserNameViewModel.kt
@@ -198,8 +198,8 @@ class RequestUserNameViewModel @Inject constructor(
     fun submit() {
         // Reset ui state for retry if needed
         resetUiForRetrySubmit()
-        viewModelScope.launch(Dispatchers.IO) {
-            updateConfig()
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) { updateConfig() }
             // send the request / create username, assume not retry
             val reuseTransaction = identity?.let {
                 it.usernameRequested == UsernameRequestStatus.LOCKED || it.usernameRequested == UsernameRequestStatus.LOST_VOTE

From b20680044d39be66afc9b9775fad8579b6aed8e0 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Wed, 30 Oct 2024 23:20:09 -0700
Subject: [PATCH 18/58] fix: add voting keys fixes

---
 .../res/layout/fragment_add_voting_keys.xml   |  3 ++
 .../database/dao/ImportedMasternodeKeyDao.kt  |  3 ++
 .../ui/username/AddVotingKeysFragment.kt      | 21 ++++++++++----
 .../ui/username/UsernameRequestsViewModel.kt  | 29 ++++++++++++++++++-
 4 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/wallet/res/layout/fragment_add_voting_keys.xml b/wallet/res/layout/fragment_add_voting_keys.xml
index eb1525503a..2ca7731516 100644
--- a/wallet/res/layout/fragment_add_voting_keys.xml
+++ b/wallet/res/layout/fragment_add_voting_keys.xml
@@ -118,12 +118,15 @@
         android:layout_margin="15dp"
         android:text="@string/submit"
         app:layout_constraintBottom_toTopOf="@id/votes_cast_text" />
+
     <TextView
         android:id="@+id/votes_cast_text"
         style="@style/Overline.Secondary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
+        android:layout_marginHorizontal="15dp"
+        android:layout_marginBottom="15dp"
         android:gravity="center"
         android:textAlignment="gravity"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/wallet/src/de/schildbach/wallet/database/dao/ImportedMasternodeKeyDao.kt b/wallet/src/de/schildbach/wallet/database/dao/ImportedMasternodeKeyDao.kt
index 57534bef57..ee219c5adf 100644
--- a/wallet/src/de/schildbach/wallet/database/dao/ImportedMasternodeKeyDao.kt
+++ b/wallet/src/de/schildbach/wallet/database/dao/ImportedMasternodeKeyDao.kt
@@ -45,4 +45,7 @@ interface ImportedMasternodeKeyDao {
 
     @Query("DELETE FROM imported_masternode_keys WHERE proTxHash = :proTxHash")
     suspend fun remove(proTxHash: Sha256Hash)
+
+    @Query("SELECT COUNT(*) > 0 FROM imported_masternode_keys WHERE proTxHash = :proTxHash")
+    suspend fun contains(proTxHash: Sha256Hash?): Boolean
 }
diff --git a/wallet/src/de/schildbach/wallet/ui/username/AddVotingKeysFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/AddVotingKeysFragment.kt
index 5161bf12d8..804853398a 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/AddVotingKeysFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/AddVotingKeysFragment.kt
@@ -20,8 +20,13 @@ import org.dash.wallet.common.ui.setRoundedRippleBackground
 import org.dash.wallet.common.ui.viewBinding
 import org.dash.wallet.common.util.observe
 import org.dash.wallet.common.util.safeNavigate
+import org.slf4j.LoggerFactory
+import java.util.logging.Logger
 
 class AddVotingKeysFragment : Fragment(R.layout.fragment_add_voting_keys) {
+    companion object {
+        private val log = LoggerFactory.getLogger(AddVotingKeysFragment::class.java)
+    }
     private val binding by viewBinding(FragmentAddVotingKeysBinding::bind)
     private val viewModel by votingViewModels<UsernameRequestsViewModel>()
     private val args by navArgs<AddVotingKeysFragmentArgs>()
@@ -48,15 +53,19 @@ class AddVotingKeysFragment : Fragment(R.layout.fragment_add_voting_keys) {
             safeNavigate(AddVotingKeysFragmentDirections.addKeysToVotingKeyInput(args.requestId, args.vote))
         }
 
-        val adapter = IPAddressAdapter() {masternodeIp ->
-            viewModel.removeMasternode(masternodeIp)
+        val adapter = IPAddressAdapter() { masternodeIP ->
+            log.info("removing masternode: {}", masternodeIP)
+            viewModel.removeMasternode(masternodeIP)
         }
         binding.ipAddresses.adapter = adapter
 
         viewModel.masternodes.observe(viewLifecycleOwner) {
-            adapter.submitList(it.map { masternode->
-                masternode.address
-            })
+            log.info("updating masternode list: {}", it.map { mn -> mn.address })
+            adapter.submitList(
+                it.map { masternode ->
+                    masternode.address
+                }
+            )
             binding.votesCastText.text = getString(R.string.multiple_votes_cast, it.size)
         }
 
@@ -64,7 +73,7 @@ class AddVotingKeysFragment : Fragment(R.layout.fragment_add_voting_keys) {
             lifecycleScope.launch(Dispatchers.IO) {
                 viewModel.setDontAskAgain()
             }
-            binding.dontAskAgainButton.isVisible = true
+            binding.dontAskAgainButton.isVisible = false
         }
         lifecycleScope.launch {
             val isFirstTime = withContext(Dispatchers.IO) { viewModel.isFirstTimeVoting() }
diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
index 4ece10ba23..2bc1e44136 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
@@ -395,6 +395,17 @@ class UsernameRequestsViewModel @Inject constructor(
         }
     }
 
+    /**
+     * returns true if we have all masternodes for this voting key
+     */
+    suspend fun hasKey(key: ECKey): Boolean {
+        val entries = masternodeListManager.listAtChainTip.getMasternodesByVotingKey(KeyId.fromBytes(key.pubKeyHash))
+        val count = entries.count {
+            importedMasternodeKeyDao.contains(it.proTxHash)
+        }
+        return entries.size == count
+    }
+
     private fun observeUsernames(): Flow<List<UsernameRequest>> {
         return if (_filterState.value.onlyDuplicates) {
             usernameRequestDao.observeDuplicates(_filterState.value.onlyLinks)
@@ -585,7 +596,7 @@ class UsernameRequestsViewModel @Inject constructor(
         }
     }
 
-    suspend fun shouldMaybeAskForMoreKeys() = dashPayConfig.get(DashPayConfig.KEYS_DONT_ASK_AGAIN) ?: true
+    suspend fun shouldMaybeAskForMoreKeys() = !(dashPayConfig.get(DashPayConfig.KEYS_DONT_ASK_AGAIN) ?: false)
 
     suspend fun setSecondTimeVoting() {
         dashPayConfig.set(DashPayConfig.FIRST_TIME_VOTING, false)
@@ -595,6 +606,22 @@ class UsernameRequestsViewModel @Inject constructor(
 
     fun invalidKeyType(wifKey: String): InvalidKeyType {
         return try {
+            // check if it is a private key hex 64 chars first
+            if (wifKey.length == 64) {
+                try {
+                    Utils.HEX.decode(wifKey)
+                    return InvalidKeyType.PRIVATE_KEY_HEX
+                } catch (_: Exception) {
+                    // swallow
+                }
+            } else if (wifKey.length == 66) {
+                try {
+                    Utils.HEX.decode(wifKey)
+                    return InvalidKeyType.PUBLIC_KEY_HEX
+                } catch (_: Exception) {
+                    // swallow
+                }
+            }
             DumpedPrivateKey.fromBase58(Constants.NETWORK_PARAMETERS, wifKey).key
             InvalidKeyType.NOT_INVALID // shouldn't happen
         } catch (e: AddressFormatException.WrongNetwork) {

From 6b81f0076cb7ce48bbdca7d1ddf22d292e276efa Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Wed, 30 Oct 2024 23:21:22 -0700
Subject: [PATCH 19/58] fix: fix vote click bug

---
 .../wallet/ui/username/adapters/UsernameRequestGroupAdapter.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 196ff6eee1..6499538e58 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupAdapter.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupAdapter.kt
@@ -135,7 +135,7 @@ class UsernameRequestGroupViewHolder(
         binding.approvalsButton.text = context.getString(R.string.two_lines_number_text, option.requests.maxOf { it.votes }, context.resources.getQuantityString(R.plurals.approval_button, option.requests.maxOf { it.votes }))
         binding.approvalsButton.setOnClickListener {
             // vote for the first request, which is the only request
-            usernameClickListener.invoke(option.requests.first())
+            voteClickListener.invoke(option.requests.first())
         }
 
         // change the button colors based on our vote(s)

From d84bc964505b6c82cdd3222d3f474b3664fcff28 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Wed, 30 Oct 2024 23:21:48 -0700
Subject: [PATCH 20/58] fix: add vote key again

---
 wallet/res/values/strings-dashpay.xml         |  1 +
 .../ui/username/VotingKeyInputFragment.kt     | 22 ++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/wallet/res/values/strings-dashpay.xml b/wallet/res/values/strings-dashpay.xml
index 09824f11e0..13c1f44759 100644
--- a/wallet/res/values/strings-dashpay.xml
+++ b/wallet/res/values/strings-dashpay.xml
@@ -343,6 +343,7 @@
     <string name="voting_key_hint">Masternode Voting Private Key</string>
     <string name="voting_key_input_error">You have entered an invalid key</string>
     <string name="voting_key_input_not_active_error">You have entered a key that is not associated to an active Masternode</string>
+    <string name="voting_key_input_already_present">You have already entered this masternode key</string>
     <string name="voting_key_input_invalid_private_key_wrong_network_testnet">You have entered a key that is for testnet, but this is mainnet. It should look like this: %s</string>
     <string name="voting_key_input_invalid_private_key_wrong_network_mainnet">You have entered a key that is for mainnet, but this is testnet. It should look like this: %s</string>
     <string name="voting_key_input_invalid_private_key_address">You have entered an address key instead of a masternode voting private key. It should be in WIF format (%s)</string>
diff --git a/wallet/src/de/schildbach/wallet/ui/username/VotingKeyInputFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/VotingKeyInputFragment.kt
index 74d74fd921..92c65e3dbe 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/VotingKeyInputFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/VotingKeyInputFragment.kt
@@ -69,15 +69,21 @@ class VotingKeyInputFragment : Fragment(R.layout.fragment_voting_key_input) {
                 binding.inputError.isVisible = false
                 if (isValidMasternode) {
                     lifecycleScope.launch {
-                        viewModel.addKey(key)
-                        KeyboardUtil.hideKeyboard(requireContext(), binding.keyInput)
-                        delay(200)
-                        safeNavigate(
-                            VotingKeyInputFragmentDirections.votingKeyInputToAddKeys(
-                                args.requestId,
-                                args.vote
+                        if(viewModel.hasKey(key)) {
+                            viewModel.addKey(key)
+                            KeyboardUtil.hideKeyboard(requireContext(), binding.keyInput)
+                            delay(200)
+                            safeNavigate(
+                                VotingKeyInputFragmentDirections.votingKeyInputToAddKeys(
+                                    args.requestId,
+                                    args.vote
+                                )
                             )
-                        )
+                        } else {
+                            binding.inputError.text = getString(R.string.voting_key_input_already_present)
+                            binding.inputWrapper.isErrorEnabled = true
+                            binding.inputError.isVisible = true
+                        }
                     }
                 } else {
                     binding.inputError.text = getString(R.string.voting_key_input_not_active_error)

From 02f6608ee97d1fcbb791015b9e41f427fbda52c5 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Thu, 31 Oct 2024 11:30:17 -0700
Subject: [PATCH 21/58] fix: prevent counting one vote as many

---
 .../work/BroadcastUsernameVotesWorker.kt       | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

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 169fda33c7..9f6eed9025 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesWorker.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesWorker.kt
@@ -135,7 +135,8 @@ class BroadcastUsernameVotesWorker @AssistedInject constructor(
                     is String -> item
                     else -> item.toString()
                 }
-            }.toTypedArray()
+            }.toSet().toTypedArray()
+            val votes = hashMapOf<String, UsernameVote>()
             votingResults.forEach {
                 when (val votePoll = it.second?.resourceVote?.votePoll as? ContestedDocumentResourceVotePoll) {
                     is ContestedDocumentResourceVotePoll -> {
@@ -155,12 +156,13 @@ class BroadcastUsernameVotesWorker @AssistedInject constructor(
                             }
                             else -> null
                         }
-                        normalizedLabel?.let { label ->
-                            updateUsernameVotes(label, identity, masternodeKeys.size, it.first)
-                        }
+                        votes[normalizedLabel!!] = UsernameVote(normalizedLabel, identity.toString(), it.first)
                     }
                 }
             }
+            votes.forEach { (_, usernameVote) ->
+                updateUsernameVotes(usernameVote)
+            }
             val errorCount = votingResults.count { it.third != null }
             when (errorCount) {
                 0 -> {
@@ -248,4 +250,12 @@ class BroadcastUsernameVotesWorker @AssistedInject constructor(
             )
         )
     }
+
+    private suspend fun updateUsernameVotes(
+        vote: UsernameVote
+    ) {
+        // usernameRequestDao.removeApproval(request.username)
+        // usernameRequestDao.update(request.copy(votes = request.votes + keyCount, isApproved = true))
+        usernameVoteDao.insert(vote)
+    }
 }
\ No newline at end of file

From da7848f3430be1d274034b6627a3a0c1cea401bf Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Thu, 31 Oct 2024 11:32:46 -0700
Subject: [PATCH 22/58] chore: log the wrong vote differently

---
 .../wallet/ui/username/UsernameRequestsFragment.kt       | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
index 33a0c69183..e83c173fd8 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
@@ -377,7 +377,12 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
         binding.filteredByTxt.text = appliedFilterNames.joinToString(", ")
     }
 
-    private fun showVoteIndicator(binding: FragmentUsernameRequestsBinding, votes: List<String>, usernames: List<String>, status: Status) {
+    private fun showVoteIndicator(
+        binding: FragmentUsernameRequestsBinding,
+        votes: List<String>,
+        usernames: List<String>,
+        status: Status
+    ) {
         if (votes.isEmpty()) {
             return
         }
@@ -387,7 +392,7 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
         viewModel.updateBroadcastVotesTimestamp()
         viewModel.updateUsernameRequestsWithVotes()
         if (viewModel.currentVote?.any { usernames.contains(it.username) } == true) {
-            log.info("there is a match?")
+            log.info("vote, there is not match for {}", usernames)
             //return
         }
         val toastText = when (status) {

From 93b9b5fa7c08f6cab066eac51d9b2ce16e0f5ce9 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Thu, 31 Oct 2024 11:33:06 -0700
Subject: [PATCH 23/58] fix: correct duplicate key detection

---
 .../schildbach/wallet/ui/username/UsernameRequestsViewModel.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
index 2bc1e44136..17e7572c75 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
@@ -403,7 +403,7 @@ class UsernameRequestsViewModel @Inject constructor(
         val count = entries.count {
             importedMasternodeKeyDao.contains(it.proTxHash)
         }
-        return entries.size == count
+        return entries.size != count
     }
 
     private fun observeUsernames(): Flow<List<UsernameRequest>> {

From 19e080b9358c5e0e88da94acd9db393ef82d6a59 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Thu, 7 Nov 2024 15:30:56 -0800
Subject: [PATCH 24/58] fix: fix request process state

---
 wallet/src/de/schildbach/wallet/ui/more/MoreFragment.kt | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/wallet/src/de/schildbach/wallet/ui/more/MoreFragment.kt b/wallet/src/de/schildbach/wallet/ui/more/MoreFragment.kt
index f16df916e7..bccded1ac5 100644
--- a/wallet/src/de/schildbach/wallet/ui/more/MoreFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/more/MoreFragment.kt
@@ -244,9 +244,16 @@ class MoreFragment : Fragment(R.layout.fragment_more) {
                 } ?: "Voting Period not found"
                 when (it.usernameRequested) {
                     UsernameRequestStatus.SUBMITTING,
-                    UsernameRequestStatus.SUBMITTED,
+                    UsernameRequestStatus.SUBMITTED -> {
+                        binding.requestedUsernameTitle.text = mainActivityViewModel.getRequestedUsername()
+                        binding.requestedUsernameSubtitleTwo.isVisible = false
+                        binding.retryRequestButton.isVisible = false
+                        binding.requestedUsernameIcon.setImageResource(R.drawable.ic_join_dashpay)
+                        binding.requestedUsernameArrow.isVisible = true
+                    }
                     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

From 7ba3d447efdf3d27fe28ff887835d29ee4319a11 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Thu, 7 Nov 2024 15:31:48 -0800
Subject: [PATCH 25/58] fix: add tools:text for Results on

---
 wallet/res/layout/fragment_more.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From 43144352613ad8beeba77a440992e7ae8d8e3fec Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Thu, 7 Nov 2024 18:42:03 -0800
Subject: [PATCH 26/58] fix: update translations

---
 wallet/res/values-de/strings-dashpay.xml     |  6 +--
 wallet/res/values-el/strings-dashpay.xml     |  7 +--
 wallet/res/values-es/strings-dashpay.xml     |  7 +--
 wallet/res/values-fa/strings-dashpay.xml     |  5 +-
 wallet/res/values-fil/strings-dashpay.xml    |  3 --
 wallet/res/values-fr/strings-dashpay.xml     |  3 --
 wallet/res/values-id/strings-dashpay.xml     |  3 --
 wallet/res/values-it/strings-dashpay.xml     | 36 +++++++++++++--
 wallet/res/values-ja/strings-dashpay.xml     |  7 +--
 wallet/res/values-ko/strings-dashpay.xml     |  7 +--
 wallet/res/values-nl/strings-dashpay.xml     |  7 +--
 wallet/res/values-pl/strings-dashpay.xml     |  7 +--
 wallet/res/values-pt/strings-dashpay.xml     |  7 +--
 wallet/res/values-ru/strings-dashpay.xml     | 48 ++++++++++++++++----
 wallet/res/values-sk/strings-dashpay.xml     |  7 +--
 wallet/res/values-tr/strings-dashpay.xml     |  4 --
 wallet/res/values-uk/strings-dashpay.xml     |  2 -
 wallet/res/values-zh-rTW/strings-dashpay.xml |  4 --
 wallet/res/values-zh/strings-dashpay.xml     |  3 --
 19 files changed, 83 insertions(+), 90 deletions(-)

diff --git a/wallet/res/values-de/strings-dashpay.xml b/wallet/res/values-de/strings-dashpay.xml
index c4f67b7bf4..9786edcd11 100644
--- a/wallet/res/values-de/strings-dashpay.xml
+++ b/wallet/res/values-de/strings-dashpay.xml
@@ -269,7 +269,6 @@ Benutzernamen</b></string>
     <string name="usernames_blocked_title">Manche Benutzernamen können blockiert werden</string>
     <string name="usernames_blocked_subtitle">Wenn genügend Mitglieder des Netzwerkes feststellen, dass ein Benutzername unangemessen ist, könne diese ihn sperren</string>
     <string name="username_voting">Abstimmung über Benutzernamen</string>
-    <string name="username_voting_subtitle">Als Masternode-Besitzer kannst du abstimmen, um beantragte Benutzernamen zu bewilligen, bevor diese im Netzwerk erstellt werden..</string>
     <string name="voting_duplicates_only_title">Standardmäßige Filtereinstellung</string>
     <string name="voting_duplicates_only_message">Die standardmäßige Filtereinstellung zeigt nur doppelte Benutzernamen über die noch NICHT abgestimmt wurde. Um alle strittigen Benutzernamen sehen zu können, ändere den Filter.</string>
     <string name="all">Alles</string>
@@ -296,7 +295,6 @@ Benutzernamen</b></string>
         <item>Ich habe nicht zugestimmt.</item>
         <item>Beinhalted blockierte Votes</item>
     </string-array>
-
     <string name="block_vote_count">%d Block(s)</string>
     <string name="request_your_username">Benutzernamen erstellen</string>
     <string name="request_your_hint">Bitte beachte, dass du dies in der Zukunft nicht mehr ändern kannst</string>
@@ -339,8 +337,6 @@ Benutzernamen</b></string>
     <string name="masternode_ip">Masternode IP-Adresse</string>
     <string name="multiple_votes_cast">%d die Stimmen werden abgegeben, da du mehrere Abstimmungs-Schlüssel in deiner Wallet gespeichert hast</string>
     <string name="add_masternode_key">Masternode Voting-Schlüssel hinzufügen</string>
-    <string name="vote_submitted">Deine Stimme wurde abgegeben.</string>
-    <string name="vote_cancelled">Deine Stimmabgabe wurde abgebrochen.</string>
     <string name="quick_vote">Schnelles Abstimmen</string>
     <string name="quick_vote_subtitle">Wenn du die Schaltfläche \"Für alle abstimmen\" tippst, stimmst du automatisch für alle gefilterten Benutzernamen (%d), die zuerst eingereicht wurden</string>
     <string name="vote_for_all">Stimme für alle</string>
@@ -417,4 +413,4 @@ Benutzernamen</b></string>
     <string name="mix_dash_mix">Gemixtes Guthaben</string>
     <string name="mix_dash_title">Mixe deine Dash</string>
     <string name="mix_dash_message">Um zu verhindern, dass andere Personen sehen können, an wen du Zahlungen vornimmst, wird empfohlen, dein Guthaben zu mixen, bevor du deinen Benutzernamen erstellst.</string>
-</resources>
+    </resources>
diff --git a/wallet/res/values-el/strings-dashpay.xml b/wallet/res/values-el/strings-dashpay.xml
index b80809c7b8..8bc0157011 100644
--- a/wallet/res/values-el/strings-dashpay.xml
+++ b/wallet/res/values-el/strings-dashpay.xml
@@ -88,7 +88,6 @@
     <string name="dashpay_topup_fee">Τέλος Topup</string>
     <string name="search_user_find_a_user">Βρείτε έναν χρήστη στο Δίκτυο του Dash</string>
     <string name="search_for_a_user">Αναζήτηση για χρήστη στο Dash Δίκτυο</string>
-    <string name="search_user_input_placeholder">πληκτρολογήστε το όνομα χρήστη για αναζήτηση εδώ</string>
     <string name="add_new_contact">Προσθήκη Νέας Επαφής</string>
     <string name="send_contact_request">Αποστολή Αιτήματος Επαφής</string>
     <string name="sending_contact_request">Αποστολή αιτήματος επαφής</string>
@@ -269,7 +268,6 @@
     <string name="usernames_blocked_title">Ορισμένα ονόματα χρηστών μπορούν να μπλοκαριστούν</string>
     <string name="usernames_blocked_subtitle">Εάν αρκετά μέλη του δικτύου διαπιστώσουν ότι ένα όνομα χρήστη είναι ακατάλληλο, μπορούν να το μπλοκάρουν.</string>
     <string name="username_voting">Ψηφοφορία ονόματος χρήστη</string>
-    <string name="username_voting_subtitle">Ως ιδιοκτήτης ενός masternode μπορείτε να ψηφίσετε για να εγκρίνετε τα ζητούμενα ονόματα χρήστη πριν οι χρήστες μπορέσουν να τα δημιουργήσουν.</string>
     <string name="voting_duplicates_only_title">Προεπιλεγμένη ρύθμιση φίλτρου</string>
     <string name="voting_duplicates_only_message">Το προεπιλεγμένο φίλτρο εμφανίζει μόνο τα διπλά ονόματα χρηστών για τα οποία ΔΕΝ έχετε ψηφίσει, αλλά μπορείτε να δείτε όλα τα διαφιλονικούμενα ονόματα χρηστών αλλάζοντας το φίλτρο</string>
     <string name="all">Όλα</string>
@@ -296,7 +294,6 @@
         <item>Δεν έχω εγκρίνει</item>
         <item>Έχει μπλοκάρει ψήφους</item>
     </string-array>
-
     <string name="block_vote_count">%d Μπλοκ(ς)</string>
     <string name="request_your_username">Δημιουργήστε το όνομα χρήστη σας</string>
     <string name="request_your_hint">Παρακαλώ σημειώστε ότι δεν θα μπορείτε να το αλλάξετε στο μέλλον.</string>
@@ -339,8 +336,6 @@
     <string name="masternode_ip">Διεύθυνση IP του Masternode</string>
     <string name="multiple_votes_cast">%d ψήφοι θα δοθούν καθώς έχετε αποθηκεύσει πολλαπλά κλειδιά ψηφοφορίας στο πορτοφόλι</string>
     <string name="add_masternode_key">Προσθήκη κλειδιού ψηφοφορίας Masternode</string>
-    <string name="vote_submitted">Η ψήφος σας υποβλήθηκε.</string>
-    <string name="vote_cancelled">Η ψήφος σας ακυρώθηκε.</string>
     <string name="quick_vote">Γρήγορη Ψηφοφορία</string>
     <string name="quick_vote_subtitle">Πατώντας το κουμπί \"Ψηφίστε για όλους\", θα ψηφίσετε αυτόματα για όλα τα φιλτραρισμένα ονόματα χρηστών (%d) που υποβλήθηκαν πρώτα.</string>
     <string name="vote_for_all">Ψηφίστε για Όλους</string>
@@ -417,4 +412,4 @@
     <string name="mix_dash_mix">Υπόλοιπο Ανάμειξης</string>
     <string name="mix_dash_title">Αναμείξτε τα Dash σας</string>
     <string name="mix_dash_message">Για να αποτρέψετε άλλα άτομα από το να βλέπουν σε ποιον κάνετε πληρωμές, συνιστάται να αναμίξετε το υπόλοιπό σας πριν δημιουργήσετε το όνομα χρήστη σας.</string>
-</resources>
+    </resources>
diff --git a/wallet/res/values-es/strings-dashpay.xml b/wallet/res/values-es/strings-dashpay.xml
index 63af52e1fa..d9c3629b37 100644
--- a/wallet/res/values-es/strings-dashpay.xml
+++ b/wallet/res/values-es/strings-dashpay.xml
@@ -88,7 +88,6 @@ de Dash</b></string>
     <string name="dashpay_topup_fee">Tarifa de recarga</string>
     <string name="search_user_find_a_user">Encontrar un usuario en la red Dash</string>
     <string name="search_for_a_user">Buscar un usuario en la red Dash</string>
-    <string name="search_user_input_placeholder">ingresa el nombre de usuario para buscar aquí</string>
     <string name="add_new_contact">Agregar un nuevo contacto</string>
     <string name="send_contact_request">Enviar solicitud de contacto</string>
     <string name="sending_contact_request">Enviando solicitud de contacto</string>
@@ -269,7 +268,6 @@ de Dash</b></string>
     <string name="usernames_blocked_title">Algunos nombres de usuario pueden ser bloqueados</string>
     <string name="usernames_blocked_subtitle">Si una cantidad suficiente de usuarios de la red determina que un nombre de usuario es inapropiado, pueden bloquearlo.</string>
     <string name="username_voting">Votación por nombre de usuario</string>
-    <string name="username_voting_subtitle">Como propietario de un masternode, puedes votar para aprobar los nombres de usuario solicitados antes de que se creen en la red.</string>
     <string name="voting_duplicates_only_title">Configuración de filtro predeterminada</string>
     <string name="voting_duplicates_only_message">El filtro predeterminado muestra solo nombres de usuario duplicados por los que NO has votado, pero puedes ver todos los nombres de usuario en disputa cambiando el filtro.</string>
     <string name="all">Todos</string>
@@ -296,7 +294,6 @@ de Dash</b></string>
         <item>Yo no he aprobado</item>
         <item>Ha bloqueado votos</item>
     </string-array>
-
     <string name="block_vote_count">%d Bloque(s)</string>
     <string name="request_your_username">Crea tu nombre de usuario</string>
     <string name="request_your_hint">Ten en cuenta que no podrás cambiarlo en el futuro.</string>
@@ -339,8 +336,6 @@ de Dash</b></string>
     <string name="masternode_ip">Dirección IP de Masternode </string>
     <string name="multiple_votes_cast">%d Los votos se emitirán ya que tienes múltiples llaves de votación almacenadas en la billetera.</string>
     <string name="add_masternode_key">Añadir llave de votación de Masternode</string>
-    <string name="vote_submitted">Tu voto fue enviado</string>
-    <string name="vote_cancelled">Tu voto fue cancelado</string>
     <string name="quick_vote">Votación rápida</string>
     <string name="quick_vote_subtitle">Al pulsar el botón \"Votar por todos\", votarás automáticamente por todos los nombres de usuario filtrados (%d) que fueron presentados primero</string>
     <string name="vote_for_all">Vota por todas</string>
@@ -417,4 +412,4 @@ de Dash</b></string>
     <string name="mix_dash_mix">Mezclar balance</string>
     <string name="mix_dash_title">Mezcla tus Dash</string>
     <string name="mix_dash_message">Para evitar que otras personas vean a quién realiza pagos, se recomienda mezclar tu saldo antes de crear tu nombre de usuario.</string>
-</resources>
+    </resources>
diff --git a/wallet/res/values-fa/strings-dashpay.xml b/wallet/res/values-fa/strings-dashpay.xml
index 5fe1670619..89589b43ea 100644
--- a/wallet/res/values-fa/strings-dashpay.xml
+++ b/wallet/res/values-fa/strings-dashpay.xml
@@ -294,7 +294,6 @@
         <item>مواردی که تائيد نکردم</item>
         <item>دارای رای‌های مسدود است</item>
     </string-array>
-
     <string name="block_vote_count">%dبلوک</string>
     <string name="request_your_username">نام کاربری‌تان را ایجاد کنید</string>
     <string name="request_your_hint">لطفاً دقت داشته باشید که نمی‌توانید بعدا آن را تغییر دهید</string>
@@ -336,8 +335,6 @@
     <string name="masternode_ip">آی‌پی‌ آدرس مسترنود</string>
     <string name="multiple_votes_cast">%dرای در نظر گرفته می شود چون چند کلید رای‌دهی در کیف پول‌تان دارید</string>
     <string name="add_masternode_key">اضافه کردن کلید رای‌دهی مسترنود</string>
-    <string name="vote_submitted">رای‌تان ثبت شد</string>
-    <string name="vote_cancelled">رای‌تان لغو شد</string>
     <string name="quick_vote">رای‌دهی سریع</string>
     <string name="quick_vote_subtitle">با زدن دگمه «رای‌دهی برای همه»، به صورت خودکار به همه نام‌های کاربری فیلتر شده (%d) که ابتدا ثبت شدند رای می‌دهید</string>
     <string name="vote_for_all">رای‌دهی برای همه</string>
@@ -414,4 +411,4 @@
     <string name="mix_dash_mix">ترکیب موجودی</string>
     <string name="mix_dash_title">دش‌تان را ترکیب کنید</string>
     <string name="mix_dash_message">برای اینکه افراد دیگر نتوانند پرداخت‌هایتان را ببینند، توصیه می‌شود پیش از ایجاد نام کاربری، موجودی‌تان را ترکیب کنید. </string>
-</resources>
+    </resources>
diff --git a/wallet/res/values-fil/strings-dashpay.xml b/wallet/res/values-fil/strings-dashpay.xml
index 5adadf4871..e13121cca2 100644
--- a/wallet/res/values-fil/strings-dashpay.xml
+++ b/wallet/res/values-fil/strings-dashpay.xml
@@ -269,7 +269,6 @@ Username</b></string>
     <string name="usernames_blocked_title">Maaaring i-block ang ilang mga username</string>
     <string name="usernames_blocked_subtitle">Kung matukoy ng sapat na network na hindi naaangkop ang isang username, maaari nilang i-block ito</string>
     <string name="username_voting">Pagboto ng username</string>
-    <string name="username_voting_subtitle">Bilang may-ari ng masternode, maaari kang bumoto upang aprubahan ang mga hiniling na username bago ito gawin sa network.</string>
     <string name="voting_duplicates_only_title">Default na setting ng filter</string>
     <string name="voting_duplicates_only_message">Ang default na filter ay nagpapakita lamang ng mga duplicate na username na HINDI mo binoto, ngunit makikita mo ang lahat ng pinagtatalunang username sa pamamagitan ng pagpapalit ng filter</string>
     <string name="all">Lahat</string>
@@ -339,8 +338,6 @@ Username</b></string>
     <string name="masternode_ip">Masternode IP address</string>
     <string name="multiple_votes_cast">ipapalabas ang mga %d boto dahil marami kang voting key na nakaimbak sa wallet</string>
     <string name="add_masternode_key">Magdagdag ng Masternode Voting Key</string>
-    <string name="vote_submitted">Naisumite ang iyong boto</string>
-    <string name="vote_cancelled">Kinansela ang iyong boto</string>
     <string name="quick_vote">Mabilis na Pagboto</string>
     <string name="quick_vote_subtitle">Sa pamamagitan ng pag-tap sa \"Vote for All\" na button, awtomatiko kang bumoto para sa lahat ng na-filter na username (%d) na unang isinumite</string>
     <string name="vote_for_all">Bumoto para sa Lahat</string>
diff --git a/wallet/res/values-fr/strings-dashpay.xml b/wallet/res/values-fr/strings-dashpay.xml
index 849ac429fe..f2dca49784 100644
--- a/wallet/res/values-fr/strings-dashpay.xml
+++ b/wallet/res/values-fr/strings-dashpay.xml
@@ -268,7 +268,6 @@
     <string name="usernames_blocked_title">Certains noms d\'utilisateur peuvent être bloqués</string>
     <string name="usernames_blocked_subtitle">Si une proportion suffisante du réseau pense qu\'un nom d\'utilisateur est inapproprié, il peut le bloquer</string>
     <string name="username_voting">Vote des noms d\'utilisateur</string>
-    <string name="username_voting_subtitle">En tant que propriétaire de masternode, vous pouvez voter pour approuver les demandes de noms d\'utilisateur avant qu\'ils ne soient créés sur le réseau.</string>
     <string name="voting_duplicates_only_title">Réglage de filtre par défaut</string>
     <string name="voting_duplicates_only_message">Le filtre par défaut affiche uniquement les noms d\'utilisateur en double pour lesquels vous n\'avez PAS voté, mais vous pouvez voir tous les noms d\'utilisateur contestés en modifiant le filtre</string>
     <string name="all">Tous</string>
@@ -338,8 +337,6 @@
     <string name="masternode_ip">Adresse IP de masternode</string>
     <string name="multiple_votes_cast">%d votes seront enregistrés car votre portefeuille possède plusieurs clés de vote</string>
     <string name="add_masternode_key">Ajouter la clé de vote d\'un masternode</string>
-    <string name="vote_submitted">Votre vote a été soumis</string>
-    <string name="vote_cancelled">Votre vote a été annulé</string>
     <string name="quick_vote">Vote rapide</string>
     <string name="quick_vote_subtitle">En appuyant sur le bouton “Voter pour tous\", vous voterez automatiquement pour tous les noms d\'utilisateur filtrés (%d) qui ont été proposés en premier</string>
     <string name="vote_for_all">Voter pour tous</string>
diff --git a/wallet/res/values-id/strings-dashpay.xml b/wallet/res/values-id/strings-dashpay.xml
index 5993677986..0b31164413 100644
--- a/wallet/res/values-id/strings-dashpay.xml
+++ b/wallet/res/values-id/strings-dashpay.xml
@@ -269,7 +269,6 @@ Dash</b> anda</string>
     <string name="usernames_blocked_title">Beberapa nama pengguna dapat diblokir</string>
     <string name="usernames_blocked_subtitle">Jika cukup banyak jaringan yang menentukan bahwa nama pengguna tidak pantas, mereka dapat memblokirnya</string>
     <string name="username_voting">Voting nama pengguna</string>
-    <string name="username_voting_subtitle">Sebagai pemilik masternode, Anda dapat memberikan suara untuk menyetujui nama pengguna yang diminta sebelum dibuat di jaringan..</string>
     <string name="voting_duplicates_only_title">Pengaturan filter default</string>
     <string name="voting_duplicates_only_message">Filter default hanya menampilkan nama pengguna duplikat yang BELUM Anda pilih, tetapi Anda dapat melihat semua nama pengguna yang diperebutkan dengan mengubah filter</string>
     <string name="all">Semua</string>
@@ -339,8 +338,6 @@ Dash</b> anda</string>
     <string name="masternode_ip">Alamat IP masternode</string>
     <string name="multiple_votes_cast">%d suara akan diberikan karena Anda memiliki beberapa kunci pemungutan suara yang disimpan di dompet</string>
     <string name="add_masternode_key">Tambahkan Kunci Pemungutan Suara Masternode</string>
-    <string name="vote_submitted">Pilihan anda telah diserahkan</string>
-    <string name="vote_cancelled">Pilihan anda telah dibatalkan</string>
     <string name="quick_vote">Voting Cepat</string>
     <string name="quick_vote_subtitle">Dengan mengetuk tombol \"Pilih Semua\", Anda akan secara otomatis memilih semua nama pengguna yang difilter (%d) yang dikirimkan terlebih dahulu</string>
     <string name="vote_for_all">Pilih untuk semua</string>
diff --git a/wallet/res/values-it/strings-dashpay.xml b/wallet/res/values-it/strings-dashpay.xml
index 837b473aa2..65749f111f 100644
--- a/wallet/res/values-it/strings-dashpay.xml
+++ b/wallet/res/values-it/strings-dashpay.xml
@@ -270,6 +270,7 @@ Username</b></string>
     <string name="usernames_blocked_subtitle">Se un numero sufficiente di membri della rete determina che un nome utente non è appropriato, possono bloccarlo</string>
     <string name="username_voting">Votazione Username contestati</string>
     <string name="username_voting_subtitle">Come proprietario di un masternode puoi votare per approvare i nomi utente richiesti prima che vengano creati sulla rete.</string>
+    <string name="username_voting_subtitle_two">Puoi bloccare la creazione dei nomi utente che ritieni inappropriati.</string>
     <string name="voting_duplicates_only_title">Impostazione del filtro predefinita</string>
     <string name="voting_duplicates_only_message">Il filtro predefinito mostra solo i nomi utente duplicati per i quali NON hai votato, ma puoi vedere tutti i nomi utente contestati modificando il filtro</string>
     <string name="all">Tutte</string>
@@ -296,7 +297,17 @@ Username</b></string>
         <item>Non ho approvato</item>
         <item>Ha bloccato i voti</item>
     </string-array>
-
+    <string name="unblock_button">Sbloccare</string>
+    <plurals name="block_vote_button">
+        <item quantity="one">Blocchi</item>
+        <item quantity="many">Blocchi</item>
+        <item quantity="other">Blocchi</item>
+    </plurals>
+    <plurals name="approval_button">
+        <item quantity="one">Approvazioni</item>
+        <item quantity="many">Approvazioni</item>
+        <item quantity="other">Approvazioni</item>
+    </plurals>
     <string name="block_vote_count">%d Blocco (i)</string>
     <string name="request_your_username">Crea il tuo nome utente</string>
     <string name="request_your_hint">Tieni presente che non potrai modificarlo in futuro</string>
@@ -316,6 +327,7 @@ Username</b></string>
     <string name="request_details">Richiedi dettagli</string>
     <string name="request_details_subtitle">Esamina il messaggio riportato di seguito per verificare la proprietà di questo nome utente</string>
     <string name="vote_to_approve">Vota per approvare\n </string>
+    <string name="vote_to_block">Vota per bloccare</string>
     <string name="identity">Identità</string>
     <string name="results">Risultati</string>
     <string name="link">Collegamento</string>
@@ -334,13 +346,31 @@ Username</b></string>
     <string name="voting_key_hint">Chiave privata di voto Masternode</string>
     <string name="voting_key_input_error">Hai inserito una chiave non valida</string>
     <string name="voting_key_input_not_active_error">Hai inserito una chiave che non è associata ad un Masternode attivo</string>
+    <string name="voting_key_input_already_present">Hai già inserito questa chiave masternode</string>
+    <string name="voting_key_input_invalid_private_key_wrong_network_testnet">Hai inserito una chiave per testnet, ma questa è mainnet. Dovrebbe assomigliare a questo:%s</string>
+    <string name="voting_key_input_invalid_private_key_wrong_network_mainnet">Hai inserito una chiave per mainnet, ma questa è testnet. Dovrebbe assomigliare a questo:%s</string>
+    <string name="voting_key_input_invalid_private_key_address">Hai inserito una chiave di indirizzo invece di una chiave privata di voto masternode. Dovrebbe essere in formato WIF (%s)</string>
+    <string name="voting_key_input_invalid_private_key_private_key_hex">Hai inserito una chiave in formato esadecimale, ma dovrebbe essere in formato WIF (%s)</string>
+    <string name="voting_key_input_invalid_private_key_public_key_hex">Hai inserito una chiave in formato esadecimale, ma dovrebbe essere in formato WIF (%s)</string>
+    <string name="voting_key_input_invalid_private_key_too_short">Hai inserito una chiave privata troppo corta. Ecco un esempio (%s)</string>
+    <string name="voting_key_input_invalid_private_key_incorrect">Hai inserito una chiave privata che contiene alcuni caratteri errati. Ecco un esempio (%s)</string>
+    <string name="voting_key_input_invalid_private_key_invalid_char">Hai inserito una chiave privata con un carattere non valido. Ecco un esempio (%s)</string>
+
     <string name="voting_key_add">Aggiungi le tue chiavi di voto</string>
     <string name="voting_key_add_subtitle">L\' indirizzo(i) IP seguenti sono associati a questo portafoglio</string>
     <string name="masternode_ip">Indirizzo IP del Masternode</string>
     <string name="multiple_votes_cast">%d i voti verranno espressi poiché nel portafoglio sono memorizzate più chiavi di voto</string>
     <string name="add_masternode_key">Aggiungi la chiave di voto Masternode</string>
-    <string name="vote_submitted">Il tuo voto è stato inviato</string>
-    <string name="vote_cancelled">Il tuo voto è stato annullato</string>
+    <string name="dont_ask_again">Non chiedermelo più</string>
+    <string name="vote_submitting">Inviando il tuo voto per %s username</string>
+    <string name="vote_submitted">Votato per %s username</string>
+    <string name="cancel_submitting">Annullamento del tuo voto per %s username</string>
+    <string name="cancel_submitted">Voto annullato per %s username</string>
+    <string name="block_submitting">Blocco per %s username</string>
+    <string name="block_submitted">Hai bloccato %s username</string>
+    <string name="vote_submitted_error">Errore nel votare per %s username</string>
+    <string name="cancel_submitted_error">Errore durante l\'annullamento del voto per %s username</string>
+    <string name="block_submitted_error">Errore di blocco %s username</string>
     <string name="quick_vote">Votazione veloce</string>
     <string name="quick_vote_subtitle">Toccando il pulsante \"Vota per tutti\", voterai automaticamente per tutti i nomi utente filtrati (%d) che sono stati presentati per primi</string>
     <string name="vote_for_all">Vota per tutti</string>
diff --git a/wallet/res/values-ja/strings-dashpay.xml b/wallet/res/values-ja/strings-dashpay.xml
index 1e2b999c0a..f9b871367d 100644
--- a/wallet/res/values-ja/strings-dashpay.xml
+++ b/wallet/res/values-ja/strings-dashpay.xml
@@ -87,7 +87,6 @@
     <string name="dashpay_topup_fee">チャージ料金</string>
     <string name="search_user_find_a_user">Dashネットワークでユーザーを探す</string>
     <string name="search_for_a_user">Dashネットワークのユーザーを検索</string>
-    <string name="search_user_input_placeholder">ユーザー名を入力してここから検索</string>
     <string name="add_new_contact">新しい連絡先を追加</string>
     <string name="send_contact_request">連絡先リクエストを送信する</string>
     <string name="sending_contact_request">連絡先リクエストを送信中</string>
@@ -268,7 +267,6 @@
     <string name="usernames_blocked_title">一部のユーザー名をブロックできます</string>
     <string name="usernames_blocked_subtitle">ネットワーク上の多数のユーザーがそのユーザー名を不適切と判断した場合、それをブロックできます</string>
     <string name="username_voting">ユーザー名投票</string>
-    <string name="username_voting_subtitle">マスターノードの所有者として、お客様がリクエストしたユーザー名に投票して承認されてから、ネットワーク上に作成できます。</string>
     <string name="voting_duplicates_only_title">デフォルトのフィルター設定</string>
     <string name="voting_duplicates_only_message">デフォルトのフィルターでは、お客様が投票していない重複したユーザー名のみが示されますが、フィルターを変更することですべての競合するユーザー名を確認できます</string>
     <string name="all">全て</string>
@@ -295,7 +293,6 @@
         <item>承認しませんでした</item>
         <item>投票をブロックしました</item>
     </string-array>
-
     <string name="block_vote_count">%dブロック</string>
     <string name="request_your_username">ユーザー名の作成</string>
     <string name="request_your_hint">一度決めたユーザー名は、今後変更することはできませんのでご注意ください</string>
@@ -338,8 +335,6 @@
     <string name="masternode_ip">マスターノードのIPアドレス</string>
     <string name="multiple_votes_cast">ウォレットに複数の投票キーが保管されているため、%d票の投票が行われます</string>
     <string name="add_masternode_key">マスターノードの投票キーを追加する</string>
-    <string name="vote_submitted">投票が提出されました</string>
-    <string name="vote_cancelled">投票がキャンセルされました</string>
     <string name="quick_vote">クイック投票</string>
     <string name="quick_vote_subtitle">「全てに投票」ボタンをタップすると、絞り込んだユーザー名のうち、最初に投稿されたもの(%d)全てに自動的に投票されます</string>
     <string name="vote_for_all">全てに投票</string>
@@ -416,4 +411,4 @@
     <string name="mix_dash_mix">ミキシング残高</string>
     <string name="mix_dash_title">Dashをミキシングする</string>
     <string name="mix_dash_message">他者に送金先を閲覧されないようにするため、残高をミキシングしてからユーザー名を作成することを推奨します。</string>
-</resources>
+    </resources>
diff --git a/wallet/res/values-ko/strings-dashpay.xml b/wallet/res/values-ko/strings-dashpay.xml
index 26c0f72b9a..a1154a5d7a 100644
--- a/wallet/res/values-ko/strings-dashpay.xml
+++ b/wallet/res/values-ko/strings-dashpay.xml
@@ -88,7 +88,6 @@
     <string name="dashpay_topup_fee">충전 수수료</string>
     <string name="search_user_find_a_user">대시 네트워크에서 사용자를 검색합니다</string>
     <string name="search_for_a_user">대시 네트워크에서 사용자 검색</string>
-    <string name="search_user_input_placeholder">이곳에 검색할 사용자 이름을 입력하세요</string>
     <string name="add_new_contact">새로운 연락처 추가하기</string>
     <string name="send_contact_request">연락처 요청 전송</string>
     <string name="sending_contact_request">연락처 요청 전송중</string>
@@ -269,7 +268,6 @@
     <string name="usernames_blocked_title">어떤 사용자 이름은 블록될 수 있습니다</string>
     <string name="usernames_blocked_subtitle">사용자 이름이 부적절하다는 점에 충분한 네트워크가 의견을 함께 한다면 블록할 수 있습니다</string>
     <string name="username_voting">사용자 이름 투표</string>
-    <string name="username_voting_subtitle">마스터노드 소유자인 당신은, 사용자 이름이 네트워크상에 생성되기 전에 이를 위한 요청에 대해 투표할 수 있습니다..</string>
     <string name="voting_duplicates_only_title">디폴트 필터 설정</string>
     <string name="voting_duplicates_only_message">이 디폴트 필터는 투표하지 않은 중복 사용자 아이디만 표시하지만, 필터를 변경하면 경합 중인 모든 사용자 아이디를 볼 수 있습니다.</string>
     <string name="all">모두</string>
@@ -296,7 +294,6 @@
         <item>승인하지 않았습니다</item>
         <item>투표를 차단했습니다</item>
     </string-array>
-
     <string name="block_vote_count">%d 블록</string>
     <string name="request_your_username">당신의 사용자 이름을 생성하세요</string>
     <string name="request_your_hint">이를 다시 변경할 수 없다는 점에 주의하세요</string>
@@ -339,8 +336,6 @@
     <string name="masternode_ip">마스터노드 IP 주소</string>
     <string name="multiple_votes_cast">이 지갑에 수 개의 투표 키가 저장되어 있으므로 %d 표가 던져지게 됩니다 </string>
     <string name="add_masternode_key">마스터노드 투표 키를 추가하세요</string>
-    <string name="vote_submitted">투표가 제출되었습니다</string>
-    <string name="vote_cancelled">투표가 취소되었습니다</string>
     <string name="quick_vote">빠른 투표</string>
     <string name="quick_vote_subtitle">\"모두 투표하기\" 버튼을 선택하면, 먼저 제출된 필터를 거친 모든 사용자 이름 (%d) 에 대해 자동으로 투표하게 됩니다</string>
     <string name="vote_for_all">모두 투표하기</string>
@@ -417,4 +412,4 @@
     <string name="mix_dash_mix">믹스 잔고</string>
     <string name="mix_dash_title">당신의 대시를 믹스하세요</string>
     <string name="mix_dash_message">당신이 누구에게 송금하는 지를 아무도 알 수 없게 하기 위해서는, 사용자 이름을 만들기 전에 잔고를 믹싱할 것을 권장합니다.</string>
-</resources>
+    </resources>
diff --git a/wallet/res/values-nl/strings-dashpay.xml b/wallet/res/values-nl/strings-dashpay.xml
index f5a7d73078..325e05dcd0 100644
--- a/wallet/res/values-nl/strings-dashpay.xml
+++ b/wallet/res/values-nl/strings-dashpay.xml
@@ -88,7 +88,6 @@ gebruikersnaam</b></string>
     <string name="dashpay_topup_fee">Opwaardeerkosten</string>
     <string name="search_user_find_a_user">Zoek een gebruiker op het Dash netwerk</string>
     <string name="search_for_a_user">Zoek naar een gebruiker op het Dash netwerk</string>
-    <string name="search_user_input_placeholder">Voer hier de gebruikersnaam in om te zoeken</string>
     <string name="add_new_contact">Voeg een nieuw contact toe</string>
     <string name="send_contact_request">Contactverzoek verzenden</string>
     <string name="sending_contact_request">Contactverzoek verzenden</string>
@@ -270,7 +269,6 @@ gebruikersnaam</b></string>
     <string name="usernames_blocked_title">Sommige gebruikersnamen kunnen worden geblokkeerd.</string>
     <string name="usernames_blocked_subtitle">Als genoeg mensen op het netwerk bepalen dat een gebruikersnaam ongepast is, kunnen ze deze blokkeren.</string>
     <string name="username_voting">Stemmen op gebruikersnamen</string>
-    <string name="username_voting_subtitle">Als eigenaar van een Masternode kan je stemmen om aangevraagde gebruikersnamen goed te keuren voordat ze op het network worden aangemaakt.</string>
     <string name="voting_duplicates_only_title">Standaard filterinstelling</string>
     <string name="voting_duplicates_only_message">Het standaardfilter toont alleen dubbele gebruikersnamen waar je NIET op hebt gestemd, maar je kan alle betwiste gebruikersnamen zien door het filter te wijzigen</string>
     <string name="all">Alles</string>
@@ -297,7 +295,6 @@ gebruikersnaam</b></string>
         <item>Ik heb het niet goedgekeurd</item>
         <item>Heeft geblokkeerde stemmen </item>
     </string-array>
-
     <string name="block_vote_count">%d Block(s)</string>
     <string name="request_your_username">Maak je gebruikersnaam aan</string>
     <string name="request_your_hint">Let op dat je deze in de toekomst niet meer kunt wijzigen</string>
@@ -340,8 +337,6 @@ gebruikersnaam</b></string>
     <string name="masternode_ip">Masternode IP adres</string>
     <string name="multiple_votes_cast">Er zullen %d stemmen worden uitgebracht omdat je meerdere stemsleutels in de portemonnee hebt opgeslagen.</string>
     <string name="add_masternode_key">Voeg Masternode stemsleutel toe</string>
-    <string name="vote_submitted">je stem is verzonden</string>
-    <string name="vote_cancelled">Je stem is geannuleerd</string>
     <string name="quick_vote">Snel stemmen</string>
     <string name="quick_vote_subtitle">Door op de knop \"Stem op Alles\" te drukken, stem je automatisch voor alle gefilterde gebruikersnamen (%d) die als eerste zijn ingediend.</string>
     <string name="vote_for_all">Stem voor alle</string>
@@ -418,4 +413,4 @@ gebruikersnaam</b></string>
     <string name="mix_dash_mix">Gemixt saldo</string>
     <string name="mix_dash_title">Mix je Dash</string>
     <string name="mix_dash_message">Om te voorkomen dat anderen kunnen zien aan wie je betalingen doet, raden wij u aan om je saldo te mixen voordat je je gebruikersnaam aanmaakt.</string>
-</resources>
+    </resources>
diff --git a/wallet/res/values-pl/strings-dashpay.xml b/wallet/res/values-pl/strings-dashpay.xml
index c44466121f..fa3f6a6ccf 100644
--- a/wallet/res/values-pl/strings-dashpay.xml
+++ b/wallet/res/values-pl/strings-dashpay.xml
@@ -87,7 +87,6 @@
     <string name="dashpay_topup_fee">Opłata za doładowanie</string>
     <string name="search_user_find_a_user">Znajdź użytkownika na Sieci Dash</string>
     <string name="search_for_a_user">Szukaj użytkownika na Sieci Dash</string>
-    <string name="search_user_input_placeholder">tutaj wpisz nazwę użytkownika, którą chcesz znaleźć</string>
     <string name="add_new_contact">Dodaj Nowy Kontakt</string>
     <string name="send_contact_request">Wyślij zaproszenie do kontaktów</string>
     <string name="sending_contact_request">Wysyłanie zaproszenia do kontaktów</string>
@@ -268,7 +267,6 @@
     <string name="usernames_blocked_title">Niektóre nazwy użytkowników mogą zostać zablokowane</string>
     <string name="usernames_blocked_subtitle">Jeśli wystarczająca liczba użytkowników w sieci uzna, że ​​nazwa użytkownika jest nieodpowiednia, mogą oni ją zablokować</string>
     <string name="username_voting">Głosowanie nad nazwą użytkownika</string>
-    <string name="username_voting_subtitle">Jako właściciel Masternoda możesz głosować nad zatwierdzeniem żądanych nazw użytkowników, zanim zostaną one utworzone w sieci.</string>
     <string name="voting_duplicates_only_title">Domyślne ustawienie filtra</string>
     <string name="voting_duplicates_only_message">Domyślny filtr pokazuje tylko zduplikowane nazwy użytkowników, na które nie głosowałeś, ale jeśli zmienisz filtr to możesz zobaczyć wszystkie nazwy użytkowników które są kwestionowane</string>
     <string name="all">Całość</string>
@@ -295,7 +293,6 @@
         <item>Nie zatwierdziłem</item>
         <item>Ma głosy za zablokowaniem</item>
     </string-array>
-
     <string name="block_vote_count">%d głos(ów) za zablokowaniem</string>
     <string name="request_your_username">Stwórz swoją nazwę użytkownika</string>
     <string name="request_your_hint">Pamiętaj, że nie będziesz mógł tego zmienić w przyszłości</string>
@@ -338,8 +335,6 @@
     <string name="masternode_ip">Adres IP masternoda</string>
     <string name="multiple_votes_cast">%d głosów będzie oddawanych, jeśli masz wiele kluczy do głosowania zapisanych w portfelu</string>
     <string name="add_masternode_key">Dodaj klucz głosowania Masternoda</string>
-    <string name="vote_submitted">Twój głos został przesłany</string>
-    <string name="vote_cancelled">Twój głos został anulowany</string>
     <string name="quick_vote">Szybkie Głosowanie</string>
     <string name="quick_vote_subtitle">Klikając przycisk „Głosuj na wszystkie”, automatycznie zagłosujesz na wszystkie filtrowane nazwy użytkowników (%d), które zostały przesłane jako pierwsze</string>
     <string name="vote_for_all">Głosuj nad wszyskimi</string>
@@ -416,4 +411,4 @@
     <string name="mix_dash_mix">Saldo wymieszanych funduszy</string>
     <string name="mix_dash_title">Miksuj swoje fundusze Dash</string>
     <string name="mix_dash_message">Aby uniemożliwić innym osobom śledzenie komu wysyłasz płatności, zaleca się mieszanie salda przed utworzeniem nazwy użytkownika.</string>
-</resources>
+    </resources>
diff --git a/wallet/res/values-pt/strings-dashpay.xml b/wallet/res/values-pt/strings-dashpay.xml
index 4532690421..bc429af9b6 100644
--- a/wallet/res/values-pt/strings-dashpay.xml
+++ b/wallet/res/values-pt/strings-dashpay.xml
@@ -88,7 +88,6 @@ Dash</b></string>
     <string name="dashpay_topup_fee">Taxa de Recarregamento</string>
     <string name="search_user_find_a_user">Encontre um usuário na rede Dash</string>
     <string name="search_for_a_user">Pesquisar um Usuário na Rede Dash</string>
-    <string name="search_user_input_placeholder">digite o nome de usuário para pesquisar aqui</string>
     <string name="add_new_contact">Adicione um Novo Contato</string>
     <string name="send_contact_request">Enviar Solicitação de Contato</string>
     <string name="sending_contact_request">Enviando Solicitação de Contato</string>
@@ -269,7 +268,6 @@ Dash</b></string>
     <string name="usernames_blocked_title">Algumas contas de usuário podem ser bloqueadas</string>
     <string name="usernames_blocked_subtitle">Se um número suficiente de pessoas na rede determinar que um nome de usuário é inapropriado, elas podem bloqueá-lo</string>
     <string name="username_voting">Votação de Nomes de Usuário</string>
-    <string name="username_voting_subtitle">Como proprietário de um masternode, você pode votar para aprovar nomes de usuário solicitados antes que eles sejam criado na rede..</string>
     <string name="voting_duplicates_only_title">Configuração de filtro padrão</string>
     <string name="voting_duplicates_only_message">O filtro padrão mostra apenas nomes de usuário duplicados nos quais você NÃO votou, mas você pode ver todos os nomes de usuário contestados alterando o filtro</string>
     <string name="all">Todos</string>
@@ -296,7 +294,6 @@ Dash</b></string>
         <item>Eu não aprovei</item>
         <item>Tem votos bloqueados</item>
     </string-array>
-
     <string name="block_vote_count">%d Bloco(s)</string>
     <string name="request_your_username">Criar seu nome de usuário</string>
     <string name="request_your_hint">Por favor, observe que você não poderá alterar isso no futuro</string>
@@ -339,8 +336,6 @@ Dash</b></string>
     <string name="masternode_ip">Endereço IP do Masternode</string>
     <string name="multiple_votes_cast">%d votos serão contabilizados, pois você possui várias chaves de votação armazenadas na carteira </string>
     <string name="add_masternode_key">Adicionar Chave de Votação de Masternode</string>
-    <string name="vote_submitted">Seu voto foi enviado</string>
-    <string name="vote_cancelled">Seu voto foi cancelado</string>
     <string name="quick_vote">Votação Rápida</string>
     <string name="quick_vote_subtitle">Ao clicar no botão \"Votar em todos\", você votará automaticamente em todos os nomes de usuário filtrados (%d) que foram enviados primeiro</string>
     <string name="vote_for_all">Votar em todos</string>
@@ -417,4 +412,4 @@ Dash</b></string>
     <string name="mix_dash_mix">Saldo da mistura</string>
     <string name="mix_dash_title">Mescle seu Dash</string>
     <string name="mix_dash_message">Para ajudar a evitar que outras pessoas vejam para quem você faz pagamentos, é recomendável misturar seu saldo antes de criar seu nome de usuário.</string>
-</resources>
+    </resources>
diff --git a/wallet/res/values-ru/strings-dashpay.xml b/wallet/res/values-ru/strings-dashpay.xml
index 5255dc78b9..af280f6f9a 100644
--- a/wallet/res/values-ru/strings-dashpay.xml
+++ b/wallet/res/values-ru/strings-dashpay.xml
@@ -111,7 +111,7 @@ Dash</b></string>
     <string name="contact_requests_title">Запросы на добавление</string>
     <string name="contacts_add_new_contact">Добавить новый контакт</string>
     <string name="contacts_contact_requests_count">Запросы на добавление в контакты (%d)</string>
-    <string name="contacts_contact_requests">Запросы на добавление\n</string>
+    <string name="contacts_contact_requests">Запросы на добавление</string>
     <string name="contacts_contact_requests_view">Посмотреть всё</string>
     <string name="contacts_my_contacts">Мои контакты</string>
     <string name="contacts_sort_order">Упорядочить по:</string>
@@ -263,13 +263,14 @@ Dash</b></string>
     <string name="pay_now">Оплатите сейчас, а в случае, если имя пользователя не одобрят, вы сможете создать другое без дополнительной платы</string>
     <string name="case_your_request_is_not_approved">Если ваш запрос не одобрили</string>
     <string name="voting_requirement_subtitle">Автоматически одобряются те имена пользователей, где есть число от 2-9, а длина больше 20 символов</string>
-    <string name="voting_requirement_title">Голосование понадобится только в определенных случаях</string>
+    <string name="voting_requirement_title">Голосование понадобится только в определённых случаях</string>
     <string name="dash_network_must_vote_to_approve">Сеть Dash должна одобрить имя пользователя, и только после этого оно будет создано.</string>
     <string name="what_is_username_voting">Что такое голосование за имя пользователя\?</string>
     <string name="usernames_blocked_title">Некоторые Имена пользователей могут быть заблокированы</string>
     <string name="usernames_blocked_subtitle">Если значительная часть сети Dash сочтёт имя пользователя неподходящим, его могут заблокировать.</string>
     <string name="username_voting">Голосование за имя пользователя</string>
-    <string name="username_voting_subtitle">Будучи владельцем мастерноды, вы можете голосовать за одобрение имён пользователей перед их созданием в сети.</string>
+    <string name="username_voting_subtitle">Как владелец мастерноды, вы можете голосовать за одобрение запрашиваемых имён пользователей до их создания в сети.</string>
+    <string name="username_voting_subtitle_two">Вы можете заблокировать создание имён пользователей, которые, по вашему мнению, являются неподходящими.</string>
     <string name="voting_duplicates_only_title">Настройки фильтра по умолчанию</string>
     <string name="voting_duplicates_only_message">По умолчанию фильтр показывает только повторяющиеся имена пользователей, за которые вы НЕ голосовали, но при смене настроек фильтра можно посмотреть все спорные имена пользователей</string>
     <string name="all">Все</string>
@@ -296,7 +297,19 @@ Dash</b></string>
         <item>Не одобрено мной</item>
         <item>Есть заблокированные голоса</item>
     </string-array>
-
+    <string name="unblock_button">Разблокировать</string>
+    <plurals name="block_vote_button">
+        <item quantity="one">Блок</item>
+        <item quantity="few">Блока</item>
+        <item quantity="many">Блоков</item>
+        <item quantity="other">Против</item>
+    </plurals>
+    <plurals name="approval_button">
+        <item quantity="one">Голос \"За\"</item>
+        <item quantity="few">Голоса \"За\"</item>
+        <item quantity="many">Голосов \"За\"</item>
+        <item quantity="other">За</item>
+    </plurals>
     <string name="block_vote_count">%d Блок(ов)</string>
     <string name="request_your_username">Создать имя пользователя</string>
     <string name="request_your_hint">Обратите внимание, что в будущем вы не сможете его изменить</string>
@@ -316,6 +329,7 @@ Dash</b></string>
     <string name="request_details">Узнать подробности</string>
     <string name="request_details_subtitle">Изучите сообщение ниже, чтобы подтвердить владение этим именем пользователя</string>
     <string name="vote_to_approve">Одобрить</string>
+    <string name="vote_to_block">Голосовать за Блок</string>
     <string name="identity">ID</string>
     <string name="results">Результаты</string>
     <string name="link">Ссылка</string>
@@ -334,13 +348,31 @@ Dash</b></string>
     <string name="voting_key_hint">Приватный ключ для голосования мастерноды</string>
     <string name="voting_key_input_error">Вы ввели неверный ключ</string>
     <string name="voting_key_input_not_active_error">Вы ввели ключ, который не связан с активной мастернодой.</string>
+    <string name="voting_key_input_already_present">Вы уже вводили этот ключ мастерноды</string>
+    <string name="voting_key_input_invalid_private_key_wrong_network_testnet">Вы ввели ключ для тестовой сети, а это - основная сеть. Ключ должен выглядеть так: %s</string>
+    <string name="voting_key_input_invalid_private_key_wrong_network_mainnet">Вы ввели ключ для основной сети, а это - тестовая сеть. Ключ должен выглядеть так: %s</string>
+    <string name="voting_key_input_invalid_private_key_address">Вы ввели адресный ключ вместо приватного ключа мастерноды для голосования. Он должен быть в формате WIF (%s)</string>
+    <string name="voting_key_input_invalid_private_key_private_key_hex">Вы ввели ключ в шестнадцатеричном формате, а он должен быть в формате WIF (%s)</string>
+    <string name="voting_key_input_invalid_private_key_public_key_hex">Вы ввели ключ в шестнадцатеричном формате, а он должен быть в формате WIF (%s)</string>
+    <string name="voting_key_input_invalid_private_key_too_short">Вы ввели слишком короткий приватный ключ. Вот как он должен выглядеть (%s)</string>
+    <string name="voting_key_input_invalid_private_key_incorrect">Вы ввели приватный ключ, который содержит некорректные символы. Вот как он должен выглядеть: (%s)</string>
+    <string name="voting_key_input_invalid_private_key_invalid_char">Вы ввели приватный ключ, который содержит неверный символ. Вот как он должен выглядеть: (%s)</string>
+
     <string name="voting_key_add">Введите ключ для голосования</string>
-    <string name="voting_key_add_subtitle">С этим кошельком связаны следующие IP-адреса</string>
+    <string name="voting_key_add_subtitle">С этим кошельком(-ами) связаны следующие IP-адреса</string>
     <string name="masternode_ip">IP-адрес мастерноды</string>
     <string name="multiple_votes_cast">В вашем кошельке храниться несколько ключей для голосования, поэтому будет отдано %d голосов.</string>
     <string name="add_masternode_key">Введите ключ для голосования мастерноды</string>
-    <string name="vote_submitted">Ваш голос учтён</string>
-    <string name="vote_cancelled">Ваш голос отозван</string>
+    <string name="dont_ask_again">Не спрашивать снова</string>
+    <string name="vote_submitting">Голосовать \"за\" имя пользователя %s</string>
+    <string name="vote_submitted">Голос отдан за имя пользователя %s</string>
+    <string name="cancel_submitting">Отзывается голос за имя пользователя %s</string>
+    <string name="cancel_submitted">Отозвать голос за имя пользователя %s</string>
+    <string name="block_submitting">Блокирование имени пользователя %s</string>
+    <string name="block_submitted">Вы заблокировали имя пользователя %s</string>
+    <string name="vote_submitted_error">Ошибка при голосовании за имя пользователя %s</string>
+    <string name="cancel_submitted_error">Ошибка при отмене голосования за имя пользователя %s</string>
+    <string name="block_submitted_error">Ошибка при блокировании имени пользователя %s</string>
     <string name="quick_vote">Быстрое голосование</string>
     <string name="quick_vote_subtitle">Нажав кнопку \"Голосовать за все\" вы автоматически проголосуете за все отфильтрованные имена пользователей (%d), которые были поданы первыми</string>
     <string name="vote_for_all">Голосовать за все</string>
@@ -417,4 +449,4 @@ Dash</b></string>
     <string name="mix_dash_mix">Перемешать баланс</string>
     <string name="mix_dash_title">Перемешайте свои Dash</string>
     <string name="mix_dash_message">Чтобы никто не смог узнать, кому вы отправляете платежи, рекомендуется перемешать баланс до создания имени пользователя.</string>
-</resources>
+    </resources>
diff --git a/wallet/res/values-sk/strings-dashpay.xml b/wallet/res/values-sk/strings-dashpay.xml
index e730e49652..dbeec27250 100644
--- a/wallet/res/values-sk/strings-dashpay.xml
+++ b/wallet/res/values-sk/strings-dashpay.xml
@@ -88,7 +88,6 @@ používateľské meno</b></string>
     <string name="dashpay_topup_fee">Poplatok za doplnenie</string>
     <string name="search_user_find_a_user">Nájsť používateľa v sieti Dash</string>
     <string name="search_for_a_user">Vyhľadať používateľa v sieti Dash</string>
-    <string name="search_user_input_placeholder">tu vyhľadajte používateľské meno</string>
     <string name="add_new_contact">Pridať nový kontakt</string>
     <string name="send_contact_request">Poslať žiadosť o kontakt</string>
     <string name="sending_contact_request">Odosielanie žiadosti o kontakt</string>
@@ -269,7 +268,6 @@ používateľské meno</b></string>
     <string name="usernames_blocked_title">Niektoré používateľské mená môžu byť zablokované</string>
     <string name="usernames_blocked_subtitle">Ak dostatočná časť siete zistí, že používateľské meno je nevhodné, môže ho zablokovať</string>
     <string name="username_voting">Hlasovanie o používateľskom mene</string>
-    <string name="username_voting_subtitle">Ako vlastník Masternode môžete hlasovaním schváliť požadované používateľské mená pred ich vytvorením v sieti.</string>
     <string name="voting_duplicates_only_title">Predvolené nastavenie filtra</string>
     <string name="voting_duplicates_only_message">Predvolený filter zobrazuje iba duplicitné používateľské mená, za ktoré ste NEHLASOVALI, ale zmenou filtra môžete zobraziť všetky sporné používateľské mená</string>
     <string name="all">Všetko</string>
@@ -296,7 +294,6 @@ používateľské meno</b></string>
         <item>Neschválil som</item>
         <item>Má zablokované hlasy</item>
     </string-array>
-
     <string name="block_vote_count">%d Blok(y)</string>
     <string name="request_your_username">Vytvorte si používateľské meno</string>
     <string name="request_your_hint">Upozorňujeme, že v budúcnosti ho už nebudete môcť zmeniť</string>
@@ -339,8 +336,6 @@ používateľské meno</b></string>
     <string name="masternode_ip">IP adresa Masternode</string>
     <string name="multiple_votes_cast">Bude odovzdaných %d hlasov, pretože v peňaženke máte uložených viacero hlasovacích kľúčov</string>
     <string name="add_masternode_key">Pridať hlasovací kľúč Masternode</string>
-    <string name="vote_submitted">Váš hlas bol odoslaný</string>
-    <string name="vote_cancelled">Váš hlas bol zrušený</string>
     <string name="quick_vote">Rýchle hlasovanie</string>
     <string name="quick_vote_subtitle">Klepnutím na tlačidlo „Hlasovať za všetkých“ budete automaticky hlasovať za všetky filtrované používateľské mená (%d), ktoré boli odoslané ako prvé</string>
     <string name="vote_for_all">Hlasovať za všetkých</string>
@@ -417,4 +412,4 @@ používateľské meno</b></string>
     <string name="mix_dash_mix">Miešaný zostatok</string>
     <string name="mix_dash_title">Namiešajte váš Dash</string>
     <string name="mix_dash_message">Ak chcete zabrániť tomu, aby ostatní ľudia videli, komu uskutočňujete platby, odporúča sa pred vytvorením používateľského mena zmiešať zostatok.</string>
-</resources>
+    </resources>
diff --git a/wallet/res/values-tr/strings-dashpay.xml b/wallet/res/values-tr/strings-dashpay.xml
index a864876618..e5c105bc89 100644
--- a/wallet/res/values-tr/strings-dashpay.xml
+++ b/wallet/res/values-tr/strings-dashpay.xml
@@ -87,7 +87,6 @@
     <string name="dashpay_topup_fee">Yükleme Ücreti</string>
     <string name="search_user_find_a_user">Dash Ağında bir kullanıcı bulun</string>
     <string name="search_for_a_user">Dash Ağındaki bir Kullanıcıyı Ara</string>
-    <string name="search_user_input_placeholder">Arama yapmak için kullanıcı adını buraya girin</string>
     <string name="add_new_contact">Yeni Kişi Ekle</string>
     <string name="send_contact_request">İletişim İsteği Gönderin</string>
     <string name="sending_contact_request">İletişim Talebi Gönderme</string>
@@ -290,7 +289,6 @@
         <item>Onayladım</item>
         <item>Onaylamadım</item>
     </string-array>
-
     <string name="request_your_username">Kullanıcı adınızı oluşturun</string>
     <string name="request_username">Kullanıcı Adı İste</string>
     <string name="request_voting_range">Dash ağı bu kullanıcı adına oy verecek. Sonuçları %s tarihinde size bildireceğiz.</string>
@@ -325,8 +323,6 @@
     <string name="masternode_ip">Ana düğüm IP adresi</string>
     <string name="multiple_votes_cast">Cüzdanınızda birden fazla oylama anahtarı saklandığı için %d oy kullanılacak</string>
     <string name="add_masternode_key">Ana Düğüm Oylama Anahtarı</string>
-    <string name="vote_submitted">Oyunuz gönderildi</string>
-    <string name="vote_cancelled">Oyunuz iptal edildi</string>
     <string name="quick_vote">Hızlı Oylama</string>
     <string name="quick_vote_subtitle">\"Hepsine Oy Ver\" düğmesine tıklayarak, ilk gönderilen filtrelenmiş kullanıcı adlarının (%d) tümüne otomatik olarak oy vereceksiniz</string>
     <string name="vote_for_all">Herkese Oy Ver</string>
diff --git a/wallet/res/values-uk/strings-dashpay.xml b/wallet/res/values-uk/strings-dashpay.xml
index 8bbc71af2e..f7f3962449 100644
--- a/wallet/res/values-uk/strings-dashpay.xml
+++ b/wallet/res/values-uk/strings-dashpay.xml
@@ -325,8 +325,6 @@
     <string name="masternode_ip">IP-адреса Мастернод</string>
     <string name="multiple_votes_cast">%d голоси будуть віддані, оскільки у вас є кілька ключів для голосування, які зберігаються в гаманці</string>
     <string name="add_masternode_key">Додати ключі голосування Мастернод</string>
-    <string name="vote_submitted">Ваш голос подано</string>
-    <string name="vote_cancelled">Ваш голос скасовано</string>
     <string name="quick_vote">Швидке голосування</string>
     <string name="quick_vote_subtitle">Натиснувши кнопку «Голосувати за всіх», ви автоматично проголосуєте за всі відфільтровані імена користувачів (%d), які були подані першими</string>
     <string name="vote_for_all">Голосувати за всіх</string>
diff --git a/wallet/res/values-zh-rTW/strings-dashpay.xml b/wallet/res/values-zh-rTW/strings-dashpay.xml
index 70c102e3ac..615aea58ec 100644
--- a/wallet/res/values-zh-rTW/strings-dashpay.xml
+++ b/wallet/res/values-zh-rTW/strings-dashpay.xml
@@ -269,7 +269,6 @@
     <string name="usernames_blocked_title">某些使用者名稱可能會被阻止</string>
     <string name="usernames_blocked_subtitle">如果有足夠的網路確定使用者認為名稱不合適，他們可以阻止它</string>
     <string name="username_voting">用戶名投票</string>
-    <string name="username_voting_subtitle">作為主節點所有者，您可以在網路上建立請求的使用者名稱之前投票批准它們。</string>
     <string name="voting_duplicates_only_title">預設過濾器設定</string>
     <string name="voting_duplicates_only_message">預設過濾器僅顯示您未投票的重複用戶名，但您可以透過更改過濾器來查看所有有爭議的用戶名</string>
     <string name="all">所有</string>
@@ -296,7 +295,6 @@
         <item>我己否決的</item>
         <item>已阻止投票</item>
     </string-array>
-
     <string name="block_vote_count">%d 區塊</string>
     <string name="request_your_username">建立您的用戶名</string>
     <string name="request_your_hint">請注意，您未來將無法更改它</string>
@@ -339,8 +337,6 @@
     <string name="masternode_ip">主節點IP位址</string>
     <string name="multiple_votes_cast">%d 由於您的錢包中儲存了多個投票密鑰，因此將進行投票</string>
     <string name="add_masternode_key">新增主節點投票金鑰</string>
-    <string name="vote_submitted">您的投票已提交</string>
-    <string name="vote_cancelled">您的投票已被取消</string>
     <string name="quick_vote">快速投票</string>
     <string name="quick_vote_subtitle">點擊 \"為所有人投票\" 按鈕，您將自動為首先提交的所有已過濾用戶名 (%d) 投票</string>
     <string name="vote_for_all">給所有人投票</string>
diff --git a/wallet/res/values-zh/strings-dashpay.xml b/wallet/res/values-zh/strings-dashpay.xml
index 22babef97b..d12a67b7e1 100644
--- a/wallet/res/values-zh/strings-dashpay.xml
+++ b/wallet/res/values-zh/strings-dashpay.xml
@@ -269,7 +269,6 @@
     <string name="usernames_blocked_title">一些用户名会被禁止</string>
     <string name="usernames_blocked_subtitle">如果足够的网络节点认为此用户名不合适, 他们能够屏蔽它</string>
     <string name="username_voting">用户名投票</string>
-    <string name="username_voting_subtitle">作为主节点持有者, 您可以在用户名被在网络上创建之前投票通过这些在申请中的用户名..</string>
     <string name="voting_duplicates_only_title">默认过滤器设置</string>
     <string name="voting_duplicates_only_message">默认过滤器仅显示您未投票的重复用户名, 但您可以通过更改过滤器来查看所有有争议的用户名</string>
     <string name="all">所有</string>
@@ -339,8 +338,6 @@
     <string name="masternode_ip">主节点 IP 地址</string>
     <string name="multiple_votes_cast">由于您的钱包存储了多个投票私钥, 您可以进行多次 %d 投票</string>
     <string name="add_masternode_key">添加主节点投票私钥</string>
-    <string name="vote_submitted">您的投票已被提交</string>
-    <string name="vote_cancelled">您的投票已被取消</string>
     <string name="quick_vote">快速投票</string>
     <string name="quick_vote_subtitle">通过点击“投给所有”按钮, 您将自动为所有最先提交的过滤用户名 (%d) 投票</string>
     <string name="vote_for_all">投给所有</string>

From 8b2c9a6d5cfcd6605b216814f4514b9f9fa011df Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Mon, 11 Nov 2024 09:17:38 -0800
Subject: [PATCH 27/58] fix: don't delete votes when updating

---
 .../wallet/service/platform/PlatformSyncService.kt           | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt b/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt
index f2b3741d18..68e5e6a5dc 100644
--- a/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt
+++ b/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt
@@ -1142,10 +1142,11 @@ class PlatformSynchronizationService @Inject constructor(
             currentRequestList.forEach { request ->
                 val voteContender = platformRepo.getVoteContenders(request.normalizedLabel)
                 if (voteContender.winner.isPresent) {
+                    // remove request
                     usernameRequestDao.remove(request.requestId)
+                    // remove related votes
+                    usernameVoteDao.remove(request.normalizedLabel)
                 }
-                // remove related votes
-                usernameVoteDao.remove(request.normalizedLabel)
             }
             // check votes and remove those from previous vote polls
             usernameVoteDao.getAllVotes().forEach { vote ->

From e8182f4f5a2ce9fc07a26e32834c91439a7e187f Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Mon, 11 Nov 2024 10:42:18 -0800
Subject: [PATCH 28/58] fix: update translations

---
 wallet/res/values-es/strings-dashpay.xml | 35 +++++++++++++++++++++
 wallet/res/values-fr/strings-dashpay.xml | 39 ++++++++++++++++++++++--
 wallet/res/values-pl/strings-dashpay.xml | 37 ++++++++++++++++++++++
 wallet/res/values-pt/strings-dashpay.xml | 35 +++++++++++++++++++++
 wallet/res/values-zh/strings-dashpay.xml | 35 +++++++++++++++++++--
 5 files changed, 175 insertions(+), 6 deletions(-)

diff --git a/wallet/res/values-es/strings-dashpay.xml b/wallet/res/values-es/strings-dashpay.xml
index d9c3629b37..a26b717f51 100644
--- a/wallet/res/values-es/strings-dashpay.xml
+++ b/wallet/res/values-es/strings-dashpay.xml
@@ -88,6 +88,7 @@ de Dash</b></string>
     <string name="dashpay_topup_fee">Tarifa de recarga</string>
     <string name="search_user_find_a_user">Encontrar un usuario en la red Dash</string>
     <string name="search_for_a_user">Buscar un usuario en la red Dash</string>
+    <string name="search_user_input_placeholder">Buscar nombre de usuario</string>
     <string name="add_new_contact">Agregar un nuevo contacto</string>
     <string name="send_contact_request">Enviar solicitud de contacto</string>
     <string name="sending_contact_request">Enviando solicitud de contacto</string>
@@ -268,6 +269,8 @@ de Dash</b></string>
     <string name="usernames_blocked_title">Algunos nombres de usuario pueden ser bloqueados</string>
     <string name="usernames_blocked_subtitle">Si una cantidad suficiente de usuarios de la red determina que un nombre de usuario es inapropiado, pueden bloquearlo.</string>
     <string name="username_voting">Votación por nombre de usuario</string>
+    <string name="username_voting_subtitle">Como propietario de un masternode puedes votar para aprobar los nombres de usuario solicitados antes de que se creen en la red.</string>
+    <string name="username_voting_subtitle_two">Puedes bloquear la creación de nombres de usuario que consideres inapropiados.</string>
     <string name="voting_duplicates_only_title">Configuración de filtro predeterminada</string>
     <string name="voting_duplicates_only_message">El filtro predeterminado muestra solo nombres de usuario duplicados por los que NO has votado, pero puedes ver todos los nombres de usuario en disputa cambiando el filtro.</string>
     <string name="all">Todos</string>
@@ -294,6 +297,17 @@ de Dash</b></string>
         <item>Yo no he aprobado</item>
         <item>Ha bloqueado votos</item>
     </string-array>
+    <string name="unblock_button">Desbloquear</string>
+    <plurals name="block_vote_button">
+        <item quantity="one">Bloque</item>
+        <item quantity="many">Bloques</item>
+        <item quantity="other">Bloques</item>
+    </plurals>
+    <plurals name="approval_button">
+        <item quantity="one">Aprobación</item>
+        <item quantity="many">Aprobaciones</item>
+        <item quantity="other">Aprobaciones</item>
+    </plurals>
     <string name="block_vote_count">%d Bloque(s)</string>
     <string name="request_your_username">Crea tu nombre de usuario</string>
     <string name="request_your_hint">Ten en cuenta que no podrás cambiarlo en el futuro.</string>
@@ -313,6 +327,7 @@ de Dash</b></string>
     <string name="request_details">Pedir detalles</string>
     <string name="request_details_subtitle">Revisa la publicación a continuación para verificar la propiedad de este nombre de usuario</string>
     <string name="vote_to_approve">Vota para aprobar</string>
+    <string name="vote_to_block">Votar para bloquear</string>
     <string name="identity">Identidad</string>
     <string name="results">Resultados</string>
     <string name="link">Link</string>
@@ -331,11 +346,31 @@ de Dash</b></string>
     <string name="voting_key_hint">Llave privada de votación de masternode</string>
     <string name="voting_key_input_error">Has introducido una clave inválida</string>
     <string name="voting_key_input_not_active_error">Has ingresado una llave que no está asociada a un Masternode activo</string>
+    <string name="voting_key_input_already_present">Ya has ingresado esta clave de masternode</string>
+    <string name="voting_key_input_invalid_private_key_wrong_network_testnet">Has introducido una clave que corresponde a la red de prueba, pero esta es la red principal. Debería verse así: %s</string>
+    <string name="voting_key_input_invalid_private_key_wrong_network_mainnet">Has introducido una clave que corresponde a la red principal, pero esta es la red de prueba. Debería verse así: %s</string>
+    <string name="voting_key_input_invalid_private_key_address">Has introducido una clave de dirección en lugar de una clave privada de votación de masternode. Debe estar en formato WIF (%s)</string>
+    <string name="voting_key_input_invalid_private_key_private_key_hex">Has introducido una clave en formato hexadecimal, pero debería estar en formato WIF (%s)</string>
+    <string name="voting_key_input_invalid_private_key_public_key_hex">Has introducido una clave en formato hexadecimal, pero debería estar en formato WIF (%s)</string>
+    <string name="voting_key_input_invalid_private_key_too_short">Has introducido una clave privada demasiado corta. A continuación se muestra un ejemplo (%s)</string>
+    <string name="voting_key_input_invalid_private_key_incorrect">Has introducido una clave privada con algunos caracteres incorrectos. A continuación se muestra un ejemplo (%s)</string>
+    <string name="voting_key_input_invalid_private_key_invalid_char">Has introducido una clave privada que contiene un carácter no válido. A continuación se muestra un ejemplo (%s)</string>
+
     <string name="voting_key_add">Añade tus llaves de votación</string>
     <string name="voting_key_add_subtitle">Las direcciones IP que aparecen a continuación están asociadas con esta billetera</string>
     <string name="masternode_ip">Dirección IP de Masternode </string>
     <string name="multiple_votes_cast">%d Los votos se emitirán ya que tienes múltiples llaves de votación almacenadas en la billetera.</string>
     <string name="add_masternode_key">Añadir llave de votación de Masternode</string>
+    <string name="dont_ask_again">No me preguntes de nuevo</string>
+    <string name="vote_submitting">Enviando tu voto para %s nombre de usuario</string>
+    <string name="vote_submitted">Votado por %s nombre de usuario</string>
+    <string name="cancel_submitting">Cancelar tu voto para %s nombre de usuario</string>
+    <string name="cancel_submitted">Votación cancelada para %s nombre de usuario</string>
+    <string name="block_submitting">Bloqueo para %s nombre de usuario</string>
+    <string name="block_submitted">Tú bloqueaste %s nombre de usuario</string>
+    <string name="vote_submitted_error">Error votando por %s nombre de usuario</string>
+    <string name="cancel_submitted_error">Error al cancelar la votación para %s nombre de usuario</string>
+    <string name="block_submitted_error">Error bloqueando %s nombre de usuario</string>
     <string name="quick_vote">Votación rápida</string>
     <string name="quick_vote_subtitle">Al pulsar el botón \"Votar por todos\", votarás automáticamente por todos los nombres de usuario filtrados (%d) que fueron presentados primero</string>
     <string name="vote_for_all">Vota por todas</string>
diff --git a/wallet/res/values-fr/strings-dashpay.xml b/wallet/res/values-fr/strings-dashpay.xml
index f2dca49784..295617e09d 100644
--- a/wallet/res/values-fr/strings-dashpay.xml
+++ b/wallet/res/values-fr/strings-dashpay.xml
@@ -87,7 +87,7 @@
     <string name="dashpay_topup_fee">Frais de recharge</string>
     <string name="search_user_find_a_user">Cherchez un utilisateur sur le réseau Dash</string>
     <string name="search_for_a_user">Rechercher un utilisateur sur le réseau Dash</string>
-    <string name="search_user_input_placeholder">tapez ici le nom d\'utilisateur à chercher</string>
+    <string name="search_user_input_placeholder">Chercher un nom d\'utilisateur</string>
     <string name="add_new_contact">Ajouter un nouveau contact</string>
     <string name="send_contact_request">Envoyer une demande de contact</string>
     <string name="sending_contact_request">Envoi de la requête de contact</string>
@@ -268,6 +268,8 @@
     <string name="usernames_blocked_title">Certains noms d\'utilisateur peuvent être bloqués</string>
     <string name="usernames_blocked_subtitle">Si une proportion suffisante du réseau pense qu\'un nom d\'utilisateur est inapproprié, il peut le bloquer</string>
     <string name="username_voting">Vote des noms d\'utilisateur</string>
+    <string name="username_voting_subtitle">En tant que propriétaire de masternode, vous pouvez voter pour approuver les demandes de noms d\'utilisateur avant qu\'ils ne soient créés sur le réseau.</string>
+    <string name="username_voting_subtitle_two">Vous pouvez bloquer la création de noms d\'utilisateur si vous les jugez inappropriés.</string>
     <string name="voting_duplicates_only_title">Réglage de filtre par défaut</string>
     <string name="voting_duplicates_only_message">Le filtre par défaut affiche uniquement les noms d\'utilisateur en double pour lesquels vous n\'avez PAS voté, mais vous pouvez voir tous les noms d\'utilisateur contestés en modifiant le filtre</string>
     <string name="all">Tous</string>
@@ -294,7 +296,17 @@
         <item>Je n\'ai pas approuvé</item>
         <item>A des votes de blocage</item>
     </string-array>
-
+    <string name="unblock_button">Débloquer</string>
+    <plurals name="block_vote_button">
+        <item quantity="one">Blocage</item>
+        <item quantity="many">Blocages</item>
+        <item quantity="other">Blocages</item>
+    </plurals>
+    <plurals name="approval_button">
+        <item quantity="one">Approbation</item>
+        <item quantity="many">Approbations</item>
+        <item quantity="other">Approbations</item>
+    </plurals>
     <string name="block_vote_count">%d bloc(s)</string>
     <string name="request_your_username">Créez votre nom d\'utilisateur</string>
     <string name="request_your_hint">Veuillez noter que vous ne pourrez pas le changer plus tard</string>
@@ -314,6 +326,7 @@
     <string name="request_details">Détails de la demande</string>
     <string name="request_details_subtitle">Veuillez relire les infos ci-dessous pour vérifier la propriété de ce nom d\'utilisateur</string>
     <string name="vote_to_approve">Voter pour approuver</string>
+    <string name="vote_to_block">Voter pour bloquer</string>
     <string name="identity">Identité</string>
     <string name="results">Résultats</string>
     <string name="link">Lien</string>
@@ -332,11 +345,31 @@
     <string name="voting_key_hint">Clé privée de vote de masternode</string>
     <string name="voting_key_input_error">Vous avez saisi une clé invalide</string>
     <string name="voting_key_input_not_active_error">Vous avez indiqué une clé qui n\'est pas associée à un masternode actif.</string>
+    <string name="voting_key_input_already_present">Vous avez déjà saisi cette clé de masternode</string>
+    <string name="voting_key_input_invalid_private_key_wrong_network_testnet">Vous avez saisi une clé pour le réseau de test, mais il s\'agit du réseau principal. Elle devrait ressembler à ceci : %s</string>
+    <string name="voting_key_input_invalid_private_key_wrong_network_mainnet">Vous avez saisi une clé pour le réseau principal, mais il s\'agit du réseau de test. Elle devrait ressembler à ceci : %s</string>
+    <string name="voting_key_input_invalid_private_key_address">Vous avez saisi une clé d\'adresse au lieu d\'une clé privée de vote de masternode. Elle devrait être au format WIF (%s)</string>
+    <string name="voting_key_input_invalid_private_key_private_key_hex">Vous avez saisi une clé en format hexadécimal, mais elle devrait être au format WIF (%s)</string>
+    <string name="voting_key_input_invalid_private_key_public_key_hex">Vous avez saisi une clé en format hexadécimal, mais elle devrait être au format WIF (%s)</string>
+    <string name="voting_key_input_invalid_private_key_too_short">Vous avez saisi une clé privée trop courte. Voici un exemple (%s)</string>
+    <string name="voting_key_input_invalid_private_key_incorrect">Vous avez saisi une clé privée qui contient quelques caractères incorrects. Voici un exemple (%s)</string>
+    <string name="voting_key_input_invalid_private_key_invalid_char">Vous avez saisi une clé privée contenant un caractère invalide. Voici un exemple (%s)</string>
+
     <string name="voting_key_add">Ajoutez vos clés de vote</string>
     <string name="voting_key_add_subtitle">Les adresses IP ci-dessous sont associées à ce portefeuille</string>
     <string name="masternode_ip">Adresse IP de masternode</string>
     <string name="multiple_votes_cast">%d votes seront enregistrés car votre portefeuille possède plusieurs clés de vote</string>
     <string name="add_masternode_key">Ajouter la clé de vote d\'un masternode</string>
+    <string name="dont_ask_again">Ne plus me demander</string>
+    <string name="vote_submitting">Soumission de votre vote pour le nom d\'utilisateur %s</string>
+    <string name="vote_submitted">A voté pour le nom d\'utilisateur %s</string>
+    <string name="cancel_submitting">Annulation de votre vote pour le nom d\'utilisateur %s</string>
+    <string name="cancel_submitted">Vote annulé pour le nom d\'utilisateur %s </string>
+    <string name="block_submitting">Blocage du nom d\'utilisateur %s</string>
+    <string name="block_submitted">Vous avez bloqué le nom d\'utilisateur %s</string>
+    <string name="vote_submitted_error">Erreur lors du vote pour le nom d\'utilisateur %s</string>
+    <string name="cancel_submitted_error">Erreur lors de l\'annulation du vote pour le nom d\'utilisateur %s</string>
+    <string name="block_submitted_error">Erreur lors du blocage du nom d\'utilisateur %s</string>
     <string name="quick_vote">Vote rapide</string>
     <string name="quick_vote_subtitle">En appuyant sur le bouton “Voter pour tous\", vous voterez automatiquement pour tous les noms d\'utilisateur filtrés (%d) qui ont été proposés en premier</string>
     <string name="vote_for_all">Voter pour tous</string>
@@ -413,4 +446,4 @@
     <string name="mix_dash_mix">Solde mélangé</string>
     <string name="mix_dash_title">Mélangez vos dashs</string>
     <string name="mix_dash_message">Pour empêcher d\'autres gens de voir à qui vous faites des paiements, il est recommandé de mélanger votre solde avant de créer votre nom d\'utilisateur.</string>
-</resources>
+    </resources>
diff --git a/wallet/res/values-pl/strings-dashpay.xml b/wallet/res/values-pl/strings-dashpay.xml
index fa3f6a6ccf..65a5d74ae8 100644
--- a/wallet/res/values-pl/strings-dashpay.xml
+++ b/wallet/res/values-pl/strings-dashpay.xml
@@ -87,6 +87,7 @@
     <string name="dashpay_topup_fee">Opłata za doładowanie</string>
     <string name="search_user_find_a_user">Znajdź użytkownika na Sieci Dash</string>
     <string name="search_for_a_user">Szukaj użytkownika na Sieci Dash</string>
+    <string name="search_user_input_placeholder">Szukaj nazwy użytkownika</string>
     <string name="add_new_contact">Dodaj Nowy Kontakt</string>
     <string name="send_contact_request">Wyślij zaproszenie do kontaktów</string>
     <string name="sending_contact_request">Wysyłanie zaproszenia do kontaktów</string>
@@ -267,6 +268,8 @@
     <string name="usernames_blocked_title">Niektóre nazwy użytkowników mogą zostać zablokowane</string>
     <string name="usernames_blocked_subtitle">Jeśli wystarczająca liczba użytkowników w sieci uzna, że ​​nazwa użytkownika jest nieodpowiednia, mogą oni ją zablokować</string>
     <string name="username_voting">Głosowanie nad nazwą użytkownika</string>
+    <string name="username_voting_subtitle">Jako właściciel masternoda możesz głosować nad zatwierdzeniem żądanych nazw użytkowników zanim zostaną one stworzone w sieci.</string>
+    <string name="username_voting_subtitle_two">Możesz zablokować tworzenie nazw użytkowników, które uważasz za niewłaściwe lub wulgarne.</string>
     <string name="voting_duplicates_only_title">Domyślne ustawienie filtra</string>
     <string name="voting_duplicates_only_message">Domyślny filtr pokazuje tylko zduplikowane nazwy użytkowników, na które nie głosowałeś, ale jeśli zmienisz filtr to możesz zobaczyć wszystkie nazwy użytkowników które są kwestionowane</string>
     <string name="all">Całość</string>
@@ -293,6 +296,19 @@
         <item>Nie zatwierdziłem</item>
         <item>Ma głosy za zablokowaniem</item>
     </string-array>
+    <string name="unblock_button">Odblokuj</string>
+    <plurals name="block_vote_button">
+        <item quantity="one">Blok</item>
+        <item quantity="few">Bloki</item>
+        <item quantity="many">Bloków</item>
+        <item quantity="other">Bloków</item>
+    </plurals>
+    <plurals name="approval_button">
+        <item quantity="one">Zatwierdzenie</item>
+        <item quantity="few">Zatwierdzenia</item>
+        <item quantity="many">Zatwierdzeń</item>
+        <item quantity="other">Zatwierdzenia</item>
+    </plurals>
     <string name="block_vote_count">%d głos(ów) za zablokowaniem</string>
     <string name="request_your_username">Stwórz swoją nazwę użytkownika</string>
     <string name="request_your_hint">Pamiętaj, że nie będziesz mógł tego zmienić w przyszłości</string>
@@ -312,6 +328,7 @@
     <string name="request_details">Zarządaj szczegółów</string>
     <string name="request_details_subtitle">Sprawdź poniższy wpis, aby zweryfikować, czy ta nazwa użytkownika należy do ciebie</string>
     <string name="vote_to_approve">Głosuj, aby zatwierdzić</string>
+    <string name="vote_to_block">Głosuj za zablokowaniem</string>
     <string name="identity">Tożsamość</string>
     <string name="results">Wyniki</string>
     <string name="link">Link</string>
@@ -330,11 +347,31 @@
     <string name="voting_key_hint">Prywatny Klucz Używany do głosowania przez Masternoda</string>
     <string name="voting_key_input_error">Wpisałeś nieprawidłowy klucz</string>
     <string name="voting_key_input_not_active_error">Podałeś klucz, który nie jest powiązany z żadnym aktywnym Masternodem</string>
+    <string name="voting_key_input_already_present">Wprowadziłeś już ten klucz masternoda</string>
+    <string name="voting_key_input_invalid_private_key_wrong_network_testnet">Wprowadziłeś klucz, który jest dla sieci testowej, ale to jest główna sieć. Klucz dla sieci głównej powinien wyglądać tak: %s</string>
+    <string name="voting_key_input_invalid_private_key_wrong_network_mainnet">Wprowadziłeś klucz, który jest dla sieci głównej, ale to jest sieć testowa. Klucz dla sieci testowej powinien wyglądać tak: %s</string>
+    <string name="voting_key_input_invalid_private_key_address">Wprowadzono klucz adresu zamiast klucza do głosowania. Klucz do głosowania powinien być w formacie WIF (%s)</string>
+    <string name="voting_key_input_invalid_private_key_private_key_hex">Wprowadzono klucz w formacie hex, ale powinien on być w formacie WIF (%s)</string>
+    <string name="voting_key_input_invalid_private_key_public_key_hex">Wprowadzono klucz w formacie hex, ale powinien on być w formacie WIF (%s)</string>
+    <string name="voting_key_input_invalid_private_key_too_short">Wprowadziłeś za krótki klucz prywatny. Oto przykład jak powinien wyglądać klucz prywatny (%s)</string>
+    <string name="voting_key_input_invalid_private_key_incorrect">Wprowadziłeś klucz prywatny, który zawiera kilka nieprawidłowych znaków. Oto przykład jak powinien wyglądać klucz prywatny (%s)</string>
+    <string name="voting_key_input_invalid_private_key_invalid_char">Wprowadzono klucz prywatny, który zawiera nieprawidłowy znak. Oto przykład (%s)</string>
+
     <string name="voting_key_add">Dodaj swoje klucze do głosowania</string>
     <string name="voting_key_add_subtitle">Poniższy adres(y) IP są powiązane z tym portfelem</string>
     <string name="masternode_ip">Adres IP masternoda</string>
     <string name="multiple_votes_cast">%d głosów będzie oddawanych, jeśli masz wiele kluczy do głosowania zapisanych w portfelu</string>
     <string name="add_masternode_key">Dodaj klucz głosowania Masternoda</string>
+    <string name="dont_ask_again">Nie pytaj mnie ponownie</string>
+    <string name="vote_submitting">Wysyłanie głosu na nazwę %s </string>
+    <string name="vote_submitted">Zagłosowano na nazwę %s</string>
+    <string name="cancel_submitting">Anulowanie głosu na nazwę %s</string>
+    <string name="cancel_submitted">Głos na nazwę %s został anulowany</string>
+    <string name="block_submitting">Blokowanie głosu na nazwę %s</string>
+    <string name="block_submitted">Zablokowałeś nazwę %s</string>
+    <string name="vote_submitted_error">Wystąpił błąd podczas głosowania na nazwę %s</string>
+    <string name="cancel_submitted_error">Wystąpił błąd podczas anulowania głosu na nazwę %s</string>
+    <string name="block_submitted_error">Wystąpił błąd podczas blokowania głosu na nazwę %s</string>
     <string name="quick_vote">Szybkie Głosowanie</string>
     <string name="quick_vote_subtitle">Klikając przycisk „Głosuj na wszystkie”, automatycznie zagłosujesz na wszystkie filtrowane nazwy użytkowników (%d), które zostały przesłane jako pierwsze</string>
     <string name="vote_for_all">Głosuj nad wszyskimi</string>
diff --git a/wallet/res/values-pt/strings-dashpay.xml b/wallet/res/values-pt/strings-dashpay.xml
index bc429af9b6..c9b0abb98d 100644
--- a/wallet/res/values-pt/strings-dashpay.xml
+++ b/wallet/res/values-pt/strings-dashpay.xml
@@ -88,6 +88,7 @@ Dash</b></string>
     <string name="dashpay_topup_fee">Taxa de Recarregamento</string>
     <string name="search_user_find_a_user">Encontre um usuário na rede Dash</string>
     <string name="search_for_a_user">Pesquisar um Usuário na Rede Dash</string>
+    <string name="search_user_input_placeholder">Pesquisar nome de usuário</string>
     <string name="add_new_contact">Adicione um Novo Contato</string>
     <string name="send_contact_request">Enviar Solicitação de Contato</string>
     <string name="sending_contact_request">Enviando Solicitação de Contato</string>
@@ -268,6 +269,8 @@ Dash</b></string>
     <string name="usernames_blocked_title">Algumas contas de usuário podem ser bloqueadas</string>
     <string name="usernames_blocked_subtitle">Se um número suficiente de pessoas na rede determinar que um nome de usuário é inapropriado, elas podem bloqueá-lo</string>
     <string name="username_voting">Votação de Nomes de Usuário</string>
+    <string name="username_voting_subtitle">Como proprietário de um masternode, você pode votar para aprovar nomes de usuário solicitados antes que sejam criados na rede.</string>
+    <string name="username_voting_subtitle_two">Você pode bloquear a criação de nomes de usuário que considerar inapropriados.</string>
     <string name="voting_duplicates_only_title">Configuração de filtro padrão</string>
     <string name="voting_duplicates_only_message">O filtro padrão mostra apenas nomes de usuário duplicados nos quais você NÃO votou, mas você pode ver todos os nomes de usuário contestados alterando o filtro</string>
     <string name="all">Todos</string>
@@ -294,6 +297,17 @@ Dash</b></string>
         <item>Eu não aprovei</item>
         <item>Tem votos bloqueados</item>
     </string-array>
+    <string name="unblock_button">Desbloquear</string>
+    <plurals name="block_vote_button">
+        <item quantity="one">Bloqueio</item>
+        <item quantity="many">Bloqueios</item>
+        <item quantity="other">Bloqueios</item>
+    </plurals>
+    <plurals name="approval_button">
+        <item quantity="one">Aprovação</item>
+        <item quantity="many">Aprovações</item>
+        <item quantity="other">Aprovações</item>
+    </plurals>
     <string name="block_vote_count">%d Bloco(s)</string>
     <string name="request_your_username">Criar seu nome de usuário</string>
     <string name="request_your_hint">Por favor, observe que você não poderá alterar isso no futuro</string>
@@ -313,6 +327,7 @@ Dash</b></string>
     <string name="request_details">Detalhes da solicitação</string>
     <string name="request_details_subtitle">Revise a postagem abaixo para verificar a propriedade deste nome de usuário</string>
     <string name="vote_to_approve">Votar para Aprovar</string>
+    <string name="vote_to_block">Vote para Bloquear</string>
     <string name="identity">Identidade</string>
     <string name="results">Resultados</string>
     <string name="link">Link</string>
@@ -331,11 +346,31 @@ Dash</b></string>
     <string name="voting_key_hint">Chave Privada de votação do Masternode</string>
     <string name="voting_key_input_error">Você inseriu uma chave inválida</string>
     <string name="voting_key_input_not_active_error">Você inseriu uma chave que não está associada a um Masternode ativo</string>
+    <string name="voting_key_input_already_present">Você já inseriu essa chave de masternode</string>
+    <string name="voting_key_input_invalid_private_key_wrong_network_testnet">A chave inserida é para a testnet, mas este ambiente é da mainnet. A chave deve se parecer com esta: %s</string>
+    <string name="voting_key_input_invalid_private_key_wrong_network_mainnet">A chave inserida é para a mainnet, mas este ambiente é da testnet. A chave deve se parecer com esta: %s</string>
+    <string name="voting_key_input_invalid_private_key_address">Você inseriu uma chave de endereço em vez de uma chave privada de votação do masternode. A chave deve estar no formato WIF (%s)</string>
+    <string name="voting_key_input_invalid_private_key_private_key_hex">Você inseriu uma chave no formado hex, mas ela deve estar no formato WIF (%s)</string>
+    <string name="voting_key_input_invalid_private_key_public_key_hex">Você inseriu uma chave no formado hex, mas ela deve estar no formato WIF (%s)</string>
+    <string name="voting_key_input_invalid_private_key_too_short">Você inseriu uma chave privada muito curta. Aqui está um exemplo (%s)</string>
+    <string name="voting_key_input_invalid_private_key_incorrect">Você inseriu uma chave privada com alguns caracteres incorretos. Aqui está um exemplo (%s)</string>
+    <string name="voting_key_input_invalid_private_key_invalid_char">Você inseriu uma chave privada com um caractere inválido. Aqui está um exemplo (%s)</string>
+
     <string name="voting_key_add">Adicione suas chaves de votação</string>
     <string name="voting_key_add_subtitle">Os endereços de IP abaixo estão associados a esta carteira</string>
     <string name="masternode_ip">Endereço IP do Masternode</string>
     <string name="multiple_votes_cast">%d votos serão contabilizados, pois você possui várias chaves de votação armazenadas na carteira </string>
     <string name="add_masternode_key">Adicionar Chave de Votação de Masternode</string>
+    <string name="dont_ask_again">Não me pergunte novamente</string>
+    <string name="vote_submitting">Enviando seu voto para o nome de usuário %s.</string>
+    <string name="vote_submitted">Votado no nome de usuário %s.</string>
+    <string name="cancel_submitting">Cancelando seu voto para o nome de usuário %s.</string>
+    <string name="cancel_submitted">Voto cancelado para o nome de usuário %s.</string>
+    <string name="block_submitting">Bloqueando o nome de usuário %s.</string>
+    <string name="block_submitted">Você bloqueou o nome de usuário %s.</string>
+    <string name="vote_submitted_error">Erro ao votar no nome de usuário %s.</string>
+    <string name="cancel_submitted_error">Erro ao cancelar o voto para o nome de usuário %s.</string>
+    <string name="block_submitted_error">Erro ao bloquear o nome de usuário %s.</string>
     <string name="quick_vote">Votação Rápida</string>
     <string name="quick_vote_subtitle">Ao clicar no botão \"Votar em todos\", você votará automaticamente em todos os nomes de usuário filtrados (%d) que foram enviados primeiro</string>
     <string name="vote_for_all">Votar em todos</string>
diff --git a/wallet/res/values-zh/strings-dashpay.xml b/wallet/res/values-zh/strings-dashpay.xml
index d12a67b7e1..e99ee78fea 100644
--- a/wallet/res/values-zh/strings-dashpay.xml
+++ b/wallet/res/values-zh/strings-dashpay.xml
@@ -88,7 +88,7 @@
     <string name="dashpay_topup_fee">充值费用</string>
     <string name="search_user_find_a_user">在Dash网络上查找用户</string>
     <string name="search_for_a_user">在Dash网络上搜索用户</string>
-    <string name="search_user_input_placeholder">这里输入用户名来搜索</string>
+    <string name="search_user_input_placeholder">搜索用户名</string>
     <string name="add_new_contact">添加新朋友</string>
     <string name="send_contact_request">发送朋友申请</string>
     <string name="sending_contact_request">发送好友申请</string>
@@ -269,6 +269,8 @@
     <string name="usernames_blocked_title">一些用户名会被禁止</string>
     <string name="usernames_blocked_subtitle">如果足够的网络节点认为此用户名不合适, 他们能够屏蔽它</string>
     <string name="username_voting">用户名投票</string>
+    <string name="username_voting_subtitle">作为主节点持有者, 您可以在用户名被在网络上创建之前投票通过这些在申请中的用户名.</string>
+    <string name="username_voting_subtitle_two">若您认为不合适您可以禁止用户名的创建.</string>
     <string name="voting_duplicates_only_title">默认过滤器设置</string>
     <string name="voting_duplicates_only_message">默认过滤器仅显示您未投票的重复用户名, 但您可以通过更改过滤器来查看所有有争议的用户名</string>
     <string name="all">所有</string>
@@ -295,7 +297,13 @@
         <item>我已否决的</item>
         <item>已阻止投票</item>
     </string-array>
-
+    <string name="unblock_button">解禁</string>
+    <plurals name="block_vote_button">
+        <item quantity="other">禁止的</item>
+    </plurals>
+    <plurals name="approval_button">
+        <item quantity="other">通过的</item>
+    </plurals>
     <string name="block_vote_count">%d (多个)区块</string>
     <string name="request_your_username">创建您的用户名</string>
     <string name="request_your_hint">请注意您在之后将无法进行修改</string>
@@ -315,6 +323,7 @@
     <string name="request_details">申请的细节</string>
     <string name="request_details_subtitle">查看下方内容来验证此用户名的所有权</string>
     <string name="vote_to_approve">投票通过</string>
+    <string name="vote_to_block">投票禁止</string>
     <string name="identity">身份</string>
     <string name="results">结果</string>
     <string name="link">链接</string>
@@ -333,11 +342,31 @@
     <string name="voting_key_hint">主节点投票私钥</string>
     <string name="voting_key_input_error">您已输入了无效的密钥</string>
     <string name="voting_key_input_not_active_error">您输入的钥匙未与激活的主节点关联</string>
+    <string name="voting_key_input_already_present">您已经输入了此主节点密钥</string>
+    <string name="voting_key_input_invalid_private_key_wrong_network_testnet">您输入的私钥是用于测试网络的, 但此处是主网. 看起来应是这样的: %s</string>
+    <string name="voting_key_input_invalid_private_key_wrong_network_mainnet">您输入的私钥是用于主网的, 但此处是测试网络. 看起来应是这样的: %s</string>
+    <string name="voting_key_input_invalid_private_key_address">您输入的是地址公钥而不是主节点投票私钥. 它应该是WIF格式 (%s)</string>
+    <string name="voting_key_input_invalid_private_key_private_key_hex">您输入的密钥是hex格式, 它应该是WIF格式 (%s)</string>
+    <string name="voting_key_input_invalid_private_key_public_key_hex">您输入的密钥是hex格式, 它应该是WIF格式 (%s)</string>
+    <string name="voting_key_input_invalid_private_key_too_short">您输入的私钥太短了. 这里是示例 (%s)</string>
+    <string name="voting_key_input_invalid_private_key_incorrect">您输入的私钥包含了一些错误的字符. 这里是示例 (%s)</string>
+    <string name="voting_key_input_invalid_private_key_invalid_char">您输入的私钥包含了一个无效的字符. 这里是示例 (%s)</string>
+
     <string name="voting_key_add">添加您的投票私钥</string>
     <string name="voting_key_add_subtitle">下列的 (多个) IP 地址与这个钱包相关联</string>
     <string name="masternode_ip">主节点 IP 地址</string>
     <string name="multiple_votes_cast">由于您的钱包存储了多个投票私钥, 您可以进行多次 %d 投票</string>
     <string name="add_masternode_key">添加主节点投票私钥</string>
+    <string name="dont_ask_again">不在询问</string>
+    <string name="vote_submitting">正在提交您对 %s 用户名的投票</string>
+    <string name="vote_submitted">已对 %s 用户名投票</string>
+    <string name="cancel_submitting">正在取消您对 %s 用户名的投票</string>
+    <string name="cancel_submitted">已取消对 %s 用户名的投票</string>
+    <string name="block_submitting">正禁止 %s 用户名</string>
+    <string name="block_submitted">您禁止了 %s 用户名</string>
+    <string name="vote_submitted_error">对 %s 用户名投票时出错</string>
+    <string name="cancel_submitted_error">对 %s 用户名取消投票时出错</string>
+    <string name="block_submitted_error">正禁止 %s 用户名时出错</string>
     <string name="quick_vote">快速投票</string>
     <string name="quick_vote_subtitle">通过点击“投给所有”按钮, 您将自动为所有最先提交的过滤用户名 (%d) 投票</string>
     <string name="vote_for_all">投给所有</string>
@@ -414,4 +443,4 @@
     <string name="mix_dash_mix">混币余额</string>
     <string name="mix_dash_title">混币您的 Dash</string>
     <string name="mix_dash_message">为了防止其他人看到您的付款对象, 建议您在创建用户名之前对您的 Dash 进行混币.</string>
-</resources>
+    </resources>

From dab376c35f134647b82636e2b2fbe14ed370bd11 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Mon, 11 Nov 2024 15:56:52 -0800
Subject: [PATCH 29/58] fix: remove ANR which check low storage on Android 8+

---
 .../wallet/ui/main/WalletActivityExt.kt        | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/wallet/src/de/schildbach/wallet/ui/main/WalletActivityExt.kt b/wallet/src/de/schildbach/wallet/ui/main/WalletActivityExt.kt
index 18dd125f74..a619aea541 100644
--- a/wallet/src/de/schildbach/wallet/ui/main/WalletActivityExt.kt
+++ b/wallet/src/de/schildbach/wallet/ui/main/WalletActivityExt.kt
@@ -167,14 +167,18 @@ object WalletActivityExt {
 
     fun MainActivity.checkLowStorageAlert() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val storageManager = applicationContext.getSystemService<StorageManager>()!!
-            val storageUUID = storageManager.getUuidForPath(filesDir)
-            val availableBytes = storageManager.getAllocatableBytes(storageUUID)
-            val toleranceInBytes = 1024L * 1024 * STORAGE_TOLERANCE
+            lifecycleScope.launch {
+                val storageManager = applicationContext.getSystemService<StorageManager>()!!
+                val availableBytes = withContext(Dispatchers.IO) {
+                    val storageUUID = storageManager.getUuidForPath(filesDir)
+                    storageManager.getAllocatableBytes(storageUUID)
+                }
+                val toleranceInBytes = 1024L * 1024 * STORAGE_TOLERANCE
 
-            if (availableBytes <= toleranceInBytes && !lowStorageDialogShown) {
-                lowStorageDialogShown = true
-                showLowStorageAlertDialog()
+                if (availableBytes <= toleranceInBytes && !lowStorageDialogShown) {
+                    lowStorageDialogShown = true
+                    showLowStorageAlertDialog()
+                }
             }
         } else {
             val stickyIntent = registerReceiver(null, IntentFilter(Intent.ACTION_DEVICE_STORAGE_LOW))

From 7698fb3caf626a9cbc8a85b63327cd20ba069277 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Mon, 11 Nov 2024 15:59:49 -0800
Subject: [PATCH 30/58] style: fix some lint issue and remove comments

---
 .../wallet/ui/username/voting/RequestUserNameViewModel.kt     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 38f96aadae..fe7c60bd12 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUserNameViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUserNameViewModel.kt
@@ -106,8 +106,9 @@ class RequestUserNameViewModel @Inject constructor(
     var identityBalance: Long = 0L
 
     private val _walletBalance = MutableStateFlow(Coin.ZERO)
-    val walletBalance: StateFlow<Coin>// = Coin.ZERO
+    val walletBalance: StateFlow<Coin>
         get() = _walletBalance
+
     suspend fun isUserNameRequested(): Boolean {
         val hasRequestedName = identityConfig.get(USERNAME).isNullOrEmpty().not()
         val creationState = BlockchainIdentityData.CreationState.valueOf(
@@ -115,6 +116,7 @@ class RequestUserNameViewModel @Inject constructor(
         )
         return hasRequestedName && creationState != BlockchainIdentityData.CreationState.NONE && creationState.ordinal <= BlockchainIdentityData.CreationState.VOTING.ordinal
     }
+
     suspend fun isUsernameLocked(): Boolean {
         return isUserNameRequested() &&
                 UsernameRequestStatus.valueOf(identityConfig.get(USERNAME_REQUESTED)!!) == UsernameRequestStatus.LOCKED

From 702ed91ba43b354c22388550fd49767b2872d677 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Mon, 11 Nov 2024 16:21:44 -0800
Subject: [PATCH 31/58] style: fix some lint issue and remove comments

---
 .../wallet/ui/dashpay/EditProfileViewModel.kt | 63 +++++++++++--------
 1 file changed, 38 insertions(+), 25 deletions(-)

diff --git a/wallet/src/de/schildbach/wallet/ui/dashpay/EditProfileViewModel.kt b/wallet/src/de/schildbach/wallet/ui/dashpay/EditProfileViewModel.kt
index f657d1217a..8de0fd5f18 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/EditProfileViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/EditProfileViewModel.kt
@@ -74,7 +74,6 @@ class EditProfileViewModel @Inject constructor(
     dashPayProfileDao: DashPayProfileDao,
     val platformRepo: PlatformRepo
 ) : BaseProfileViewModel(blockchainIdentityDataDao, dashPayProfileDao) {
-
     enum class ProfilePictureStorageService {
         GOOGLE_DRIVE, IMGUR
     }
@@ -126,28 +125,39 @@ class EditProfileViewModel @Inject constructor(
 
     private var lastAttemptedProfile: DashPayProfile? = null
 
-    fun broadcastUpdateProfile(displayName: String, publicMessage: String, avatarUrl: String,
-                               uploadService: String = "", localAvatarUrl: String = "") {
-
+    fun broadcastUpdateProfile(
+        displayName: String,
+        publicMessage: String,
+        avatarUrl: String,
+        uploadService: String = "",
+        localAvatarUrl: String = ""
+    ) {
         logProfileInfoEvents(displayName, publicMessage, avatarUrl)
 
         val dashPayProfile = dashPayProfile.value!!
         val avatarFingerprintBytes = avatarFingerprint?.run { ProfilePictureHelper.toByteArray(this) }
-        val updatedProfile = DashPayProfile(dashPayProfile.userId, dashPayProfile.username,
-                displayName, publicMessage, avatarUrl, avatarHash?.bytes, avatarFingerprintBytes,
-                dashPayProfile.createdAt, dashPayProfile.updatedAt)
+        val updatedProfile = DashPayProfile(
+            dashPayProfile.userId,
+            dashPayProfile.username,
+            displayName,
+            publicMessage,
+            avatarUrl,
+            avatarHash?.bytes,
+            avatarFingerprintBytes,
+            dashPayProfile.createdAt,
+            dashPayProfile.updatedAt
+        )
 
         lastAttemptedProfile = updatedProfile
 
-        UpdateProfileOperation(walletApplication).create(updatedProfile, uploadService,
-                localAvatarUrl).enqueue()
+        UpdateProfileOperation(walletApplication).create(updatedProfile, uploadService, localAvatarUrl).enqueue()
     }
 
     fun retryBroadcastProfile() {
         if (lastAttemptedProfile != null) {
             UpdateProfileOperation(walletApplication)
-                    .create(lastAttemptedProfile!!, "", "")
-                    .enqueue()
+                .create(lastAttemptedProfile!!, "", "")
+                .enqueue()
         }
     }
 
@@ -182,8 +192,8 @@ class EditProfileViewModel @Inject constructor(
         val result = MutableLiveData<Resource<Response>>()
         val client = OkHttpClient()
         val request = Request.Builder()
-                .url(pictureUrl)
-                .build()
+            .url(pictureUrl)
+            .build()
         client.newCall(request).enqueue(object : Callback {
             override fun onFailure(call: Call, e: IOException) {
                 result.value = Resource.error(e, null)
@@ -220,8 +230,8 @@ class EditProfileViewModel @Inject constructor(
         return suspendCoroutine { continuation ->
             val client = OkHttpClient()
             val request = Request.Builder()
-                    .url(pictureUrl)
-                    .build()
+                .url(pictureUrl)
+                .build()
             client.newCall(request).enqueue(object : Callback {
                 override fun onFailure(call: Call, e: IOException) {
                     continuation.resumeWithException(e)
@@ -259,14 +269,14 @@ class EditProfileViewModel @Inject constructor(
         viewModelScope.launch(Dispatchers.IO) {
             val imgurUploadUrl = "https://api.imgur.com/3/upload"
             val client = OkHttpClient.Builder()
-                    .connectTimeout(60, TimeUnit.SECONDS)
-                    .writeTimeout(60, TimeUnit.SECONDS)
-                    .readTimeout(30, TimeUnit.SECONDS).build()
+                .connectTimeout(60, TimeUnit.SECONDS)
+                .writeTimeout(60, TimeUnit.SECONDS)
+                .readTimeout(30, TimeUnit.SECONDS).build()
 
             val requestBuilder = Request.Builder().header("Authorization",
-                    "Client-ID ${BuildConfig.IMGUR_CLIENT_ID}")
+                "Client-ID ${BuildConfig.IMGUR_CLIENT_ID}")
 
-            //Delete previous profile Picture
+            // Delete previous profile Picture
             val imgurDeleteHash = config.imgurDeleteHash
             if (imgurDeleteHash.isNotEmpty()) {
                 val imgurDeleteUrl = "https://api.imgur.com/3/image/$imgurDeleteHash"
@@ -309,7 +319,7 @@ class EditProfileViewModel @Inject constructor(
 
             val imageBodyPart = RequestBody.create("image/*jpg".toMediaTypeOrNull(), avatarBytes)
             val requestBody = MultipartBody.Builder().setType(MultipartBody.FORM)
-                    .addFormDataPart("image", "profile.jpg", imageBodyPart).build()
+                .addFormDataPart("image", "profile.jpg", imageBodyPart).build()
 
             val uploadRequest = requestBuilder.url(imgurUploadUrl).post(requestBody).build()
 
@@ -335,6 +345,7 @@ class EditProfileViewModel @Inject constructor(
                     }
                 } else {
                     log.error("imgur: upload failed (${response.code}): ${response.message}")
+                    // should we tri again after 1-5 seconds
                     analytics.logError(Exception(response.message), "Failed to upload profile picture: ImgUr")
                     profilePictureUploadLiveData.postValue(Resource.error(response.message))
                 }
@@ -355,14 +366,16 @@ class EditProfileViewModel @Inject constructor(
 
     @SuppressLint("HardwareIds")
     fun uploadToGoogleDrive(drive: Drive) {
-
         viewModelScope.launch(Dispatchers.IO) {
             profilePictureUploadLiveData.postValue(Resource.loading(""))
             try {
                 val secureId = Settings.Secure.getString(walletApplication.contentResolver, Settings.Secure.ANDROID_ID)
-                val fileId = GoogleDriveService.uploadImage(drive,
-                        UUID.randomUUID().toString() + ".jpg",
-                        profilePictureFile!!.readBytes(), secureId)
+                val fileId = GoogleDriveService.uploadImage(
+                    drive,
+                    UUID.randomUUID().toString() + ".jpg",
+                    profilePictureFile!!.readBytes(),
+                    secureId
+                )
 
                 log.info("gdrive upload image: complete")
                 profilePictureUploadLiveData.postValue(Resource.success("https://drive.google.com/uc?export=view&id=${fileId}"))

From f0994a125bcaec3e565fb4ba7224419d858951bf Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Mon, 11 Nov 2024 18:07:41 -0800
Subject: [PATCH 32/58] chore: remove commented code

---
 .../layout/username_request_group_view.xml    | 11 -----
 wallet/res/layout/username_request_view.xml   | 30 ------------
 .../ui/username/UsernameRequestsFragment.kt   | 29 +-----------
 .../adapters/UsernameRequestGroupAdapter.kt   | 47 -------------------
 4 files changed, 1 insertion(+), 116 deletions(-)

diff --git a/wallet/res/layout/username_request_group_view.xml b/wallet/res/layout/username_request_group_view.xml
index 0050fe4ed2..30b96fa195 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"
diff --git a/wallet/res/layout/username_request_view.xml b/wallet/res/layout/username_request_view.xml
index f107f02037..618a0ad855 100644
--- a/wallet/res/layout/username_request_view.xml
+++ b/wallet/res/layout/username_request_view.xml
@@ -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/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
index e83c173fd8..ba9b125d58 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
@@ -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)
-//                            }
-//                        }
                     }
                 }
             },
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..5f195dd7e2 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupAdapter.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupAdapter.kt
@@ -124,8 +124,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 {
@@ -180,14 +178,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)
         }
     }
@@ -301,31 +291,8 @@ class UsernameRequestViewHolder(
             }
         }
 
-//        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 +305,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)
-//        }
-//    }
-//}

From 20d9a776493c4f71b5025f37b80fc4fe79ee1766 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Mon, 11 Nov 2024 18:10:43 -0800
Subject: [PATCH 33/58] fix: simplify Username Request vote button styles

---
 common/src/main/res/values/styles.xml         | 82 -----------------
 .../res/layout/fragment_username_requests.xml |  4 +-
 .../layout/username_request_group_view.xml    |  4 +-
 wallet/res/layout/username_request_view.xml   |  2 +-
 .../adapters/UsernameRequestGroupAdapter.kt   | 90 ++++---------------
 5 files changed, 23 insertions(+), 159 deletions(-)

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/layout/fragment_username_requests.xml b/wallet/res/layout/fragment_username_requests.xml
index fb719f9da7..cca7b299f4 100644
--- a/wallet/res/layout/fragment_username_requests.xml
+++ b/wallet/res/layout/fragment_username_requests.xml
@@ -198,11 +198,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 30b96fa195..7d21e9eab8 100644
--- a/wallet/res/layout/username_request_group_view.xml
+++ b/wallet/res/layout/username_request_group_view.xml
@@ -81,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"
@@ -94,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 618a0ad855..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"
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 5f195dd7e2..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
@@ -137,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)
             }
         }
 
@@ -253,41 +218,22 @@ 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)
             }
         }
 

From be31a0b324b4637342f07fcaf80d4100964566b8 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Mon, 11 Nov 2024 18:13:22 -0800
Subject: [PATCH 34/58] fix: delete vote fix

---
 .../wallet/service/platform/PlatformSyncService.kt           | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt b/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt
index f2b3741d18..68e5e6a5dc 100644
--- a/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt
+++ b/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt
@@ -1142,10 +1142,11 @@ class PlatformSynchronizationService @Inject constructor(
             currentRequestList.forEach { request ->
                 val voteContender = platformRepo.getVoteContenders(request.normalizedLabel)
                 if (voteContender.winner.isPresent) {
+                    // remove request
                     usernameRequestDao.remove(request.requestId)
+                    // remove related votes
+                    usernameVoteDao.remove(request.normalizedLabel)
                 }
-                // remove related votes
-                usernameVoteDao.remove(request.normalizedLabel)
             }
             // check votes and remove those from previous vote polls
             usernameVoteDao.getAllVotes().forEach { vote ->

From dacb85d5cb3b31f7a4e16285d9173bbb668f5c81 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Tue, 12 Nov 2024 09:50:41 -0800
Subject: [PATCH 35/58] fix: handle visibility of buttons after calling
 checkUsername

---
 .../wallet/ui/username/voting/RequestUsernameFragment.kt       | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUsernameFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUsernameFragment.kt
index 82dffa0ef3..4c4ea19124 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUsernameFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUsernameFragment.kt
@@ -49,9 +49,6 @@ class RequestUsernameFragment : Fragment(R.layout.fragment_request_username) {
 
         binding.usernameInput.doOnTextChanged { text, _, _, _ ->
             val username = text.toString()
-            binding.requestUsernameButton.isEnabled = username.isNotEmpty() &&
-                requestUserNameViewModel.canAffordNonContestedUsername()
-
             binding.inputWrapper.isEndIconVisible = username.isNotEmpty()
 
             if (username.isNotEmpty()) {

From 06d1e28fd7256fa19b97912c33496b06d15841b6 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Tue, 12 Nov 2024 09:53:50 -0800
Subject: [PATCH 36/58] fix: add (x) button to InputWrapper

---
 .../java/org/dash/wallet/common/ui/text/InputWrapper.kt     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/src/main/java/org/dash/wallet/common/ui/text/InputWrapper.kt b/common/src/main/java/org/dash/wallet/common/ui/text/InputWrapper.kt
index 4e1c1911ce..7dc5914143 100644
--- a/common/src/main/java/org/dash/wallet/common/ui/text/InputWrapper.kt
+++ b/common/src/main/java/org/dash/wallet/common/ui/text/InputWrapper.kt
@@ -44,6 +44,12 @@ class InputWrapper(context: Context, attrs: AttributeSet): TextInputLayout(conte
         setCounterOverflowTextAppearance(R.style.Overline_Red)
         initStyle(attrs, R.styleable.TextInputLayout)
         setPadding()
+
+        endIconMode = END_ICON_CUSTOM
+        endIconDrawable = ResourcesCompat.getDrawable(resources, R.drawable.ic_clear_input, null)
+        setEndIconOnClickListener {
+            editText?.setText("")  // Clear text in EditText
+        }
     }
 
     @SuppressLint("PrivateResource")

From 41d2ae2b7ffc9f72354315796e1f053f49515c5f Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Tue, 12 Nov 2024 09:54:13 -0800
Subject: [PATCH 37/58] fix: update About screen and include build number

---
 wallet/res/layout/activity_about.xml          | 509 +++++++++---------
 wallet/res/values/strings-extra.xml           |   3 +-
 .../wallet/ui/more/AboutActivity.kt           |   7 +-
 3 files changed, 264 insertions(+), 255 deletions(-)

diff --git a/wallet/res/layout/activity_about.xml b/wallet/res/layout/activity_about.xml
index 462dcffb14..e41ae0e4dc 100644
--- a/wallet/res/layout/activity_about.xml
+++ b/wallet/res/layout/activity_about.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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="match_parent"
-    android:orientation="vertical"
     android:background="@color/background_primary"
+    android:orientation="vertical"
     tools:context="de.schildbach.wallet.ui.more.AboutActivity">
 
     <androidx.appcompat.widget.Toolbar
@@ -20,275 +19,287 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="40dp"
-        android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/title"
-        style="@style/Headline3"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="20dp"
-        tools:text="About Dash" />
-
-    <TextView
-        android:id="@+id/app_version_name"
-        style="@style/Body2"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="20dp"
-        android:layout_marginTop="3dp"
-        tools:text="Dash Wallet v7.0.0-redesign" />
-
-    <TextView
-        android:id="@+id/library_version_name"
-        style="@style/Body2.Tertiary"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="20dp"
-        tools:text="DashJ 17.0.0" />
-
-    <LinearLayout
-        android:id="@+id/about_content"
-        style="@style/ViewRaised"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="15dp"
-        android:layout_marginHorizontal="15dp"
-        android:paddingVertical="15dp"
-        android:background="@drawable/rounded_background"
-        android:theme="@style/SecondaryBackground">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <TextView
-                android:id="@+id/last_sync_label"
-                style="@style/Overline.Tertiary"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="15dp"
-                android:text="@string/about_last_explore_device_sync"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/force_sync_btn" />
-
-            <TextView
-                android:id="@+id/explore_dash_last_device_sync"
-                style="@style/Caption"
-                android:layout_marginHorizontal="15dp"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                tools:text="Apr 27, 5:31 pm"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/force_sync_btn"
-                app:layout_constraintTop_toBottomOf="@id/last_sync_label" />
-
-            <ImageButton
-                android:id="@+id/force_sync_btn"
-                android:layout_width="34dp"
-                android:layout_height="34dp"
-                style="@style/Button.Tertiary.Square"
-                android:layout_marginEnd="10dp"
-                android:src="@drawable/ic_refresh_white_24dp"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:tint="@color/content_tertiary" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginStart="15dp"
-            android:background="@color/divider_color" />
-
-        <TextView
-            style="@style/Overline.Tertiary"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:layout_marginStart="15dp"
-            android:text="@string/about_last_explore_server_update" />
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="15dp">
-
-            <TextView
-                android:id="@+id/explore_dash_last_server_update"
-                style="@style/Caption"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:visibility="invisible"
-                tools:text="Mar 17, 5:31 pm"
-                tools:visibility="visible" />
-
-            <com.google.android.material.progressindicator.LinearProgressIndicator
-                android:id="@+id/last_explore_update_loading_indicator"
-                style="@style/ContentLoadingIndicator"
-                android:layout_width="150dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom"
-                tools:visibility="gone" />
-        </FrameLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginStart="15dp"
-            android:background="@color/divider_color" />
 
         <LinearLayout
-            android:id="@+id/firebase_installation_id_item"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:paddingHorizontal="15dp"
-            android:paddingVertical="10dp"
-            android:clickable="true"
-            android:focusable="true"
-            android:background="?attr/selectableItemBackground">
+            android:paddingBottom="40dp">
 
             <TextView
-                style="@style/Overline.Tertiary"
-                android:layout_width="wrap_content"
+                android:id="@+id/title"
+                style="@style/Headline3"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/about_firebase_installation_id" />
+                android:layout_marginStart="20dp"
+                tools:text="About Dash" />
 
-            <TextView
-                android:id="@+id/firebase_installation_id"
-                style="@style/Caption"
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                tools:text="fxUBdkvxQhO-ICxXXXN5mAI" />
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginStart="15dp"
-            android:background="@color/divider_color" />
-
-        <LinearLayout
-            android:id="@+id/fcm_token_item"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingVertical="10dp"
-            android:paddingHorizontal="15dp"
-            android:clickable="true"
-            android:focusable="true"
-            android:background="?attr/selectableItemBackground">
-
+                android:orientation="horizontal"
+                android:layout_marginHorizontal="20dp"
+                android:layout_marginTop="3dp" >
+                <TextView
+                    android:id="@+id/app_version_name"
+                    style="@style/Body2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    tools:text="DashPay v11.0.x" />
+                <TextView
+                    android:id="@+id/build_number"
+                    style="@style/Body2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="5dp"
+                    tools:text="(10)" />
+            </LinearLayout>
             <TextView
-                style="@style/Overline.Tertiary"
-                android:layout_width="wrap_content"
+                android:id="@+id/library_version_name"
+                style="@style/Body2.Tertiary"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/about_fcm_token" />
+                android:layout_marginHorizontal="20dp"
+                tools:text="DashJ 21.1.0" />
 
-            <TextView
-                android:id="@+id/fcm_token"
-                style="@style/Caption"
-                android:maxLines="2"
-                android:ellipsize="end"
-                android:singleLine="false"
+            <LinearLayout
+                android:id="@+id/about_content"
+                style="@style/ViewRaised"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                tools:text="fxUBdkvxQhO-ICxXXXN5mAI:A...N-rJDGQRFKX3yuQUF2PB" />
-        </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginStart="15dp"
-            android:background="@color/divider_color" />
-
-        <TextView
-            style="@style/Overline.Tertiary"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:layout_marginHorizontal="15dp"
-            android:text="@string/about_fork_disclaimer" />
-
-        <TextView
-            android:id="@+id/github_link"
-            style="@style/Caption.Blue"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="15dp"
-            android:text="@string/about_github_link" />
-    </LinearLayout>
-
-
-    <androidx.cardview.widget.CardView
-        android:id="@+id/feedback_card"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        style="@style/CardViewRaised"
-        android:layout_marginTop="15dp"
-        android:layout_marginHorizontal="15dp">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
+                android:layout_marginHorizontal="15dp"
+                android:layout_marginTop="15dp"
+                android:background="@drawable/rounded_background"
+                android:orientation="vertical"
+                android:paddingVertical="15dp"
+                android:theme="@style/SecondaryBackground">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:id="@+id/last_sync_label"
+                        style="@style/Overline.Tertiary"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginHorizontal="15dp"
+                        android:text="@string/about_last_explore_device_sync"
+                        app:layout_constraintEnd_toStartOf="@id/force_sync_btn"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <TextView
+                        android:id="@+id/explore_dash_last_device_sync"
+                        style="@style/Caption"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginHorizontal="15dp"
+                        app:layout_constraintEnd_toStartOf="@id/force_sync_btn"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/last_sync_label"
+                        tools:text="Apr 27, 5:31 pm" />
+
+                    <ImageButton
+                        android:id="@+id/force_sync_btn"
+                        style="@style/Button.Tertiary.Square"
+                        android:layout_width="34dp"
+                        android:layout_height="34dp"
+                        android:layout_marginEnd="10dp"
+                        android:src="@drawable/ic_refresh_white_24dp"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:tint="@color/content_tertiary" />
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginStart="15dp"
+                    android:layout_marginTop="10dp"
+                    android:background="@color/divider_color" />
+
+                <TextView
+                    style="@style/Overline.Tertiary"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="15dp"
+                    android:layout_marginTop="10dp"
+                    android:text="@string/about_last_explore_server_update" />
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="15dp">
+
+                    <TextView
+                        android:id="@+id/explore_dash_last_server_update"
+                        style="@style/Caption"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:visibility="invisible"
+                        tools:text="Mar 17, 5:31 pm"
+                        tools:visibility="visible" />
+
+                    <com.google.android.material.progressindicator.LinearProgressIndicator
+                        android:id="@+id/last_explore_update_loading_indicator"
+                        style="@style/ContentLoadingIndicator"
+                        android:layout_width="150dp"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="bottom"
+                        tools:visibility="gone" />
+                </FrameLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginStart="15dp"
+                    android:layout_marginTop="10dp"
+                    android:background="@color/divider_color" />
+
+                <LinearLayout
+                    android:id="@+id/firebase_installation_id_item"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="?attr/selectableItemBackground"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:orientation="vertical"
+                    android:paddingHorizontal="15dp"
+                    android:paddingVertical="10dp">
+
+                    <TextView
+                        style="@style/Overline.Tertiary"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/about_firebase_installation_id" />
+
+                    <TextView
+                        android:id="@+id/firebase_installation_id"
+                        style="@style/Caption"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        tools:text="fxUBdkvxQhO-ICxXXXN5mAI" />
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginStart="15dp"
+                    android:background="@color/divider_color" />
+
+                <LinearLayout
+                    android:id="@+id/fcm_token_item"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="?attr/selectableItemBackground"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:orientation="vertical"
+                    android:paddingHorizontal="15dp"
+                    android:paddingVertical="10dp">
+
+                    <TextView
+                        style="@style/Overline.Tertiary"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/about_fcm_token" />
+
+                    <TextView
+                        android:id="@+id/fcm_token"
+                        style="@style/Caption"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="end"
+                        android:maxLines="2"
+                        android:singleLine="false"
+                        tools:text="fxUBdkvxQhO-ICxXXXN5mAI:A...N-rJDGQRFKX3yuQUF2PB" />
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginStart="15dp"
+                    android:background="@color/divider_color" />
+
+                <TextView
+                    style="@style/Overline.Tertiary"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="15dp"
+                    android:layout_marginTop="10dp"
+                    android:text="@string/about_fork_disclaimer" />
+
+                <TextView
+                    android:id="@+id/github_link"
+                    style="@style/Caption.Blue"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="15dp"
+                    android:text="@string/about_github_link" />
+            </LinearLayout>
+
+
+            <androidx.cardview.widget.CardView
+                android:id="@+id/feedback_card"
+                style="@style/CardViewRaised"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="15dp"
+                android:layout_marginTop="15dp">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/review_and_rate"
+                        style="@style/Body2.Medium"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="?attr/selectableItemBackground"
+                        android:drawableStart="@drawable/ic_rate"
+                        android:drawablePadding="21dp"
+                        android:paddingHorizontal="20dp"
+                        android:paddingTop="20dp"
+                        android:paddingBottom="14dp"
+                        android:text="@string/about_review_and_rate" />
+
+                    <TextView
+                        android:id="@+id/contact_support"
+                        style="@style/Body2.Medium"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="?attr/selectableItemBackground"
+                        android:drawableStart="@drawable/ic_contact_support"
+                        android:drawablePadding="21dp"
+                        android:paddingHorizontal="20dp"
+                        android:paddingTop="14dp"
+                        android:paddingBottom="20dp"
+                        android:text="@string/about_contact_support" />
+                </LinearLayout>
+            </androidx.cardview.widget.CardView>
 
             <TextView
-                android:id="@+id/review_and_rate"
-                style="@style/Body2.Medium"
-                android:background="?attr/selectableItemBackground"
+                android:id="@+id/copyright"
+                style="@style/Overline.Tertiary"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingHorizontal="20dp"
-                android:paddingTop="20dp"
-                android:paddingBottom="14dp"
-                android:text="@string/about_review_and_rate"
-                android:drawableStart="@drawable/ic_rate"
-                android:drawablePadding="21dp" />
+                android:layout_marginTop="15dp"
+                android:gravity="center"
+                android:text="@string/about_copyright"
+                android:textAlignment="gravity" />
 
             <TextView
-                android:id="@+id/contact_support"
-                style="@style/Body2.Medium"
-                android:background="?attr/selectableItemBackground"
+                android:id="@+id/license"
+                style="@style/Overline.Tertiary"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingHorizontal="20dp"
-                android:paddingTop="14dp"
-                android:paddingBottom="20dp"
-                android:text="@string/about_contact_support"
-                android:drawableStart="@drawable/ic_contact_support"
-                android:drawablePadding="21dp" />
+                android:gravity="center"
+                android:text="@string/about_license"
+                android:textAlignment="gravity" />
         </LinearLayout>
-    </androidx.cardview.widget.CardView>
-
-    <TextView
-        android:id="@+id/copyright"
-        style="@style/Overline.Tertiary"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:textAlignment="gravity"
-        android:layout_marginTop="15dp"
-        android:text="@string/about_copyright" />
-
-    <TextView
-        android:id="@+id/license"
-        style="@style/Overline.Tertiary"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/about_license"
-        android:gravity="center"
-        android:textAlignment="gravity" />
-    </LinearLayout>
     </ScrollView>
 </LinearLayout>
\ No newline at end of file
diff --git a/wallet/res/values/strings-extra.xml b/wallet/res/values/strings-extra.xml
index 9d41adf50d..113f81ef93 100644
--- a/wallet/res/values/strings-extra.xml
+++ b/wallet/res/values/strings-extra.xml
@@ -297,7 +297,8 @@
     <string name="about_copyright">Copyright © 2023 Dash Core Group</string>
     <string name="about_license">GNU General Public License v3.0</string>
     <string name="about_github_link" translatable="false">https://github.com/dashevo/dash-wallet</string>
-    <string name="about_version_name">Dash Wallet %s</string>
+    <string name="about_version_name">DashPay Wallet %s</string>
+    <string name="about_build_number" translatable="false">(%d)</string>
     <string name="about_last_explore_device_sync">Last Explore device sync</string>
     <string name="about_last_explore_server_update">Last Explore server update</string>
     <string name="about_firebase_installation_id">Firebase installation ID</string>
diff --git a/wallet/src/de/schildbach/wallet/ui/more/AboutActivity.kt b/wallet/src/de/schildbach/wallet/ui/more/AboutActivity.kt
index e407c3cdab..1402c35ff9 100644
--- a/wallet/src/de/schildbach/wallet/ui/more/AboutActivity.kt
+++ b/wallet/src/de/schildbach/wallet/ui/more/AboutActivity.kt
@@ -71,13 +71,10 @@ class AboutActivity : LockScreenActivity(), SensorEventListener {
         binding = ActivityAboutBinding.inflate(layoutInflater)
         binding.appBar.setNavigationOnClickListener { finish() }
 
-        val appName = if (Constants.SUPPORTS_PLATFORM) {
-            getString(R.string.app_name_dashpay_short)
-        } else {
-            getString(R.string.app_name_short)
-        }
+        val appName = getString(R.string.app_name_short)
         binding.title.text = "${getString(R.string.about_title)} $appName"
         binding.appVersionName.text = getString(R.string.about_version_name, BuildConfig.VERSION_NAME)
+        binding.buildNumber.text = getString(R.string.about_build_number, BuildConfig.VERSION_CODE % 100)
         binding.libraryVersionName.text = getString(
             R.string.about_credits_bitcoinj_title,
             VersionMessage.BITCOINJ_VERSION

From 46ca1a0051021ac1000b432d69e7b66b859ba734 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Tue, 12 Nov 2024 14:09:59 -0800
Subject: [PATCH 38/58] feat: add OneVoteLeftDialog

---
 wallet/res/layout/dialog_one_vote_left.xml    | 102 ++++++++++++++++++
 .../voting/OneVoteLeftDialogFragment.kt       |  69 ++++++++++++
 2 files changed, 171 insertions(+)
 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/wallet/res/layout/dialog_one_vote_left.xml b/wallet/res/layout/dialog_one_vote_left.xml
new file mode 100644
index 0000000000..481791ff20
--- /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="2dp"
+        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/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..1344300670
--- /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)
+        }
+
+        binding.showUsernames.setOnClickListener {
+            binding.showUsernames.isVisible = false
+            binding.usernameList.isVisible = true
+        }
+    }
+}

From a7faea4dcb6156d36dd38f67005d9f4f44606ff7 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Tue, 12 Nov 2024 14:10:36 -0800
Subject: [PATCH 39/58] feat: add blue lightning bolt next to Quick Voting

---
 wallet/res/drawable/ic_blue_bolt.xml          |  9 +++++++
 .../res/layout/fragment_username_requests.xml | 27 ++++++++++++++-----
 2 files changed, 29 insertions(+), 7 deletions(-)
 create mode 100644 wallet/res/drawable/ic_blue_bolt.xml

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/fragment_username_requests.xml b/wallet/res/layout/fragment_username_requests.xml
index cca7b299f4..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>

From 430c0b9a3890760bd77a99781b94d2f2c58b0c1a Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Tue, 12 Nov 2024 14:15:56 -0800
Subject: [PATCH 40/58] feat: add countVotes

---
 .../src/de/schildbach/wallet/database/dao/UsernameVoteDao.kt   | 3 +++
 1 file changed, 3 insertions(+)

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>
 

From ba15a376a72dd1669cec4f3bf3479769522a67fd Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Tue, 12 Nov 2024 14:16:30 -0800
Subject: [PATCH 41/58] fix: spacing and text on OneVoteLeftDialogFragment

---
 wallet/res/layout/dialog_one_vote_left.xml                      | 2 +-
 .../wallet/ui/username/voting/OneVoteLeftDialogFragment.kt      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wallet/res/layout/dialog_one_vote_left.xml b/wallet/res/layout/dialog_one_vote_left.xml
index 481791ff20..110c1572bb 100644
--- a/wallet/res/layout/dialog_one_vote_left.xml
+++ b/wallet/res/layout/dialog_one_vote_left.xml
@@ -65,7 +65,7 @@
         style="@style/Body2"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="2dp"
+        android:layout_marginTop="6dp"
         android:textAlignment="gravity"
         android:layout_marginHorizontal="20dp"
         android:visibility="invisible"
diff --git a/wallet/src/de/schildbach/wallet/ui/username/voting/OneVoteLeftDialogFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/voting/OneVoteLeftDialogFragment.kt
index 1344300670..909535e59d 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/voting/OneVoteLeftDialogFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/voting/OneVoteLeftDialogFragment.kt
@@ -58,7 +58,7 @@ class OneVoteLeftDialogFragment: OffsetDialogFragment(R.layout.dialog_one_vote_l
                 binding.usernameList.isVisible = true
                 binding.usernameList.text = usernameList.first()
             }
-            binding.subtitle.text = getString(R.string.one_vote_left_subtitle, UsernameVote.MAX_VOTES)
+            binding.subtitle.text = getString(R.string.one_vote_left_subtitle, UsernameVote.MAX_VOTES - 1)
         }
 
         binding.showUsernames.setOnClickListener {

From 5249c6e1990c3541ab8867f642c69455112996fd Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Tue, 12 Nov 2024 14:16:47 -0800
Subject: [PATCH 42/58] feat: add new text for Quick Voting

---
 wallet/res/values/strings-dashpay.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/wallet/res/values/strings-dashpay.xml b/wallet/res/values/strings-dashpay.xml
index bdce7d94cd..bb130d54ea 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>

From bffd933beb1c1065684ce4020c16fe3d9204d436 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Tue, 12 Nov 2024 14:17:21 -0800
Subject: [PATCH 43/58] feat: add isQuickVoting for BroadcastUsernameVotes*
 classes

---
 .../work/BroadcastUsernameVotesWorker.kt      | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

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 9f6eed9025..c1aaaea6fa 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesWorker.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesWorker.kt
@@ -62,6 +62,7 @@ class BroadcastUsernameVotesWorker @AssistedInject constructor(
         const val KEY_USERNAMES = "BroadcastUsernameVotesWorker.USERNAMES"
         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 {
@@ -73,6 +74,7 @@ class BroadcastUsernameVotesWorker @AssistedInject constructor(
             ?: 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
@@ -177,14 +179,17 @@ class BroadcastUsernameVotesWorker @AssistedInject constructor(
                             },
                             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)
@@ -199,7 +204,8 @@ class BroadcastUsernameVotesWorker @AssistedInject constructor(
                             },
                             KEY_VOTE_CHOICES to votingResults.map {
                                 it.first.toString()
-                            }.toTypedArray()
+                            }.toTypedArray(),
+                            KEY_QUICK_VOTING to isQuickVoting
                         )
                     )
                 }
@@ -214,7 +220,8 @@ class BroadcastUsernameVotesWorker @AssistedInject constructor(
                     Result.success(
                         workDataOf(
                             KEY_USERNAMES to usernames,
-                            KEY_VOTE_CHOICES to voteChoices
+                            KEY_VOTE_CHOICES to voteChoices,
+                            KEY_QUICK_VOTING to isQuickVoting
                         )
                     )
                 }
@@ -226,11 +233,12 @@ class BroadcastUsernameVotesWorker @AssistedInject constructor(
                 workDataOf(
                     KEY_ERROR_MESSAGE to formatExceptionMessage("broadcast username vote", ex),
                     KEY_USERNAMES to usernames,
-                    KEY_VOTE_CHOICES to voteChoices
+                    KEY_VOTE_CHOICES to voteChoices,
+                    KEY_QUICK_VOTING to isQuickVoting
                 )
             )
         } finally {
-            log.info("finshed BroadcastUsernameVotesWorker({}, {})", usernames, voteChoices)
+            log.info("finished BroadcastUsernameVotesWorker({}, {})", usernames, voteChoices)
         }
     }
 

From 2b453144fea5bd337fed9eb066fb192a6291535b Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Tue, 12 Nov 2024 14:17:28 -0800
Subject: [PATCH 44/58] feat: add isQuickVoting for BroadcastUsernameVotes*
 classes

---
 .../ui/dashpay/work/BroadcastUsernameVotesOperation.kt      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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..f46684d3ca 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesOperation.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesOperation.kt
@@ -104,7 +104,8 @@ class BroadcastUsernameVotesOperation(val application: Application) {
     fun create(
         usernames: List<String>,
         voteChoices: List<ResourceVoteChoice>,
-        masternodeKeys: List<ByteArray>
+        masternodeKeys: List<ByteArray>,
+        isQuickVoting: Boolean
     ): WorkContinuation {
         val password = SecurityGuard().retrievePassword()
         val verifyIdentityWorker = OneTimeWorkRequestBuilder<BroadcastUsernameVotesWorker>()
@@ -115,7 +116,8 @@ class BroadcastUsernameVotesOperation(val application: Application) {
                     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")

From 7cb739718b187ce674ca03e6b3d3a068ab8211cd Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Tue, 12 Nov 2024 14:17:50 -0800
Subject: [PATCH 45/58] feat: isApproved is based on the last vote

---
 .../service/platform/PlatformSyncService.kt   | 68 ++-----------------
 1 file changed, 6 insertions(+), 62 deletions(-)

diff --git a/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt b/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt
index 68e5e6a5dc..34087fb9de 100644
--- a/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt
+++ b/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt
@@ -1085,6 +1085,7 @@ class PlatformSynchronizationService @Inject constructor(
 
                     name?.let { normalizedLabel ->
                         val voteContender = platformRepo.getVoteContenders(normalizedLabel)
+                        val votes = usernameVoteDao.getVotes(name)
 
                         voteContender.map.forEach { (identifier, contender) ->
 
@@ -1099,8 +1100,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,
@@ -1110,7 +1110,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)
@@ -1161,63 +1161,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.seralizedDocument?.let { serialized ->
-                            DomainDocument(
-                                platform.platform.names.deserialize(serialized)
-                            )
-                        }
-                        val hasWinner = voteContender.winner.isPresent
-
-                        if (!hasWinner) {
-                            if (contestedDocument != null) {
-                                val identityVerifyDocument = IdentityVerify(platform.platform).get(identifier, name)
-
-                                val requestId = UsernameRequest.getRequestId(identifier.toString(), name)
-                                val previousUsernameRequest = usernameRequestDao.getRequest(requestId)
-
-                                val usernameRequest = UsernameRequest(
-                                    requestId = requestId,
-                                    username = contestedDocument.label,
-                                    normalizedLabel = name,
-                                    createdAt = contestedDocument.createdAt ?: -1L,
-                                    identity = identifier.toString(),
-                                    link = identityVerifyDocument?.url,
-                                    votes = contender.votes,
-                                    lockVotes = voteContender.lockVoteTally,
-                                    isApproved = previousUsernameRequest?.isApproved ?: false
-                                )
-                                usernameRequestDao.insert(usernameRequest)
-                            }
-                        } else {
-                            // voting is complete
-                            usernameRequestDao.remove(
-                                UsernameRequest.getRequestId(identifier.toString(), name)
-                            )
-                            // remove related votes
-                            usernameVoteDao.remove(name)
-                        }
-                    }
-                } catch(e: Exception) {
-                    log.warn("problem getting vote contenders for $name", e)
-                }
-            }
-        } catch (e: Exception) {
-            log.info("problem obtaining votes:", e)
-        }
-    }
-
     /**
      * update databases for a single username (normalized)
      */
@@ -1238,7 +1181,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,
@@ -1249,7 +1193,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)
                     }

From de02ad7716bd43dc1471a1b833b99e9a06ffbc6b Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Tue, 12 Nov 2024 14:19:37 -0800
Subject: [PATCH 46/58] fix: update voteForAll functiom

---
 .../ui/username/UsernameRequestsViewModel.kt  | 67 ++++++++++++-------
 1 file changed, 41 insertions(+), 26 deletions(-)

diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
index 17e7572c75..3582e27e11 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
@@ -49,6 +49,7 @@ 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
@@ -261,7 +262,8 @@ class UsernameRequestsViewModel @Inject constructor(
                 BroadcastUsernameVotesOperation(walletApplication).create(
                     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)
@@ -295,7 +297,8 @@ class UsernameRequestsViewModel @Inject constructor(
                 BroadcastUsernameVotesOperation(walletApplication).create(
                     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(
@@ -322,35 +325,47 @@ 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)
+                }
+
+                // 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 voteChoices = arrayListOf<ResourceVoteChoice>()
-            requestIds.forEach {
-                usernameRequestDao.getRequest(it)?.let { request ->
+                val usernames = 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.normalizedLabel)
                     voteChoices.add(ResourceVoteChoice.towardsIdentity(Identifier.from(request.identity)))
                 }
-            }
 
-            BroadcastUsernameVotesOperation(walletApplication).create(
-                usernames,
-                voteChoices,
-                masternodes.value.map { it.votingPrivateKey }
-            ).enqueue()
+                BroadcastUsernameVotesOperation(walletApplication).create(
+                    usernames,
+                    voteChoices,
+                    masternodes.value.map { it.votingPrivateKey },
+                    isQuickVoting = true
+                ).enqueue()
+            }
+            _uiState.update { it.copy(voteSubmitted = true) }
         }
     }
 

From da0dde57b612169893fff72e9b312505de1612e7 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Tue, 12 Nov 2024 14:19:59 -0800
Subject: [PATCH 47/58] fix: update voteForAll function

---
 .../ui/username/UsernameRequestsViewModel.kt  | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
index 3582e27e11..a00af2d208 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
@@ -570,18 +570,10 @@ class UsernameRequestsViewModel @Inject constructor(
             BroadcastUsernameVotesOperation(walletApplication).create(
                 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),
@@ -695,4 +687,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
+        }
+    }
 }

From 348c0ca07388b2960776581347985b4f9c3b22da Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Wed, 13 Nov 2024 06:47:18 -0800
Subject: [PATCH 48/58] fix: remove default endIcon in InputWrapper

---
 .../java/org/dash/wallet/common/ui/text/InputWrapper.kt     | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/common/src/main/java/org/dash/wallet/common/ui/text/InputWrapper.kt b/common/src/main/java/org/dash/wallet/common/ui/text/InputWrapper.kt
index 7dc5914143..4e1c1911ce 100644
--- a/common/src/main/java/org/dash/wallet/common/ui/text/InputWrapper.kt
+++ b/common/src/main/java/org/dash/wallet/common/ui/text/InputWrapper.kt
@@ -44,12 +44,6 @@ class InputWrapper(context: Context, attrs: AttributeSet): TextInputLayout(conte
         setCounterOverflowTextAppearance(R.style.Overline_Red)
         initStyle(attrs, R.styleable.TextInputLayout)
         setPadding()
-
-        endIconMode = END_ICON_CUSTOM
-        endIconDrawable = ResourcesCompat.getDrawable(resources, R.drawable.ic_clear_input, null)
-        setEndIconOnClickListener {
-            editText?.setText("")  // Clear text in EditText
-        }
     }
 
     @SuppressLint("PrivateResource")

From a36f41cef1ffcd3dc1032c7ee86cf735fe1e9365 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Wed, 13 Nov 2024 07:40:34 -0800
Subject: [PATCH 49/58] feat: add quick voting support to
 UsernameRequestsFragment

---
 .../ui/username/UsernameRequestsFragment.kt   | 49 +++++++++++++------
 1 file changed, 35 insertions(+), 14 deletions(-)

diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
index ba9b125d58..08275037b7 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
@@ -35,6 +35,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
@@ -129,15 +130,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 ->
@@ -159,6 +151,7 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
                         u.data?.outputData?.getStringArray(BroadcastUsernameVotesWorker.KEY_USERNAMES)?.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)
@@ -167,12 +160,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 -> {
@@ -363,7 +357,10 @@ 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 (isQuickVoting) {
+            // show dialog about 1 vote left if necessary
+            showQuickVotingResults(usernames)
+        }
         if (viewModel.currentVote?.any { usernames.contains(it.username) } == true) {
             log.info("vote, there is not match for {}", usernames)
             //return
@@ -372,13 +369,25 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
             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) {
@@ -412,4 +421,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())
+            }
+        }
+    }
 }

From 6df16b569a6a5ce5699597b83868b3a82f0f1532 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Wed, 13 Nov 2024 07:40:49 -0800
Subject: [PATCH 50/58] feat: improve username search in
 UsernameRequestsFragment

---
 .../wallet/ui/username/UsernameRequestsFragment.kt | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
index 08275037b7..20b3ffd52f 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
@@ -313,16 +313,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) {

From 299d9bdd4f50037b82d1213da442932c53db1de6 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Wed, 13 Nov 2024 07:41:01 -0800
Subject: [PATCH 51/58] feat: improve username search in
 UsernameRequestsFragment

---
 .../wallet/ui/username/UsernameRequestsFragment.kt          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
index 20b3ffd52f..0c36b03092 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
@@ -348,11 +348,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

From 57168a52d20416c56ea80d2f579e6cfe4fb90c87 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Mon, 18 Nov 2024 13:12:00 -0800
Subject: [PATCH 52/58] fix: keep track of normalized and regular labels

---
 .../src/de/schildbach/wallet/Constants.java   |  3 --
 .../work/BroadcastUsernameVotesOperation.kt   |  4 ++-
 .../work/BroadcastUsernameVotesWorker.kt      | 36 ++++++++++---------
 .../ui/username/UsernameRequestsFragment.kt   | 15 ++++----
 .../ui/username/UsernameRequestsViewModel.kt  | 35 +++++++++---------
 5 files changed, 47 insertions(+), 46 deletions(-)

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/ui/dashpay/work/BroadcastUsernameVotesOperation.kt b/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesOperation.kt
index f46684d3ca..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,6 +103,7 @@ class BroadcastUsernameVotesOperation(val application: Application) {
     @SuppressLint("EnqueueWork")
     fun create(
         usernames: List<String>,
+        normalizedLabels: List<String>,
         voteChoices: List<ResourceVoteChoice>,
         masternodeKeys: List<ByteArray>,
         isQuickVoting: Boolean
@@ -112,7 +113,8 @@ class BroadcastUsernameVotesOperation(val application: Application) {
             .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)
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 c1aaaea6fa..ff45035a7b 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesWorker.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesWorker.kt
@@ -48,18 +48,19 @@ 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"
@@ -68,8 +69,10 @@ class BroadcastUsernameVotesWorker @AssistedInject constructor(
     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)
@@ -172,11 +175,12 @@ 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(),
@@ -197,11 +201,8 @@ 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(),
@@ -219,7 +220,8 @@ class BroadcastUsernameVotesWorker @AssistedInject constructor(
                     }
                     Result.success(
                         workDataOf(
-                            KEY_USERNAMES to usernames,
+                            KEY_NORMALIZED_LABELS to arrayOfnames,
+                            KEY_LABELS to arrayOfnames.map { labelMap[it] },
                             KEY_VOTE_CHOICES to voteChoices,
                             KEY_QUICK_VOTING to isQuickVoting
                         )
@@ -232,13 +234,13 @@ class BroadcastUsernameVotesWorker @AssistedInject constructor(
             Result.failure(
                 workDataOf(
                     KEY_ERROR_MESSAGE to formatExceptionMessage("broadcast username vote", ex),
-                    KEY_USERNAMES to usernames,
+                    KEY_NORMALIZED_LABELS to normalizedLabels,
                     KEY_VOTE_CHOICES to voteChoices,
                     KEY_QUICK_VOTING to isQuickVoting
                 )
             )
         } finally {
-            log.info("finished BroadcastUsernameVotesWorker({}, {})", usernames, voteChoices)
+            log.info("finished BroadcastUsernameVotesWorker({}, {})", normalizedLabels, voteChoices)
         }
     }
 
diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
index 0c36b03092..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
@@ -147,8 +146,10 @@ 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
@@ -300,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()
     }
 
@@ -369,9 +370,11 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
             // show dialog about 1 vote left if necessary
             showQuickVotingResults(usernames)
         }
-        if (viewModel.currentVote?.any { usernames.contains(it.username) } == true) {
-            log.info("vote, there is not match for {}", usernames)
-            //return
+        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) {
diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
index a00af2d208..6ae20c8508 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
@@ -56,7 +56,13 @@ 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
@@ -260,21 +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 },
                     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,
@@ -287,7 +287,7 @@ class UsernameRequestsViewModel @Inject constructor(
         }
     }
 
-    fun revokeVote(requestId: String) {
+    private fun revokeVote(requestId: String) {
         if (keysAmount == 0) {
             return
         }
@@ -295,19 +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 },
                     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,
@@ -349,17 +342,20 @@ class UsernameRequestsViewModel @Inject constructor(
                 }
 
                 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.normalizedLabel)
+                    usernames.add(request.username)
+                    normalizedLabels.add(request.normalizedLabel)
                     voteChoices.add(ResourceVoteChoice.towardsIdentity(Identifier.from(request.identity)))
                 }
 
                 BroadcastUsernameVotesOperation(walletApplication).create(
                     usernames,
+                    normalizedLabels,
                     voteChoices,
                     masternodes.value.map { it.votingPrivateKey },
                     isQuickVoting = true
@@ -568,6 +564,7 @@ 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 },

From c4bf491a521967f6ee8b96c3fa885e5b993afb89 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Tue, 19 Nov 2024 08:47:12 -0800
Subject: [PATCH 53/58] fix: some bugs resulting from removing mocking

---
 .../ui/dashpay/work/BroadcastUsernameVotesWorker.kt    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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 ff45035a7b..1de85c8bc6 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesWorker.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesWorker.kt
@@ -90,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 ->

From 67935b2171fa01ebdaf70958e300397f0e0589e3 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Tue, 19 Nov 2024 21:04:26 -0800
Subject: [PATCH 54/58] feat: show delete button and increase its padding

---
 wallet/res/layout/view_masternode_ip.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wallet/res/layout/view_masternode_ip.xml b/wallet/res/layout/view_masternode_ip.xml
index e5ce2e6fc4..eb41ca567e 100644
--- a/wallet/res/layout/view_masternode_ip.xml
+++ b/wallet/res/layout/view_masternode_ip.xml
@@ -52,10 +52,10 @@
         android:id="@+id/remove_masternode"
         android:layout_width="11dp"
         android:layout_height="11dp"
-        android:padding="12dp"
+        android:paddingHorizontal="20dp"
+        android:paddingVertical="12dp"
         android:layout_marginEnd="15dp"
         android:background="@drawable/ic_x"
-        android:visibility="invisible"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent" />

From ef8c3f33149462859c3b80678caadc0c7e511ab7 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Tue, 19 Nov 2024 21:05:53 -0800
Subject: [PATCH 55/58] feat: show delete button only for imported masternode
 keys

---
 .../ui/username/AddVotingKeysFragment.kt      |  5 ++--
 .../ui/username/UsernameRequestsViewModel.kt  |  4 ++++
 .../ui/username/adapters/IPAddressAdapter.kt  | 23 ++++++++++++-------
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/wallet/src/de/schildbach/wallet/ui/username/AddVotingKeysFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/AddVotingKeysFragment.kt
index 804853398a..fb41574748 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/AddVotingKeysFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/AddVotingKeysFragment.kt
@@ -63,7 +63,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 +79,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/UsernameRequestsViewModel.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
index 6ae20c8508..5e3673e8fe 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
@@ -693,4 +693,8 @@ class UsernameRequestsViewModel @Inject constructor(
             usernameVoteDao.countVotes(username) == UsernameVote.MAX_VOTES - votesLeft
         }
     }
+
+    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 6be476f5edb946ec20a95e78ec845cea54c12ff9 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Tue, 19 Nov 2024 21:10:33 -0800
Subject: [PATCH 56/58] chore: add license ot AddVotingKeysFragment

---
 .../ui/username/AddVotingKeysFragment.kt      | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/wallet/src/de/schildbach/wallet/ui/username/AddVotingKeysFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/AddVotingKeysFragment.kt
index fb41574748..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>()

From cc1349c71f3fd8d7cca27494979f2b6189b42420 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Tue, 19 Nov 2024 21:11:30 -0800
Subject: [PATCH 57/58] style: cleanup

---
 .../ui/username/UsernameRequestDetailsFragment.kt      |  2 +-
 .../wallet/ui/username/UsernameRequestsViewModel.kt    | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

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 5e3673e8fe..db61a73497 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
@@ -56,13 +56,7 @@ 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
@@ -136,7 +130,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 ->
@@ -273,8 +267,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,

From b3839780b998d91d28923defa10d436daa520998 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Tue, 26 Nov 2024 11:12:35 -0800
Subject: [PATCH 58/58] fix: make the delete MN button larger

---
 wallet/res/layout/view_masternode_ip.xml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/wallet/res/layout/view_masternode_ip.xml b/wallet/res/layout/view_masternode_ip.xml
index eb41ca567e..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:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:paddingHorizontal="20dp"
         android:paddingVertical="12dp"
-        android:layout_marginEnd="15dp"
-        android:background="@drawable/ic_x"
+        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