diff --git a/build.gradle b/build.gradle
index 9da2680186..a6664eb071 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,8 @@ 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.1-SNAPSHOT"
         hiltVersion = '2.51'
         hiltCompilerVersion = '1.2.0'
         hiltWorkVersion = '1.0.0'
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 402a511009..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
@@ -51,6 +51,9 @@ object AnalyticsConstants {
         const val SETTINGS = "more_settings"
         const val TOOLS = "more_tools"
         const val CONTACT_SUPPORT = "more_contact_support"
+        const val INVITE = "more_invite"
+        const val USERNAME_VOTING = "more_username_voting"
+        const val UPDATE_PROFILE = "more_user_updated_profile"
     }
 
     object Security {
@@ -80,9 +83,12 @@ object AnalyticsConstants {
         const val RESCAN_BLOCKCHAIN_DISMISS = "settings_rescan_blockchain_dismiss"
         const val ABOUT = "settings_about"
         const val ABOUT_SUPPORT = "settings_about_contact_support"
+        const val COINJOIN = "settings_coinjoin"
     }
 
     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"
@@ -108,6 +114,8 @@ object AnalyticsConstants {
     object Home {
         const val NAV_HOME = "bottom_nav_home"
         const val NAV_MORE = "bottom_nav_more"
+        const val NAV_CONTACTS = "bottom_nav_contacts"
+        const val NAV_EXPLORE = "bottom_nav_explore"
         const val SHORTCUT_SECURE_WALLET = "shortcut_secure_wallet"
         const val SHORTCUT_SCAN_TO_PAY = "shortcut_scan_to_pay"
         const val SHORTCUT_SEND_TO_ADDRESS = "shortcut_send_to_address"
@@ -120,6 +128,8 @@ object AnalyticsConstants {
         const val TRANSACTION_FILTER = "home_transaction_filter"
         const val SEND_RECEIVE_BUTTON = "bottom_nav_payments"
         const val NO_ADDRESS_COPIED = "shortcut_send_no_address_copied"
+        const val AVATAR = "home_avatar"
+        const val NOTIFICATIONS = "home_notifications"
     }
 
     object Invites {
@@ -148,13 +158,18 @@ object AnalyticsConstants {
 
     object UsersContacts {
         const val CREATE_USERNAME = "create_username"
+        const val JOIN_DASHPAY = "start_btn_join_dashpay"
+        const val CREATE_USERNAME_CONFIRM = "start_username_btn_confirm"
+        const val CREATE_USERNAME_SUCCESS = "start_username_created_success"
+        const val CREATE_USERNAME_INVITE_SUCCESS = "start_username_created_success_from_invitation"
+        const val CREATE_USERNAME_ERROR = "start_username_created_fail"
+        const val CREATE_USERNAME_TRYAGAIN = "start_username_btn_try_again"
         const val SEARCH_CONTACTS = "contacts_search"
         const val SEARCH_DASH_NETWORK = "contacts_search_dash_network"
-        const val SEARCH_USER_ICON = "contacts_search_user_icon"
-        const val SEND_REQUEST = "contacts_send_request"
-        const val ACCEPT_REQUEST = "contacts_accept_request"
+        const val SEARCH_USER_ICON = "contacts_btn_add_contact"
+        const val SEND_REQUEST = "contacts_request_sent"
+        const val ACCEPT_REQUEST = "contacts_request_accepted"
         const val NOTIFICATIONS_HOME_SCREEN = "notifications_home_screen"
-        const val NOTIFICATIONS_ACCEPT_REQUEST = "notifications_accept_contact_request"
         const val NOTIFICATIONS_CONTACT_DETAILS = "notifications_contact_details"
         const val PROFILE_EDIT_MORE = "profile_edit_from_more"
         const val PROFILE_EDIT_HOME = "profile_edit_from_home"
@@ -162,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"
@@ -389,10 +405,21 @@ object AnalyticsConstants {
     }
 
     object CoinJoinPrivacy {
+        const val COINJOIN_START_MIXING = "settings_coinjoin_btn_start_mixing"
+        const val COINJOIN_STOP_MIXING = "settings_coinjoin_btn_stop_mixing"
         const val USERNAME_PRIVACY_BTN_CONTINUE = "username_privacy_btn_continue"
         const val USERNAME_PRIVACY_WIFI_BTN_CONTINUE = "username_privacy_wifi_btn_continue"
         const val USERNAME_PRIVACY_WIFI_BTN_CANCEL = "username_privacy_wifi_btn_cancel"
         const val USERNAME_PRIVACY_CONFIRMATION_BTN_CONFIRM = "username_privacy_confirmation_btn_confirm"
         const val USERNAME_PRIVACY_CONFIRMATION_BTN_CANCEL = "username_privacy_confirmation_btn_cancel"
     }
+
+    object UsernameVoting {
+        const val BLOCK = "username_voting_btn_block"
+        const val DETAILS = "username_voting_details_open"
+        const val VOTE = "username_voting_details_btn_vote"
+        const val VOTE_SUCCESS = "username_voting_details_btn_vote_success"
+        const val VOTE_ERROR = "username_voting_details_btn_vote_fail"
+        const val VOTE_CANCEL = "username_voting_details_btn_vote_fail"
+    }
 }
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/java/org/dash/wallet/common/util/NavigationExtensions.kt b/common/src/main/java/org/dash/wallet/common/util/NavigationExtensions.kt
index 06e86fe53d..8df9de70c7 100644
--- a/common/src/main/java/org/dash/wallet/common/util/NavigationExtensions.kt
+++ b/common/src/main/java/org/dash/wallet/common/util/NavigationExtensions.kt
@@ -64,3 +64,8 @@ fun Fragment.deepLinkNavigate(destination: DeepLinkDestination) {
 fun Fragment.goBack() {
     findNavController().popBackStack()
 }
+
+fun Fragment.onUserInteraction() {
+    requireActivity().onUserInteraction()
+    //(requireActivity().application as AutoLogoutTimerHandler).resetAutoLogoutTimer()
+}
diff --git a/common/src/main/res/drawable/ic_x.xml b/common/src/main/res/drawable/ic_x.xml
new file mode 100644
index 0000000000..30f36a07a3
--- /dev/null
+++ b/common/src/main/res/drawable/ic_x.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="11dp"
+    android:height="12dp"
+    android:viewportWidth="11"
+    android:viewportHeight="12">
+  <path
+      android:pathData="M0.891,10.936C0.785,10.83 0.715,10.707 0.682,10.567C0.648,10.428 0.648,10.288 0.682,10.148C0.715,10.009 0.783,9.888 0.885,9.787L4.668,5.997L0.885,2.214C0.783,2.117 0.715,1.998 0.682,1.858C0.652,1.715 0.652,1.573 0.682,1.433C0.715,1.293 0.785,1.171 0.891,1.065C0.993,0.959 1.113,0.889 1.253,0.855C1.397,0.822 1.539,0.822 1.678,0.855C1.822,0.889 1.945,0.957 2.046,1.059L5.83,4.842L9.613,1.059C9.714,0.957 9.835,0.889 9.975,0.855C10.114,0.822 10.254,0.822 10.394,0.855C10.533,0.889 10.656,0.961 10.762,1.071C10.868,1.173 10.937,1.293 10.971,1.433C11.009,1.573 11.009,1.712 10.971,1.852C10.937,1.992 10.87,2.112 10.768,2.214L6.991,5.997L10.768,9.787C10.87,9.888 10.937,10.009 10.971,10.148C11.005,10.288 11.005,10.428 10.971,10.567C10.937,10.707 10.868,10.83 10.762,10.936C10.656,11.041 10.533,11.111 10.394,11.145C10.254,11.179 10.114,11.179 9.975,11.145C9.835,11.111 9.714,11.043 9.613,10.942L5.83,7.159L2.046,10.942C1.945,11.043 1.824,11.111 1.685,11.145C1.545,11.179 1.403,11.179 1.259,11.145C1.12,11.111 0.997,11.041 0.891,10.936Z"
+      android:fillColor="#B0B6BC"/>
+</vector>
diff --git a/common/src/main/res/values-de/strings.xml b/common/src/main/res/values-de/strings.xml
index d99bbe7552..52b1376d83 100644
--- a/common/src/main/res/values-de/strings.xml
+++ b/common/src/main/res/values-de/strings.xml
@@ -24,6 +24,8 @@
     <string name="dash_address">Dash Adresse</string>
     <string name="username">Nutzername</string>
     <string name="balance">Guthaben:</string>
+    <string name="nothing_here">Hier gibt es nichts</string>
+
     <!-- Local Currency List: GGP -->
     <string name="currency_GGP">Guernsey Pfund</string>
     <!-- Local Currency List: JEP -->
@@ -61,6 +63,8 @@
     <string name="verify">Verifizieren</string>
     <string name="receive_enter_amount_button">Betrag festsetzen</string>
     <string name="account_create">Konto erstellen</string>
+    <string name="submit">Einreichen</string>
+
     <!-- Design system UI elements -->
     <string name="search_hint">Suchen</string>
     <string name="permission_allow">Erlauben</string>
@@ -77,6 +81,7 @@
     <string name="select_currency">Währung auswählen</string>
     <string name="send_coins_error_dusty_send">Der Betrag ist zu klein zum Senden</string>
     <string name="send_coins_error_insufficient_money">Guthaben nicht ausreichend</string>
+    <string name="send_coins_error_insufficient_mixed_money">Gemixtes Guthaben nicht ausreichend. Warte bis das CoinJoin-Mixen abgeschlossen ist oder deaktiviere dieses Feature in den Einstellungen, um die Transaktion abzuschließen.</string>
     <string name="syncing">Synchronisiere</string>
     <string name="no_connection">Keine Internetverbindung</string>
     <string name="rate_not_available">Nicht verfügbar</string>
diff --git a/common/src/main/res/values-el/strings.xml b/common/src/main/res/values-el/strings.xml
index 1e8b15e6d1..1fa40de649 100644
--- a/common/src/main/res/values-el/strings.xml
+++ b/common/src/main/res/values-el/strings.xml
@@ -24,6 +24,8 @@
     <string name="dash_address">Διεύθυνση Dash</string>
     <string name="username">Όνομα Χρήστη:</string>
     <string name="balance">Υπόλοιπο:</string>
+    <string name="nothing_here">Τίποτα εδώ</string>
+
     <!-- Local Currency List: GGP -->
     <string name="currency_GGP">Γκέρνσεϊ Λίρα</string>
     <!-- Local Currency List: JEP -->
@@ -61,6 +63,8 @@
     <string name="verify">Επιβεβαίωση</string>
     <string name="receive_enter_amount_button">Καθορίστε το ποσό</string>
     <string name="account_create">Δημιουργία λογαριασμού</string>
+    <string name="submit">Υποβολή</string>
+
     <!-- Design system UI elements -->
     <string name="search_hint">Αναζήτηση</string>
     <string name="permission_allow">Επιτρέπετε</string>
@@ -77,6 +81,7 @@
     <string name="select_currency">Επιλέξτε Νόμισμα</string>
     <string name="send_coins_error_dusty_send">Το ποσό είναι πολύ μικρό για να σταλθεί</string>
     <string name="send_coins_error_insufficient_money">Ανεπαρκή χρήματα</string>
+    <string name="send_coins_error_insufficient_mixed_money">Ανεπαρκή μικτά κεφάλαια. Περιμένετε να ολοκληρωθεί η ανάμειξη του CoinJoin ή απενεργοποιήστε αυτή τη λειτουργία στις ρυθμίσεις για να ολοκληρώσετε αυτή τη συναλλαγή.</string>
     <string name="syncing">Συγχρονισμός</string>
     <string name="no_connection">Χωρίς σύνδεση στο διαδίκτυο</string>
     <string name="rate_not_available">Μη διαθέσιμο</string>
diff --git a/common/src/main/res/values-es/strings.xml b/common/src/main/res/values-es/strings.xml
index f6998d3bf5..b77203d8af 100644
--- a/common/src/main/res/values-es/strings.xml
+++ b/common/src/main/res/values-es/strings.xml
@@ -24,6 +24,8 @@
     <string name="dash_address">Dirección de Dash</string>
     <string name="username">Nombre de usuario</string>
     <string name="balance">Balance:</string>
+    <string name="nothing_here">No hay nada aquí</string>
+
     <!-- Local Currency List: GGP -->
     <string name="currency_GGP">Libra de Guernsey</string>
     <!-- Local Currency List: JEP -->
@@ -61,6 +63,8 @@
     <string name="verify">Verificar</string>
     <string name="receive_enter_amount_button">Especificar Monto</string>
     <string name="account_create">Crear una cuenta</string>
+    <string name="submit">Entregar</string>
+
     <!-- Design system UI elements -->
     <string name="search_hint">Buscar</string>
     <string name="permission_allow">Permitir</string>
@@ -77,6 +81,7 @@
     <string name="select_currency">Selecciona el tipo de moneda</string>
     <string name="send_coins_error_dusty_send">La cantidad es demasiado pequeña para ser enviada</string>
     <string name="send_coins_error_insufficient_money">Fondos insuficientes</string>
+    <string name="send_coins_error_insufficient_mixed_money">Fondos mixtos insuficientes. Espera a que finalice la mezcla de CoinJoin o desactiva esta función en la configuración para completar esta transacción.</string>
     <string name="syncing">Sincronizando</string>
     <string name="no_connection">No hay conexión a internet</string>
     <string name="rate_not_available">No disponible</string>
diff --git a/common/src/main/res/values-fa/strings.xml b/common/src/main/res/values-fa/strings.xml
index 3334cea05a..1659b1c087 100644
--- a/common/src/main/res/values-fa/strings.xml
+++ b/common/src/main/res/values-fa/strings.xml
@@ -22,7 +22,10 @@
     <string name="login_error_title">ورود به حساب %s شما ناموفق بود</string>
     <string name="login_error_message">در هنگام تلاش برای ورود به حساب %s شما، خطایی روی داد. </string>
     <string name="dash_address">نشانی دش</string>
+    <string name="username">نام کاربری</string>
     <string name="balance">موجودی: </string>
+    <string name="nothing_here">چیزی اینجا نیست</string>
+
     <!-- Local Currency List: GGP -->
     <string name="currency_GGP">گرنزی پاوند</string>
     <!-- Local Currency List: JEP -->
@@ -60,6 +63,8 @@
     <string name="verify">تائید</string>
     <string name="receive_enter_amount_button">مبلغ را مشخص کنید</string>
     <string name="account_create">ایجاد حساب</string>
+    <string name="submit">ثبت</string>
+
     <!-- Design system UI elements -->
     <string name="search_hint">جستجو</string>
     <string name="permission_allow">اجازه می‌دهم</string>
@@ -76,6 +81,7 @@
     <string name="select_currency">واحد پول‌تان را انتخاب کنید</string>
     <string name="send_coins_error_dusty_send">مبلغ مورد نظر، بیش از حد کم است</string>
     <string name="send_coins_error_insufficient_money">موجودی ناکافی</string>
+    <string name="send_coins_error_insufficient_mixed_money">موجودی ترکیبی کافی نیست. منتظر بمانید تا فرایند ترکیب کوین‌جوین تمام شود و یا این قابلیت را از طریق تنظیمات غیرفعال کنید تا این تراکنش صورت گیرد. </string>
     <string name="syncing">در حال همزمان‌سازی</string>
     <string name="no_connection">به اینترنت متصل نیستید</string>
     <string name="rate_not_available">در دسترس نیست</string>
diff --git a/common/src/main/res/values-fil/strings.xml b/common/src/main/res/values-fil/strings.xml
index 00065b5354..84cfd83da2 100644
--- a/common/src/main/res/values-fil/strings.xml
+++ b/common/src/main/res/values-fil/strings.xml
@@ -24,6 +24,8 @@
     <string name="dash_address">Address ng Dash</string>
     <string name="username">Username</string>
     <string name="balance">Balanse:</string>
+    <string name="nothing_here">Wala dito</string>
+
     <!-- Local Currency List: GGP -->
     <string name="currency_GGP">Guernsey Pound</string>
     <!-- Local Currency List: JEP -->
@@ -61,6 +63,8 @@
     <string name="verify">Kumpirmahin</string>
     <string name="receive_enter_amount_button">Tukuyin ang halaga</string>
     <string name="account_create">Lumikha ng Account</string>
+    <string name="submit">Isumite</string>
+
     <!-- Design system UI elements -->
     <string name="search_hint">Maghanap</string>
     <string name="permission_allow">Payagan</string>
@@ -77,6 +81,7 @@
     <string name="select_currency">Piliin ang Pera</string>
     <string name="send_coins_error_dusty_send">Ang halaga ay sobrang liit para maipadala</string>
     <string name="send_coins_error_insufficient_money">Hindi sapat na pondo</string>
+    <string name="send_coins_error_insufficient_mixed_money">Hindi sapat na pinaghalong pondo. Hintayin ang paghahalo ng CoinJoin upang matapos o huwag paganahin ang tampok na ito sa mga setting upang makumpleto ang transaksyong ito.</string>
     <string name="syncing">Nagsi-sync</string>
     <string name="no_connection">Walang koneksyon sa internet</string>
     <string name="rate_not_available">Hindi available</string>
diff --git a/common/src/main/res/values-fr/strings.xml b/common/src/main/res/values-fr/strings.xml
index 8d5edeff21..a9531efdd5 100644
--- a/common/src/main/res/values-fr/strings.xml
+++ b/common/src/main/res/values-fr/strings.xml
@@ -24,6 +24,8 @@
     <string name="dash_address">Adresse Dash</string>
     <string name="username">Nom d\'utilisateur</string>
     <string name="balance">Solde :</string>
+    <string name="nothing_here">Rien ici</string>
+
     <!-- Local Currency List: GGP -->
     <string name="currency_GGP">livre de Guernesey</string>
     <!-- Local Currency List: JEP -->
@@ -61,6 +63,8 @@
     <string name="verify">Vérifier</string>
     <string name="receive_enter_amount_button">Indiquez le montant</string>
     <string name="account_create">Créer un compte</string>
+    <string name="submit">Valider</string>
+
     <!-- Design system UI elements -->
     <string name="search_hint">Chercher</string>
     <string name="permission_allow">Autoriser</string>
@@ -77,6 +81,7 @@
     <string name="select_currency">Choisir la monnaie</string>
     <string name="send_coins_error_dusty_send">Le montant est trop faible pour être envoyé</string>
     <string name="send_coins_error_insufficient_money">Fonds insuffisants</string>
+    <string name="send_coins_error_insufficient_mixed_money">Fonds mélangés insuffisants. Veuillez attendre que le mélange CoinJoin se termine, ou bien désactivez cette fonction dans les réglages pour que la transaction soit exécutée.</string>
     <string name="syncing">En synchronisation</string>
     <string name="no_connection">Pas de connexion Internet</string>
     <string name="rate_not_available">Non disponible</string>
diff --git a/common/src/main/res/values-id/strings.xml b/common/src/main/res/values-id/strings.xml
index 5f1f9a6fb6..b05d9cb444 100644
--- a/common/src/main/res/values-id/strings.xml
+++ b/common/src/main/res/values-id/strings.xml
@@ -24,6 +24,8 @@
     <string name="dash_address">Alamat Dash</string>
     <string name="username">Nama pengguna</string>
     <string name="balance">Saldo:</string>
+    <string name="nothing_here">Tidak ada apa pun di sini</string>
+
     <!-- Local Currency List: GGP -->
     <string name="currency_GGP">Pound Guernsey</string>
     <!-- Local Currency List: JEP -->
@@ -61,6 +63,8 @@
     <string name="verify">Memeriksa</string>
     <string name="receive_enter_amount_button">Tentukan Jumlah</string>
     <string name="account_create">Buat Akun</string>
+    <string name="submit">Kirim</string>
+
     <!-- Design system UI elements -->
     <string name="search_hint">Cari</string>
     <string name="permission_allow">Izinkan</string>
@@ -77,6 +81,7 @@
     <string name="select_currency">Pilih mata uang</string>
     <string name="send_coins_error_dusty_send">Jumlah yang terlalu kecil untuk dikirim</string>
     <string name="send_coins_error_insufficient_money">Dana tidak mencukupi</string>
+    <string name="send_coins_error_insufficient_mixed_money">Dana campuran tidak mencukupi. Tunggu hingga pencampuran CoinJoin selesai atau nonaktifkan fitur ini di pengaturan untuk menyelesaikan transaksi ini.</string>
     <string name="syncing">Menyingkronkan:</string>
     <string name="no_connection">Tidak ada koneksi internet</string>
     <string name="rate_not_available">Tak tersedia</string>
diff --git a/common/src/main/res/values-it/strings.xml b/common/src/main/res/values-it/strings.xml
index 530f41f80a..5031915690 100644
--- a/common/src/main/res/values-it/strings.xml
+++ b/common/src/main/res/values-it/strings.xml
@@ -25,6 +25,8 @@
     <string name="username">Carica la tua foto, personalizza la tua identità.
  </string>
     <string name="balance">Saldo:</string>
+    <string name="nothing_here">Niente qui</string>
+
     <!-- Local Currency List: GGP -->
     <string name="currency_GGP">Guernsey Pound</string>
     <!-- Local Currency List: JEP -->
@@ -62,6 +64,8 @@
     <string name="verify">Verifica</string>
     <string name="receive_enter_amount_button">Specifica Importo</string>
     <string name="account_create">Crea un Account</string>
+    <string name="submit">Invia</string>
+
     <!-- Design system UI elements -->
     <string name="search_hint">Cerca</string>
     <string name="permission_allow">Permetti</string>
@@ -78,6 +82,7 @@
     <string name="select_currency">Seleziona Valuta</string>
     <string name="send_coins_error_dusty_send">L\'importo è troppo piccolo per l\'invio</string>
     <string name="send_coins_error_insufficient_money">Fondi insufficenti</string>
+    <string name="send_coins_error_insufficient_mixed_money">Fondi misti insufficienti. Attendi il completamento del mixaggio di CoinJoin o disabilita questa funzione nelle impostazioni per completare questa transazione.</string>
     <string name="syncing">Sincronizzazione</string>
     <string name="no_connection">Nessuna connessione internet</string>
     <string name="rate_not_available">Non disponibile</string>
diff --git a/common/src/main/res/values-ja/strings.xml b/common/src/main/res/values-ja/strings.xml
index 20e5cdf827..176c387cad 100644
--- a/common/src/main/res/values-ja/strings.xml
+++ b/common/src/main/res/values-ja/strings.xml
@@ -24,6 +24,8 @@
     <string name="dash_address">Dashアドレス</string>
     <string name="username">ユーザー名</string>
     <string name="balance">残高:</string>
+    <string name="nothing_here">こちらにはありません</string>
+
     <!-- Local Currency List: GGP -->
     <string name="currency_GGP">ガーンジー・ポンド</string>
     <!-- Local Currency List: JEP -->
@@ -61,6 +63,8 @@
     <string name="verify">検証する</string>
     <string name="receive_enter_amount_button">金額を指定する</string>
     <string name="account_create">アカウントの作成</string>
+    <string name="submit">提出する</string>
+
     <!-- Design system UI elements -->
     <string name="search_hint">検索</string>
     <string name="permission_allow">許可する</string>
@@ -77,6 +81,7 @@
     <string name="select_currency">通貨を選択する</string>
     <string name="send_coins_error_dusty_send">送金額が小さすぎます</string>
     <string name="send_coins_error_insufficient_money">資金不足</string>
+    <string name="send_coins_error_insufficient_mixed_money">ミキシング資金が不足しています。CoinJoinのミキシングが完了するまで待つか、設定でこの機能を無効にしてこの取引を完了してください。</string>
     <string name="syncing">同期中</string>
     <string name="no_connection">インターネット接続がありません</string>
     <string name="rate_not_available">ご利用できません</string>
diff --git a/common/src/main/res/values-ko/strings.xml b/common/src/main/res/values-ko/strings.xml
index 0f35072b2d..a3833f2dde 100644
--- a/common/src/main/res/values-ko/strings.xml
+++ b/common/src/main/res/values-ko/strings.xml
@@ -24,6 +24,8 @@
     <string name="dash_address">대시 주소</string>
     <string name="username">사용자 이름</string>
     <string name="balance">잔고:</string>
+    <string name="nothing_here">아무것도 없습니다</string>
+
     <!-- Local Currency List: GGP -->
     <string name="currency_GGP">건지섬 파운드</string>
     <!-- Local Currency List: JEP -->
@@ -61,6 +63,8 @@
     <string name="verify">인증하기</string>
     <string name="receive_enter_amount_button">금액 특정하기</string>
     <string name="account_create">계정 생성하기</string>
+    <string name="submit">제출</string>
+
     <!-- Design system UI elements -->
     <string name="search_hint">검색</string>
     <string name="permission_allow">허용</string>
@@ -77,6 +81,7 @@
     <string name="select_currency">통화 선택</string>
     <string name="send_coins_error_dusty_send">송금액이 너무 적어 전송할 수 없습니다</string>
     <string name="send_coins_error_insufficient_money">잔액 부족</string>
+    <string name="send_coins_error_insufficient_mixed_money">믹싱된 자금이 충분하지 않습니다. 이 거래를 완료하기 위해서는 코인조인 믹싱이 끝날 때까지 기다리거나 설정에서 이 기능을 끄십시오.</string>
     <string name="syncing">동기화 중</string>
     <string name="no_connection">인터넷 연결 없음</string>
     <string name="rate_not_available">이용할 수 없음</string>
diff --git a/common/src/main/res/values-nl/strings.xml b/common/src/main/res/values-nl/strings.xml
index 33c45e2684..6241158556 100644
--- a/common/src/main/res/values-nl/strings.xml
+++ b/common/src/main/res/values-nl/strings.xml
@@ -24,6 +24,8 @@
     <string name="dash_address">Dashadres</string>
     <string name="username">Gebruikersnaam</string>
     <string name="balance">Saldo:</string>
+    <string name="nothing_here">Niets hier</string>
+
     <!-- Local Currency List: GGP -->
     <string name="currency_GGP">Guernsey Pound</string>
     <!-- Local Currency List: JEP -->
@@ -61,6 +63,8 @@
     <string name="verify">Verifiëren</string>
     <string name="receive_enter_amount_button">Specificeer bedrag</string>
     <string name="account_create">Maak account aan</string>
+    <string name="submit">Indienen</string>
+
     <!-- Design system UI elements -->
     <string name="search_hint">Zoek</string>
     <string name="permission_allow">Sta toe</string>
@@ -77,6 +81,7 @@
     <string name="select_currency">Selecteer valuta</string>
     <string name="send_coins_error_dusty_send">bedrag is te klein om te versturen</string>
     <string name="send_coins_error_insufficient_money">Ontoereikende fondsen</string>
+    <string name="send_coins_error_insufficient_mixed_money">Onvoldoende gemengd saldo. Wacht tot de CoinJoin mix is voltooid of schakel deze functie uit in de instellingen om deze transactie te voltooien.</string>
     <string name="syncing">Aan het synchroniseren</string>
     <string name="no_connection">Geen internetverbinding</string>
     <string name="rate_not_available">Niet beschikbaar</string>
diff --git a/common/src/main/res/values-pl/strings.xml b/common/src/main/res/values-pl/strings.xml
index a6f6ec1e17..952ef3f618 100644
--- a/common/src/main/res/values-pl/strings.xml
+++ b/common/src/main/res/values-pl/strings.xml
@@ -24,6 +24,8 @@
     <string name="dash_address">Adres Dash</string>
     <string name="username">Nazwa użytkownika</string>
     <string name="balance">Saldo:</string>
+    <string name="nothing_here">Nic tutaj nie ma</string>
+
     <!-- Local Currency List: GGP -->
     <string name="currency_GGP">Funt Guernsey</string>
     <!-- Local Currency List: JEP -->
@@ -61,6 +63,8 @@
     <string name="verify">Zweryfikuj</string>
     <string name="receive_enter_amount_button">Określ Kwotę</string>
     <string name="account_create">Stwórz Konto</string>
+    <string name="submit">Wyślij</string>
+
     <!-- Design system UI elements -->
     <string name="search_hint">Szukaj</string>
     <string name="permission_allow">Pozwól</string>
@@ -77,6 +81,7 @@
     <string name="select_currency">Wybierz Walutę</string>
     <string name="send_coins_error_dusty_send">Kwota jest zbyt mała, aby wysłać</string>
     <string name="send_coins_error_insufficient_money">Niewystarczająca ilość funduszy</string>
+    <string name="send_coins_error_insufficient_mixed_money">Nie posiadasz wystarczająco wymieszanych funduszy. Poczekaj, aż mieszanie Coinjoin zakończy się lub wyłącz tę funkcję w ustawieniach, aby dokonać tej transakcji.</string>
     <string name="syncing">Synchronizowanie</string>
     <string name="no_connection">Brak połączenia z Internetem</string>
     <string name="rate_not_available">Niedostępne</string>
diff --git a/common/src/main/res/values-pt/strings.xml b/common/src/main/res/values-pt/strings.xml
index f1ea2e7067..4231b4dc59 100644
--- a/common/src/main/res/values-pt/strings.xml
+++ b/common/src/main/res/values-pt/strings.xml
@@ -24,6 +24,8 @@
     <string name="dash_address">Endereço Dash</string>
     <string name="username">Nome de usuário</string>
     <string name="balance">Saldo:</string>
+    <string name="nothing_here">Nada aqui</string>
+
     <!-- Local Currency List: GGP -->
     <string name="currency_GGP">Libra Guernsey</string>
     <!-- Local Currency List: JEP -->
@@ -61,6 +63,8 @@
     <string name="verify">Verificar</string>
     <string name="receive_enter_amount_button">Especificar Valor</string>
     <string name="account_create">Criar Conta</string>
+    <string name="submit">Enviar</string>
+
     <!-- Design system UI elements -->
     <string name="search_hint">Buscar</string>
     <string name="permission_allow">Permitir</string>
@@ -77,6 +81,7 @@
     <string name="select_currency">Selecione a moeda</string>
     <string name="send_coins_error_dusty_send">O valor é muito baixo para ser enviado</string>
     <string name="send_coins_error_insufficient_money">Fundos insuficientes</string>
+    <string name="send_coins_error_insufficient_mixed_money">Fundos misturados insuficientes. Aguarde o término da mistura CoinJoin ou desative este recurso nas configurações para concluir esta transação.</string>
     <string name="syncing">Sincronizando</string>
     <string name="no_connection">Sem conexão com a internet</string>
     <string name="rate_not_available">Não disponível</string>
diff --git a/common/src/main/res/values-ru/strings.xml b/common/src/main/res/values-ru/strings.xml
index 1549214905..4c4d1ae454 100644
--- a/common/src/main/res/values-ru/strings.xml
+++ b/common/src/main/res/values-ru/strings.xml
@@ -24,6 +24,8 @@
     <string name="dash_address">Адрес Dash</string>
     <string name="username">Имя пользователя</string>
     <string name="balance">Баланс:</string>
+    <string name="nothing_here">Тут ничего нет</string>
+
     <!-- Local Currency List: GGP -->
     <string name="currency_GGP">Гернсийский фунт</string>
     <!-- Local Currency List: JEP -->
@@ -61,6 +63,8 @@
     <string name="verify">Подтвердить</string>
     <string name="receive_enter_amount_button">Введите сумму</string>
     <string name="account_create">Создать аккаунт</string>
+    <string name="submit">Отправить</string>
+
     <!-- Design system UI elements -->
     <string name="search_hint">Поиск</string>
     <string name="permission_allow">Разрешить</string>
@@ -77,6 +81,7 @@
     <string name="select_currency">Выберите валюту</string>
     <string name="send_coins_error_dusty_send">Сумма слишком мала для отправки</string>
     <string name="send_coins_error_insufficient_money">Недостаточно средств</string>
+    <string name="send_coins_error_insufficient_mixed_money">Средства недостаточно перемешаны. Для завершения этой транзакции дождитесь, пока CoinJoin завершит перемешивание, или отключите эту функцию в настройках. </string>
     <string name="syncing">Синхронизация</string>
     <string name="no_connection">Отсутствует подключение к Интернету</string>
     <string name="rate_not_available">Недоступно</string>
diff --git a/common/src/main/res/values-sk/strings.xml b/common/src/main/res/values-sk/strings.xml
index f390669c50..08977db6b7 100644
--- a/common/src/main/res/values-sk/strings.xml
+++ b/common/src/main/res/values-sk/strings.xml
@@ -24,6 +24,8 @@
     <string name="dash_address">Dash adresa</string>
     <string name="username">Používateľské meno</string>
     <string name="balance">Zostatok:</string>
+    <string name="nothing_here">Nič tu nie je</string>
+
     <!-- Local Currency List: GGP -->
     <string name="currency_GGP">Guernseyova libra</string>
     <!-- Local Currency List: JEP -->
@@ -61,6 +63,8 @@
     <string name="verify">Overiť</string>
     <string name="receive_enter_amount_button">Zadať množstvo</string>
     <string name="account_create">Vytvoriť účet</string>
+    <string name="submit">Odoslať</string>
+
     <!-- Design system UI elements -->
     <string name="search_hint">Hľadať</string>
     <string name="permission_allow">Povoliť</string>
@@ -77,6 +81,7 @@
     <string name="select_currency">Vyberte menu</string>
     <string name="send_coins_error_dusty_send">Čiastka je príliš nízka pre odoslanie</string>
     <string name="send_coins_error_insufficient_money">Nedostatok prostriedkov</string>
+    <string name="send_coins_error_insufficient_mixed_money">Nedostatočné zmiešané prostriedky. Počkajte, kým sa miešanie CoinJoin dokončí, alebo túto funkciu zakážte v nastaveniach pre dokončenie tejto transakcie.</string>
     <string name="syncing">Synchronizuje sa</string>
     <string name="no_connection">Žiadne pripojenie k internetu</string>
     <string name="rate_not_available">Nie je k dispozícií</string>
diff --git a/common/src/main/res/values-zh-rTW/strings.xml b/common/src/main/res/values-zh-rTW/strings.xml
index e4670f6965..63c8570557 100644
--- a/common/src/main/res/values-zh-rTW/strings.xml
+++ b/common/src/main/res/values-zh-rTW/strings.xml
@@ -24,6 +24,8 @@
     <string name="dash_address">達世幣位址</string>
     <string name="username">用戶名稱</string>
     <string name="balance">結餘:</string>
+    <string name="nothing_here">這裡什麼都沒有</string>
+
     <!-- Local Currency List: GGP -->
     <string name="currency_GGP">Guernsey Pound</string>
     <!-- Local Currency List: JEP -->
@@ -61,6 +63,8 @@
     <string name="verify">檢查</string>
     <string name="receive_enter_amount_button">指定金額</string>
     <string name="account_create">創建帳號</string>
+    <string name="submit">提交</string>
+
     <!-- Design system UI elements -->
     <string name="search_hint">搜索</string>
     <string name="permission_allow">允許</string>
@@ -77,6 +81,7 @@
     <string name="select_currency">選擇貨幣</string>
     <string name="send_coins_error_dusty_send">這個金額太小，無法發送。</string>
     <string name="send_coins_error_insufficient_money">餘額不足</string>
+    <string name="send_coins_error_insufficient_mixed_money">混合資金不足。等待CoinJoin混合完成或在設定中停用此功能來完成此交易。</string>
     <string name="syncing">同步中</string>
     <string name="no_connection">沒有網絡連接</string>
     <string name="rate_not_available">無法使用</string>
diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml
index 7e71fa6c8c..9fbd57b38c 100644
--- a/common/src/main/res/values-zh/strings.xml
+++ b/common/src/main/res/values-zh/strings.xml
@@ -24,6 +24,8 @@
     <string name="dash_address">Dash地址</string>
     <string name="username">用户名</string>
     <string name="balance">余额:</string>
+    <string name="nothing_here">这里什么都没有</string>
+
     <!-- Local Currency List: GGP -->
     <string name="currency_GGP">Guernsey镑</string>
     <!-- Local Currency List: JEP -->
@@ -61,6 +63,8 @@
     <string name="verify">验证</string>
     <string name="receive_enter_amount_button">指定数额</string>
     <string name="account_create">创建账户</string>
+    <string name="submit">提交</string>
+
     <!-- Design system UI elements -->
     <string name="search_hint">搜索</string>
     <string name="permission_allow">允许</string>
@@ -77,6 +81,7 @@
     <string name="select_currency">选择货币</string>
     <string name="send_coins_error_dusty_send">该金额太小, 无法支付</string>
     <string name="send_coins_error_insufficient_money">资金不足</string>
+    <string name="send_coins_error_insufficient_mixed_money">混合资金不足. 等待CoinJoin混合完成或在设定中停用此功能来完成此交易.</string>
     <string name="syncing">正在同步</string>
     <string name="no_connection">没有网络连接</string>
     <string name="rate_not_available">不可用</string>
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 a18fcd9b41..1130033d9b 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -60,6 +60,7 @@
     <string name="button_understand">I understand</string>
     <string name="button_okay">Okay</string>
     <string name="button_share">Share</string>
+    <string name="button_skip">Skip</string>
     <string name="share_address">Share Address</string>
     <string name="verify">Verify</string>
     <string name="receive_enter_amount_button">Specify Amount</string>
@@ -111,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/features/exploredash/src/main/res/values-de/strings-explore-dash.xml b/features/exploredash/src/main/res/values-de/strings-explore-dash.xml
index e78bd407b5..551f26ae0d 100644
--- a/features/exploredash/src/main/res/values-de/strings-explore-dash.xml
+++ b/features/exploredash/src/main/res/values-de/strings-explore-dash.xml
@@ -156,6 +156,8 @@
     <!-- Explore TestNet -->
     <string name="explore_test_subtitle">Test Dash besitzen keinen echten Wert, aber du kannst sie an DashPay Alpha-Nutzern senden oder erhalten.</string>
     <string name="explore_test_dash_title">Wie bekomme ich Test Dash?</string>
+    <string name="explore_test_dash_text_1">Test Dash ist kostenlos und kann an einem so genannten Faucet erworben werden.</string>
+    <string name="explore_test_dash_text_2">Klicke auf die Schaltfläche unten, um eine Dash-Adresse aus dieser Wallet zu kopieren, damit Sie Ihre Test-Dash erhalten können...</string>
     <string name="explore_get_test_dash">Erhalte Test Dash</string>
 
     <!-- Sync Status -->
diff --git a/features/exploredash/src/main/res/values-el/strings-explore-dash.xml b/features/exploredash/src/main/res/values-el/strings-explore-dash.xml
index e51182377d..5f921af15f 100644
--- a/features/exploredash/src/main/res/values-el/strings-explore-dash.xml
+++ b/features/exploredash/src/main/res/values-el/strings-explore-dash.xml
@@ -156,6 +156,8 @@
     <!-- Explore TestNet -->
     <string name="explore_test_subtitle">Τα Test Dash δεν έχουν καμία αξία στον πραγματικό κόσμο, αλλά μπορείτε να στείλετε και να λάβετε με άλλους χρήστες του DashPay Alpha.</string>
     <string name="explore_test_dash_title">Πώς μπορώ να αποκτήσω Test Dash;</string>
+    <string name="explore_test_dash_text_1">Τα Test Dash είναι δωρεάν και μπορούν να ληφθούν από αυτό που ονομάζεται faucet.</string>
+    <string name="explore_test_dash_text_2">Κάντε κλικ στο παρακάτω κουμπί για να αντιγράψετε μια διεύθυνση Dash από αυτό το πορτοφόλι, ώστε να μπορέσετε να λάβετε τα test Dash σας ..</string>
     <string name="explore_get_test_dash">Πάρτε Test Dash</string>
 
     <!-- Sync Status -->
diff --git a/features/exploredash/src/main/res/values-es/strings-explore-dash.xml b/features/exploredash/src/main/res/values-es/strings-explore-dash.xml
index db74fbd7d0..ad14693978 100644
--- a/features/exploredash/src/main/res/values-es/strings-explore-dash.xml
+++ b/features/exploredash/src/main/res/values-es/strings-explore-dash.xml
@@ -160,6 +160,8 @@
     <!-- Explore TestNet -->
     <string name="explore_test_subtitle">Los Dash de prueba no tienen ningún valor en el mundo real, pero puedes enviarlos y recibirlos con otros usuarios de DashPay Alpha.</string>
     <string name="explore_test_dash_title">¿Cómo obtengo Dash de prueba?</string>
+    <string name="explore_test_dash_text_1">Test Dash es gratuito y se puede obtener mediante lo que se denomina un faucet.</string>
+    <string name="explore_test_dash_text_2">Haz clic en el botón a continuación para copiar una dirección Dash de esta billetera para que puedas obtener tus Dash de prueba.</string>
     <string name="explore_get_test_dash">Obtener Dash de prueba</string>
 
     <!-- Sync Status -->
diff --git a/features/exploredash/src/main/res/values-fa/strings-explore-dash.xml b/features/exploredash/src/main/res/values-fa/strings-explore-dash.xml
index 36a55eff4b..20830a2fb3 100644
--- a/features/exploredash/src/main/res/values-fa/strings-explore-dash.xml
+++ b/features/exploredash/src/main/res/values-fa/strings-explore-dash.xml
@@ -153,6 +153,13 @@
     <string name="buy_gift_card_with_dash_text">با دش یک کارت هدیه بخرید. </string>
     <string name="redeem_gift_card_text">کارت هدیه را به صورت آنلاین یا در یک فروشگاه، طی چند ثانیه استفاده کنید. </string>
 
+    <!-- Explore TestNet -->
+    <string name="explore_test_subtitle">تست دش هیچ ارزشی در دنیای واقعی ندارد، اما می‌توانید آن را برای سایر کاربران دش‌پی الفا بفرستید یا از آنها دریافت کنید. </string>
+    <string name="explore_test_dash_title">چگونه تست دش دریافت کنم؟ </string>
+    <string name="explore_test_dash_text_1">تست دش رایگان است و می‌توانید از چیزی که فاست نام دارد دریافت کنید. </string>
+    <string name="explore_test_dash_text_2">روی دگمه زیر کلیک کنید تا نشانی دش این کیف پول‌تان کپی شود تا بتوانید تست دش دریافت کنید. </string>
+    <string name="explore_get_test_dash">دریافت تست دش</string>
+
     <!-- Sync Status -->
     <string name="sync_in_progress_not_complete">فرآیند همزمان‌سازی در جریان است...نتایج شاید کامل نباشد. </string>
     <string name="sync_in_progress_error">فرآیند همزمان‌سازی در جریان است...یک خطا روی داد. </string>
diff --git a/features/exploredash/src/main/res/values-fil/strings-explore-dash.xml b/features/exploredash/src/main/res/values-fil/strings-explore-dash.xml
index 783c205df3..39fd7c8bbc 100644
--- a/features/exploredash/src/main/res/values-fil/strings-explore-dash.xml
+++ b/features/exploredash/src/main/res/values-fil/strings-explore-dash.xml
@@ -156,6 +156,8 @@
     <!-- Explore TestNet -->
     <string name="explore_test_subtitle">Ang Test Dash ay walang anumang halaga sa totoong mundo ngunit maaari mo itong ipadala at tanggapin kasama ng iba pang mga gumagamit ng DashPay Alpha.</string>
     <string name="explore_test_dash_title">Paano ako makakakuha ng Test Dash?</string>
+    <string name="explore_test_dash_text_1">Ang Test Dash ay libre at maaaring makuha mula sa tinatawag na gripo.</string>
+    <string name="explore_test_dash_text_2">Mag-click sa button sa ibaba para kumopya ng Dash address mula sa wallet na ito para makuha mo ang iyong pagsubok na Dash..</string>
     <string name="explore_get_test_dash">Kunin ang Test Dash</string>
 
     <!-- Sync Status -->
diff --git a/features/exploredash/src/main/res/values-fr/strings-explore-dash.xml b/features/exploredash/src/main/res/values-fr/strings-explore-dash.xml
index bd37fe567a..8bdd83ddf1 100644
--- a/features/exploredash/src/main/res/values-fr/strings-explore-dash.xml
+++ b/features/exploredash/src/main/res/values-fr/strings-explore-dash.xml
@@ -160,6 +160,8 @@
     <!-- Explore TestNet -->
     <string name="explore_test_subtitle">Les dashs de test n\'ont pas de valeur réelle, mais vous pouvez les envoyer et recevoir avec d\'autres utilisateurs DashPay Alpha.</string>
     <string name="explore_test_dash_title">Comment puis-je obtenir des dashs de test ?</string>
+    <string name="explore_test_dash_text_1">Les dashs de test sont gratuits et peuvent être obtenus par ce qu\'on appelle un robinet.</string>
+    <string name="explore_test_dash_text_2">Cliquez sur le bouton ci-dessous pour copier une adresse Dash de ce portefeuille, de façon à ce que vous puissiez obtenir vos dashs de test.</string>
     <string name="explore_get_test_dash">Obtenir des dashs de test</string>
 
     <!-- Sync Status -->
diff --git a/features/exploredash/src/main/res/values-id/strings-explore-dash.xml b/features/exploredash/src/main/res/values-id/strings-explore-dash.xml
index 3d42f3371c..b8aa39284f 100644
--- a/features/exploredash/src/main/res/values-id/strings-explore-dash.xml
+++ b/features/exploredash/src/main/res/values-id/strings-explore-dash.xml
@@ -152,6 +152,8 @@
     <!-- Explore TestNet -->
     <string name="explore_test_subtitle">Test Dash tidak memiliki nilai apa pun di dunia nyata tetapi Anda dapat mengirim dan menerimanya dengan pengguna DashPay Alpha lainnya.</string>
     <string name="explore_test_dash_title">Bagaimana saya mendapatkan tes Dash?</string>
+    <string name="explore_test_dash_text_1">Test Dash gratis dan dapat diperoleh melalui apa yang disebut faucet.</string>
+    <string name="explore_test_dash_text_2">Klik tombol di bawah untuk menyalin alamat Dash dari dompet ini sehingga Anda bisa mendapatkan test Dash Anda.</string>
     <string name="explore_get_test_dash">Dapatkan Tes Dash</string>
 
     <!-- Sync Status -->
diff --git a/features/exploredash/src/main/res/values-it/strings-explore-dash.xml b/features/exploredash/src/main/res/values-it/strings-explore-dash.xml
index d3fd73d869..2b673e4a62 100644
--- a/features/exploredash/src/main/res/values-it/strings-explore-dash.xml
+++ b/features/exploredash/src/main/res/values-it/strings-explore-dash.xml
@@ -160,6 +160,8 @@
     <!-- Explore TestNet -->
     <string name="explore_test_subtitle">i Dash di Test non hanno alcun valore nel mondo reale ma puoi inviarli e riceverli con altri utenti DashPay Alpha.</string>
     <string name="explore_test_dash_title">Come posso ottenere Dash di Test?</string>
+    <string name="explore_test_dash_text_1">Test Dash è gratuito e può essere ottenuto da quello che viene chiamato faucet.</string>
+    <string name="explore_test_dash_text_2">Fai clic sul pulsante in basso per copiare un indirizzo Dash da questo portafoglio in modo da poter ottenere il tuo Dash di prova..</string>
     <string name="explore_get_test_dash">Ottieni Dash di Test</string>
 
     <!-- Sync Status -->
diff --git a/features/exploredash/src/main/res/values-ja/strings-explore-dash.xml b/features/exploredash/src/main/res/values-ja/strings-explore-dash.xml
index 6de00769f9..73fc56c328 100644
--- a/features/exploredash/src/main/res/values-ja/strings-explore-dash.xml
+++ b/features/exploredash/src/main/res/values-ja/strings-explore-dash.xml
@@ -152,6 +152,8 @@
     <!-- Explore TestNet -->
     <string name="explore_test_subtitle">テストDashは現実世界では何の価値もありませんが、他のDashPayのアルファユーザーと送受金ができます。</string>
     <string name="explore_test_dash_title">テストDashを取得するには</string>
+    <string name="explore_test_dash_text_1">テストDashは無料で、一般的にフォーセットから入手できます。</string>
+    <string name="explore_test_dash_text_2">以下のボタンをクリックして、このウォレットからDashアドレスをコピーすると、テストDashを入手できます。</string>
     <string name="explore_get_test_dash">テストDashを取得する</string>
 
     <!-- Sync Status -->
diff --git a/features/exploredash/src/main/res/values-ko/strings-explore-dash.xml b/features/exploredash/src/main/res/values-ko/strings-explore-dash.xml
index a8eef54879..9873abfa51 100644
--- a/features/exploredash/src/main/res/values-ko/strings-explore-dash.xml
+++ b/features/exploredash/src/main/res/values-ko/strings-explore-dash.xml
@@ -152,6 +152,8 @@
     <!-- Explore TestNet -->
     <string name="explore_test_subtitle">테스트 대시는 실생활에서 어떤 가치도 지니지 않으나 다른 대시페이 알파 사용자들과 주고 받을 수 있습니다.</string>
     <string name="explore_test_dash_title">테스트 대시는 어떻게 얻나요?</string>
+    <string name="explore_test_dash_text_1">테스트 대시는 무료이며, 파셋이라 불리는 것으로부터 얻을 수 있습니다.</string>
+    <string name="explore_test_dash_text_2">아래의 버튼을 클릭하여  이 지갑의 대시 주소를 복사하고 테스트 대시를 받으세요..</string>
     <string name="explore_get_test_dash">테스트 대시 얻기</string>
 
     <!-- Sync Status -->
diff --git a/features/exploredash/src/main/res/values-nl/strings-explore-dash.xml b/features/exploredash/src/main/res/values-nl/strings-explore-dash.xml
index eaa491121b..a8ab105b62 100644
--- a/features/exploredash/src/main/res/values-nl/strings-explore-dash.xml
+++ b/features/exploredash/src/main/res/values-nl/strings-explore-dash.xml
@@ -156,6 +156,8 @@
     <!-- Explore TestNet -->
     <string name="explore_test_subtitle">Test Dash heeft geen enkele waarde in de echte wereld, maar je kunt het verzenden en ontvangen met andere DashPay Alpha-gebruikers.</string>
     <string name="explore_test_dash_title">Hoe verkrijg ik test Dash?</string>
+    <string name="explore_test_dash_text_1">Test Dash is gratis en kan worden verkregen via een zogenaamde faucet.</string>
+    <string name="explore_test_dash_text_2">Klik op de onderstaande knop om een test ​​Dash adres van deze portemonnee te kopiëren, zodat je je test Dash kan ontvangen.</string>
     <string name="explore_get_test_dash">Verkrijg test Dash</string>
 
     <!-- Sync Status -->
diff --git a/features/exploredash/src/main/res/values-pl/strings-explore-dash.xml b/features/exploredash/src/main/res/values-pl/strings-explore-dash.xml
index 8c2c415688..8ad37654b7 100644
--- a/features/exploredash/src/main/res/values-pl/strings-explore-dash.xml
+++ b/features/exploredash/src/main/res/values-pl/strings-explore-dash.xml
@@ -164,6 +164,8 @@
     <!-- Explore TestNet -->
     <string name="explore_test_subtitle">Test Dash nie ma żadnej wartości w prawdziwym świecie, ale możesz go używać do robienia transakcji z innymi użytkownikami DashPay Alpha.</string>
     <string name="explore_test_dash_title">Jak mogę otrzymać Test Dash?</string>
+    <string name="explore_test_dash_text_1">Możesz otrzymać Testowe monety Dash za darmo z tak zwanego kranu</string>
+    <string name="explore_test_dash_text_2">Abyś mógł dostać testowe monety Dash, kliknij przycisk poniżej, aby skopiować adres Dash z tego portfela.</string>
     <string name="explore_get_test_dash">Otrzymaj Test Dash</string>
 
     <!-- Sync Status -->
diff --git a/features/exploredash/src/main/res/values-pt/strings-explore-dash.xml b/features/exploredash/src/main/res/values-pt/strings-explore-dash.xml
index 772fb7f8b4..fd44026845 100644
--- a/features/exploredash/src/main/res/values-pt/strings-explore-dash.xml
+++ b/features/exploredash/src/main/res/values-pt/strings-explore-dash.xml
@@ -160,6 +160,8 @@
     <!-- Explore TestNet -->
     <string name="explore_test_subtitle">O Dash de teste não tem valor no mundo real, mas você pode enviá-lo e recebê-lo com outros usuários do DashPay Alpha.</string>
     <string name="explore_test_dash_title">Como eu consigo Dash de teste?</string>
+    <string name="explore_test_dash_text_1">O Test Dash é gratuito e pode ser obtido no que chamamos de faucet.</string>
+    <string name="explore_test_dash_text_2">Clique no botão abaixo para copiar um endereço Dash desta carteira para que você possa receber seu Test Dash..</string>
     <string name="explore_get_test_dash">Obtenha Dash de teste</string>
 
     <!-- Sync Status -->
diff --git a/features/exploredash/src/main/res/values-ru/strings-explore-dash.xml b/features/exploredash/src/main/res/values-ru/strings-explore-dash.xml
index 093953ad45..cd73310a42 100644
--- a/features/exploredash/src/main/res/values-ru/strings-explore-dash.xml
+++ b/features/exploredash/src/main/res/values-ru/strings-explore-dash.xml
@@ -164,6 +164,8 @@
     <!-- Explore TestNet -->
     <string name="explore_test_subtitle">Тестовый Dash не обладает никакой ценностью в реальном мире, но вы можете обмениваться этими монетами с другими пользователями DashPay Alpha</string>
     <string name="explore_test_dash_title">Как получить тестовый Dash?</string>
+    <string name="explore_test_dash_text_1">Тестовый Dash распространяется бесплатно, его можно получить через так называемый кран.</string>
+    <string name="explore_test_dash_text_2">Нажмите на кнопку ниже, чтобы скопировать адрес Dash этого кошелька и получить тестовый Dash..</string>
     <string name="explore_get_test_dash">Получить тестовый Dash</string>
 
     <!-- Sync Status -->
diff --git a/features/exploredash/src/main/res/values-sk/strings-explore-dash.xml b/features/exploredash/src/main/res/values-sk/strings-explore-dash.xml
index ac3e4256ab..8a1be86f83 100644
--- a/features/exploredash/src/main/res/values-sk/strings-explore-dash.xml
+++ b/features/exploredash/src/main/res/values-sk/strings-explore-dash.xml
@@ -164,6 +164,8 @@
     <!-- Explore TestNet -->
     <string name="explore_test_subtitle">Testovací Dash nemá v skutočnom svete žiadnu hodnotu, ale môžete ho odosielať a prijímať s ostatnými používateľmi DashPay Alpha.</string>
     <string name="explore_test_dash_title">Ako získať testovací Dash?</string>
+    <string name="explore_test_dash_text_1">Testovací Dash je zadarmo a možno ho získať z toho, čo sa nazýva faucet.</string>
+    <string name="explore_test_dash_text_2">Kliknutím na tlačidlo nižšie skopírujete adresu Dash z tejto peňaženky, aby ste mohli získať svoj testovací Dash.</string>
     <string name="explore_get_test_dash">Získajte testovací Dash</string>
 
     <!-- Sync Status -->
diff --git a/features/exploredash/src/main/res/values-zh-rTW/strings-explore-dash.xml b/features/exploredash/src/main/res/values-zh-rTW/strings-explore-dash.xml
index 77a824058e..f4f7430249 100644
--- a/features/exploredash/src/main/res/values-zh-rTW/strings-explore-dash.xml
+++ b/features/exploredash/src/main/res/values-zh-rTW/strings-explore-dash.xml
@@ -152,6 +152,8 @@
     <!-- Explore TestNet -->
     <string name="explore_test_subtitle">測試用的達世幣在現實世界中沒有任何價值，但您可以與其他 DashPay Alpha 用戶一起發送和接收它。</string>
     <string name="explore_test_dash_title">如何才能索取測試的達世幣?</string>
+    <string name="explore_test_dash_text_1">測試達世幣是免費的，可以透過所謂的「水龍頭」獲得。</string>
+    <string name="explore_test_dash_text_2">點擊下面的按鈕從該錢包複製達世幣地址，以便您可以獲得測試達世幣。</string>
     <string name="explore_get_test_dash">索取測試的達世幣</string>
 
     <!-- Sync Status -->
diff --git a/features/exploredash/src/main/res/values-zh/strings-explore-dash.xml b/features/exploredash/src/main/res/values-zh/strings-explore-dash.xml
index 4206d282ca..7910a776fa 100644
--- a/features/exploredash/src/main/res/values-zh/strings-explore-dash.xml
+++ b/features/exploredash/src/main/res/values-zh/strings-explore-dash.xml
@@ -152,6 +152,8 @@
     <!-- Explore TestNet -->
     <string name="explore_test_subtitle">Test Dash没有任何实际价值, 但您可以与其他 DashPay 测试用户进行收发.</string>
     <string name="explore_test_dash_title">我如何获得 Test Dash?</string>
+    <string name="explore_test_dash_text_1">测试用的 Dash 是免费的, 可以通过所谓的「水龙头」获得.</string>
+    <string name="explore_test_dash_text_2">点击下面的按钮从此钱包复制 Dash 地址, 以便您可以获得测试用 Dash..</string>
     <string name="explore_get_test_dash">获得 Test Dash</string>
 
     <!-- Sync Status -->
diff --git a/integrations/crowdnode/src/main/res/values-fa/strings-crowdnode.xml b/integrations/crowdnode/src/main/res/values-fa/strings-crowdnode.xml
index f225445bb9..cce87b9893 100644
--- a/integrations/crowdnode/src/main/res/values-fa/strings-crowdnode.xml
+++ b/integrations/crowdnode/src/main/res/values-fa/strings-crowdnode.xml
@@ -142,6 +142,8 @@
     <string name="crowdnode_withdrawal_limits_message">با توجه به شرایط استفاده از کراودنود کاربران نمی‌توانند بیشتر از این میزان برداشت کنند: </string>
     <string name="crowdnode_withdraw_without_limits_online">برداشت بدون سیف با حساب آنلاین در وب‌سایت کراودنود</string>
     <string name="crowdnode_withdrawal_limits_error">این خطا احتمالا به دلیل فراتر رفتن از سقف برداشت کراودنود بوده است. لطفا دوباره امتحان کنید. </string>
+    <string name="crowdnode_withdrawal_limits_per_block_title">لطفاً پیش از آغاز برداشت بعدی منتظر بمانید</string>
+    <string name="crowdnode_withdrawal_limits_per_block_message">پیش از برداشت بعدی، باید ۵ دقیقه منتظر بمانید</string>
     <string name="per_transaction">به ازای هر تراکنش</string>
     <string name="per_hour">هر ساعت</string>
     <string name="per_day">هر ۲۴ ساعت</string>
diff --git a/wallet/AndroidManifest.xml b/wallet/AndroidManifest.xml
index 2d0bed38d0..caba3de167 100644
--- a/wallet/AndroidManifest.xml
+++ b/wallet/AndroidManifest.xml
@@ -415,11 +415,33 @@
             android:exported="false"
             android:foregroundServiceType="dataSync" />
 
+        <!-- WorkManager -->
+        <service
+            android:name="androidx.work.impl.foreground.SystemForegroundService"
+            android:foregroundServiceType="dataSync"
+            android:exported="false" />
+
         <!--service
             android:name="de.schildbach.wallet.offline.AcceptBluetoothService"
             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">
+            <intent-filter>
+                <action android:name="com.google.android.gms.metadata.MODULE_DEPENDENCIES" />
+            </intent-filter>
+
+            <meta-data android:name="photopicker_activity:0:required" android:value="" />
+        </service>
+
         <receiver
             android:name="de.schildbach.wallet.service.BootstrapReceiver"
             android:exported="true">
diff --git a/wallet/CHANGES b/wallet/CHANGES
index 9012be115d..11e6ed26f1 100644
--- a/wallet/CHANGES
+++ b/wallet/CHANGES
@@ -1,4 +1,22 @@
 Dash Wallet
+v11.0.3
+* Improve Username Voting screen
+* UI fixes
+* Update translations
+* Fix Username request and recover bugs
+* Fix CrowdNode signup on Android 14
+
+v11.0.2
+* Fix username requests
+* Add DashPay Event tracking
+
+v11.0.1
+* Fix UI items
+
+v11.0.0
+* DashPay
+* use dashj 21.1.1
+
 v10.3.2
 * Fix ANR when using CoinJoin
 * Fix missing Send button on Home Screen
diff --git a/wallet/androidTest/de/schildbach/wallet/database/DatabaseMigrationTest.kt b/wallet/androidTest/de/schildbach/wallet/database/DatabaseMigrationTest.kt
index ff557151df..cb081b2076 100644
--- a/wallet/androidTest/de/schildbach/wallet/database/DatabaseMigrationTest.kt
+++ b/wallet/androidTest/de/schildbach/wallet/database/DatabaseMigrationTest.kt
@@ -60,7 +60,8 @@ open class DatabaseMigrationTest {
 
     private val migrations = arrayOf(
         AppDatabaseMigrations.migration11To12,
-        AppDatabaseMigrations.migration12To13
+        AppDatabaseMigrations.migration12To13,
+        AppDatabaseMigrations.migration13to14
     )
 
     @Rule
diff --git a/wallet/build.gradle b/wallet/build.gradle
index 97d2f58911..d6e7624488 100644
--- a/wallet/build.gradle
+++ b/wallet/build.gradle
@@ -51,9 +51,9 @@ dependencies {
 
     implementation 'org.bouncycastle:bcprov-jdk15to18:1.74'
     implementation "org.dashj:dashj-core:$dashjVersion"
-    implementation 'org.dashj.platform:dash-sdk-java:1.0-SNAPSHOT'
-    implementation 'org.dashj.platform:dash-sdk-kotlin:1.0-SNAPSHOT'
-    implementation 'org.dashj.platform:dash-sdk-android:1.0-SNAPSHOT'
+    implementation "org.dashj.platform:dash-sdk-java:$dppVersion"
+    implementation "org.dashj.platform:dash-sdk-kotlin:$dppVersion"
+    implementation "org.dashj.platform:dash-sdk-android:$dppVersion"
     implementation 'io.grpc:grpc-stub:1.54.0' // CURRENT_GRPC_VERSION
     implementation "org.dashj.android:dashj-bls-android:1.0.0"
     implementation "org.dashj.android:dashj-x11-android:0.17.5"
@@ -70,7 +70,9 @@ dependencies {
     implementation 'com.tbuonomo:dotsindicator:4.2'
     implementation 'com.github.amulyakhare:textdrawable:558677ea31'
 
+    // google play services
     implementation 'com.google.android.gms:play-services-auth:19.0.0'
+    implementation 'com.google.android.gms:play-services-base:18.5.0'
 
     // Network
     implementation "com.squareup.okhttp3:okhttp:$ok_http_version"
@@ -205,8 +207,9 @@ android {
         compileSdk 34
         minSdkVersion 24
         targetSdkVersion 34
-        versionCode project.hasProperty('versionCode') ? project.property('versionCode') as int : 103020
-        versionName project.hasProperty('versionName') ? project.property('versionName') : "10.3.2"
+        // version code: MMmmppbb; MM = Major Version, mm = minor version, pp == patch version, bb = build
+        versionCode project.hasProperty('versionCode') ? project.property('versionCode') as int : 11000312
+        versionName project.hasProperty('versionName') ? project.property('versionName') : "11.0.3"
         multiDexEnabled true
         generatedDensities = ['hdpi', 'xhdpi']
         vectorDrawables.useSupportLibrary = true
@@ -343,16 +346,16 @@ android {
         }
         staging {
             applicationId = "org.dash.dashpay.testnet"
-            def imgurClientId = props.getProperty("UPHOLD_CLIENT_ID_SANDBOX")
-            def imgurClientSecret = props.getProperty("UPHOLD_CLIENT_SECRET_SANDBOX")
-            if (imgurClientId == null) {
-                imgurClientId = "\"UPHOLD_CLIENT_ID\""
+            def upholdClientId = props.getProperty("UPHOLD_CLIENT_ID_SANDBOX")
+            def upholdClientSecret = props.getProperty("UPHOLD_CLIENT_SECRET_SANDBOX")
+            if (upholdClientId == null) {
+                upholdClientId = "\"UPHOLD_CLIENT_ID\""
             }
-            if (imgurClientSecret == null) {
-                imgurClientSecret = "\"UPHOLD_CLIENT_SECRET\""
+            if (upholdClientSecret == null) {
+                upholdClientSecret = "\"UPHOLD_CLIENT_SECRET\""
             }
-            buildConfigField("String", "UPHOLD_CLIENT_ID", imgurClientId)
-            buildConfigField("String", "UPHOLD_CLIENT_SECRET", imgurClientSecret)
+            buildConfigField("String", "UPHOLD_CLIENT_ID", upholdClientId)
+            buildConfigField("String", "UPHOLD_CLIENT_SECRET", upholdClientSecret)
             def topperKeyId = props.getProperty("TOPPER_KEY_ID_SANDBOX", "\"TOPPER_KEY_ID\"")
             def topperWidgetId = props.getProperty("TOPPER_WIDGET_ID_SANDBOX", "\"TOPPER_WIDGET_ID\"")
             def topperPrivateKey = props.getProperty("TOPPER_PRIVATE_KEY_SANDBOX", "\"TOPPER_PRIVATE_KEY\"")
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/drawable/ic_join_dashpay.xml b/wallet/res/drawable/ic_join_dashpay.xml
new file mode 100644
index 0000000000..0ecca52e5f
--- /dev/null
+++ b/wallet/res/drawable/ic_join_dashpay.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M1.366,1.366C0.862,0.862 0,1.219 0,1.931V18.069C0,18.781 0.862,19.138 1.366,18.634L10,10L1.366,1.366Z"
+      android:fillColor="#008DE4"/>
+  <path
+      android:pathData="M10.663,1.326C10.498,0.996 10,1.113 10,1.483V18.517C10,18.887 10.498,19.004 10.663,18.674L15,10L10.663,1.326Z"
+      android:fillColor="#008DE4"/>
+  <path
+      android:pathData="M15.392,1.305C15.325,1.085 15,1.132 15,1.363V18.637C15,18.868 15.325,18.916 15.392,18.695L18,10L15.392,1.305Z"
+      android:fillColor="#008DE4"/>
+  <path
+      android:pathData="M18.257,1.287C18.227,1.133 18,1.156 18,1.313V18.687C18,18.844 18.227,18.867 18.257,18.713L20,10L18.257,1.287Z"
+      android:fillColor="#008DE4"/>
+</vector>
diff --git a/wallet/res/drawable/ic_join_dashpay_red.xml b/wallet/res/drawable/ic_join_dashpay_red.xml
new file mode 100644
index 0000000000..ebe9233a5c
--- /dev/null
+++ b/wallet/res/drawable/ic_join_dashpay_red.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M1.366,1.366C0.862,0.862 0,1.219 0,1.931V18.069C0,18.781 0.862,19.138 1.366,18.634L10,10L1.366,1.366Z"
+      android:fillColor="#EA3943"/>
+  <path
+      android:pathData="M10.663,1.326C10.498,0.996 10,1.113 10,1.483V18.517C10,18.887 10.498,19.004 10.663,18.674L15,10L10.663,1.326Z"
+      android:fillColor="#EA3943"/>
+  <path
+      android:pathData="M15.392,1.305C15.325,1.085 15,1.132 15,1.363V18.637C15,18.868 15.325,18.916 15.392,18.695L18,10L15.392,1.305Z"
+      android:fillColor="#EA3943"/>
+  <path
+      android:pathData="M18.257,1.287C18.227,1.133 18,1.156 18,1.313V18.687C18,18.844 18.227,18.867 18.257,18.713L20,10L18.257,1.287Z"
+      android:fillColor="#EA3943"/>
+</vector>
diff --git a/wallet/res/drawable/ic_red_circle_minus.xml b/wallet/res/drawable/ic_red_circle_minus.xml
new file mode 100644
index 0000000000..32ec430cf0
--- /dev/null
+++ b/wallet/res/drawable/ic_red_circle_minus.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="M5.5,11.5C4.748,11.5 4.039,11.356 3.375,11.067C2.71,10.783 2.125,10.387 1.619,9.88C1.113,9.374 0.715,8.79 0.427,8.129C0.142,7.464 0,6.754 0,5.997C0,5.245 0.142,4.538 0.427,3.876C0.715,3.212 1.111,2.626 1.614,2.12C2.12,1.613 2.705,1.218 3.37,0.933C4.034,0.644 4.742,0.5 5.495,0.5C6.247,0.5 6.955,0.644 7.62,0.933C8.288,1.218 8.873,1.613 9.376,2.12C9.882,2.626 10.279,3.212 10.568,3.876C10.856,4.538 11,5.245 11,5.997C11,6.754 10.856,7.464 10.568,8.129C10.279,8.79 9.882,9.374 9.376,9.88C8.873,10.387 8.29,10.783 7.625,11.067C6.961,11.356 6.252,11.5 5.5,11.5ZM5.5,10.292C6.094,10.292 6.65,10.181 7.166,9.959C7.687,9.738 8.144,9.432 8.537,9.041C8.931,8.648 9.239,8.192 9.46,7.675C9.682,7.155 9.792,6.595 9.792,5.997C9.792,5.403 9.68,4.847 9.455,4.33C9.233,3.81 8.926,3.352 8.532,2.959C8.142,2.565 7.687,2.257 7.166,2.035C6.65,1.814 6.092,1.703 5.495,1.703C4.901,1.703 4.343,1.814 3.823,2.035C3.306,2.257 2.851,2.565 2.457,2.959C2.067,3.352 1.761,3.81 1.54,4.33C1.322,4.847 1.213,5.403 1.213,5.997C1.213,6.595 1.322,7.155 1.54,7.675C1.761,8.192 2.069,8.648 2.463,9.041C2.856,9.432 3.312,9.738 3.828,9.959C4.349,10.181 4.906,10.292 5.5,10.292ZM3.549,6.535C3.384,6.535 3.247,6.488 3.138,6.393C3.032,6.298 2.979,6.17 2.979,6.008C2.979,5.846 3.032,5.716 3.138,5.618C3.243,5.519 3.38,5.47 3.549,5.47H7.451C7.62,5.47 7.757,5.519 7.862,5.618C7.968,5.716 8.021,5.846 8.021,6.008C8.021,6.17 7.966,6.298 7.857,6.393C7.752,6.488 7.616,6.535 7.451,6.535H3.549Z"
+      android:fillColor="#EA3943"/>
+</vector>
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/layout/block_username_request_view.xml b/wallet/res/layout/block_username_request_view.xml
new file mode 100644
index 0000000000..326c8ed4e0
--- /dev/null
+++ b/wallet/res/layout/block_username_request_view.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2024 Dash Core Group.
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:clickable="true"
+    android:focusable="true"
+    android:background="?attr/selectableItemBackground"
+    tools:context="de.schildbach.wallet.ui.username.adapters.UsernameRequestViewHolder">
+
+    <TextView
+        android:id="@+id/block_description"
+        style="@style/Overline"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:paddingVertical="3dp"
+        android:layout_marginStart="15dp"
+        android:text="Is this username inappropriate? Block its creation on the Dash network."
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/blocked_container"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <LinearLayout
+        android:id="@+id/blocked_container"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:orientation="horizontal"
+        android:layout_marginHorizontal="8dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        >
+        <ImageView
+            android:id="@+id/block_icon"
+            android:layout_width="28dp"
+            android:layout_height="20dp"
+            android:src="@drawable/ic_red_circle_minus"
+            android:layout_marginEnd="3dp"
+            android:padding="3dp"
+            app:layout_constraintTop_toBottomOf="@id/date_registered"
+            app:layout_constraintStart_toStartOf="@id/date_registered"
+            app:layout_constraintBottom_toBottomOf="parent" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="6dp"
+            android:text="@string/block"
+            style="@style/Body2.Medium.Red"
+        />
+
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/wallet/res/layout/contact_request_view.xml b/wallet/res/layout/contact_request_view.xml
index dbff551c6f..2183c19f6e 100644
--- a/wallet/res/layout/contact_request_view.xml
+++ b/wallet/res/layout/contact_request_view.xml
@@ -61,7 +61,9 @@
                 android:layout_height="wrap_content"
                 android:text="@string/send_contact_request"
                 android:textColor="@color/dash_white"
-                android:textSize="14sp" />
+                android:textSize="14sp"
+                android:maxLines="1"
+                android:ellipsize="end" />
 
         </LinearLayout>
     </FrameLayout>
@@ -101,6 +103,8 @@
             android:layout_marginEnd="30dp"
             android:paddingStart="26dp"
             android:paddingEnd="26dp"
+            android:maxLines="1"
+            android:ellipsize="end"
             android:text="@string/pay" />
 
     </FrameLayout>
@@ -135,22 +139,26 @@
         <Button
             android:id="@+id/accept"
             style="@style/Button.Primary.Green"
-            android:layout_width="100dp"
+            android:layout_width="120dp"
             android:layout_height="39dp"
             android:layout_marginTop="14dp"
             android:layout_marginEnd="5dp"
             android:text="@string/contact_request_accept"
+            android:maxLines="1"
+            android:ellipsize="end"
             app:layout_constraintEnd_toStartOf="@id/request_buttons_guide"
             app:layout_constraintTop_toBottomOf="@id/request_received_pane_title" />
 
         <Button
             android:id="@+id/ignore"
             style="@style/Button.Tertiary"
-            android:layout_width="100dp"
+            android:layout_width="120dp"
             android:layout_height="39dp"
             android:layout_marginStart="5dp"
             android:layout_marginTop="14dp"
             android:text="@string/contact_request_ignore"
+            android:maxLines="1"
+            android:ellipsize="end"
             app:layout_constraintStart_toEndOf="@id/request_buttons_guide"
             app:layout_constraintTop_toBottomOf="@id/request_received_pane_title" />
 
@@ -214,6 +222,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/send_contact_request"
+                android:maxLines="1"
+                android:ellipsize="end"
                 android:textColor="@color/inverted_button"
                 android:textSize="14sp" />
 
diff --git a/wallet/res/layout/dialog_confirm_transaction.xml b/wallet/res/layout/dialog_confirm_transaction.xml
index 02dc23a398..7ac8fc9e95 100644
--- a/wallet/res/layout/dialog_confirm_transaction.xml
+++ b/wallet/res/layout/dialog_confirm_transaction.xml
@@ -232,38 +232,45 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginTop="30dp"
-        android:layout_marginBottom="15dp">
+        android:orientation="vertical" >
 
-        <Button
-            android:id="@+id/dismiss_btn"
-            style="@style/Button.Primary.Large.Grey"
-            android:layout_width="0dp"
+        <de.schildbach.wallet.ui.widget.StyledCheckBox
+            android:id="@+id/confirm_auto_accept"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="15dp"
-            android:layout_weight="1"
-            android:text="@string/cancel" />
+            android:layout_gravity="center_horizontal"
+            android:layout_margin="10dp"
+            android:button="@drawable/round_checkbox"
+            android:padding="6dp"
+            android:text="@string/dialog_confirm_accept_contact_request"
+            android:textSize="16sp" />
 
-    <de.schildbach.wallet.ui.widget.StyledCheckBox
-        android:id="@+id/confirm_auto_accept"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_margin="10dp"
-        android:button="@drawable/round_checkbox"
-        android:padding="6dp"
-        android:text="@string/dialog_confirm_accept_contact_request"
-        android:textSize="16sp" />
-
-        <Button
-            android:id="@+id/confirm_payment"
-            style="@style/Button.Primary.Large.Blue"
-            android:layout_width="0dp"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="15dp"
-            android:layout_weight="1"
-            android:text="@string/confirm" />
+            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/confirm_payment"
+                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/confirm" />
+        </LinearLayout>
     </LinearLayout>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/wallet/res/layout/dialog_mix_dash_first.xml b/wallet/res/layout/dialog_mix_dash_first.xml
new file mode 100644
index 0000000000..a6aad061c7
--- /dev/null
+++ b/wallet/res/layout/dialog_mix_dash_first.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 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 <https://www.gnu.org/licenses/>.
+  -->
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <View
+        android:id="@+id/drag_indicator"
+        android:layout_width="40dp"
+        android:layout_height="4dp"
+        android:layout_gravity="center"
+        android:layout_marginTop="15dp"
+        android:background="@drawable/rounded_background"
+        android:theme="@style/DragIndicatorBackground"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:background="@color/light_gray" />
+
+    <ImageButton
+        android:id="@+id/collapse_button"
+        style="@style/DialogCloseButton"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+
+    <LinearLayout
+        android:id="@+id/text_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="20dp"
+        android:orientation="vertical"
+        app:layout_constraintTop_toBottomOf="@id/collapse_button"
+        app:layout_constraintBottom_toTopOf="@+id/bottom_buttons"
+        >
+        <TextView
+            style="@style/Headline5"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/mix_dash_title"
+            />
+        <TextView
+            style="@style/Body2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/mix_dash_message"
+            />
+
+
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/bottom_buttons"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:orientation="horizontal"
+        >
+        <Button
+            android:id="@+id/skip_button"
+            android:layout_marginHorizontal="15dp"
+            android:layout_marginVertical="15dp"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            style="@style/Button.Tertiary.Blue"
+            android:text="@string/button_skip"
+             />
+
+        <Button
+            android:id="@+id/mix_button"
+            android:layout_marginHorizontal="15dp"
+            android:layout_marginVertical="15dp"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            style="@style/Button.Primary.Blue"
+            android:text="@string/mix_dash_mix"
+            />
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/wallet/res/layout/fragment_add_voting_keys.xml b/wallet/res/layout/fragment_add_voting_keys.xml
index 7bcf001a80..2ca7731516 100644
--- a/wallet/res/layout/fragment_add_voting_keys.xml
+++ b/wallet/res/layout/fragment_add_voting_keys.xml
@@ -58,16 +58,7 @@
                 tools:itemCount="5"
                 tools:listitem="@layout/view_masternode_ip" />
 
-            <TextView
-                android:id="@+id/votes_cast_text"
-                style="@style/Overline.Secondary"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
-                android:gravity="center"
-                android:textAlignment="gravity"
-                tools:text="@string/multiple_votes_cast" />
-        </LinearLayout>
+            </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 
     <LinearLayout
@@ -81,7 +72,7 @@
         android:paddingEnd="20dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/submit_button">
+        app:layout_constraintBottom_toTopOf="@id/dont_ask_again_button">
 
         <ImageView
             android:layout_width="wrap_content"
@@ -98,6 +89,27 @@
             android:layout_height="wrap_content" />
     </LinearLayout>
 
+    <LinearLayout
+        android:id="@+id/dont_ask_again_button"
+        style="@style/Button.Tertiary.Large.Blue"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginHorizontal="15dp"
+        android:layout_marginBottom="10dp"
+        android:paddingEnd="20dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/submit_button">
+
+        <TextView
+            style="@style/Subtitle2.Blue"
+            android:textSize="15sp"
+            android:text="@string/dont_ask_again"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+    </LinearLayout>
+
     <Button
         android:id="@+id/submit_button"
         style="@style/Button.Primary.Large.Blue"
@@ -105,5 +117,21 @@
         android:layout_height="wrap_content"
         android:layout_margin="15dp"
         android:text="@string/submit"
-        app:layout_constraintBottom_toBottomOf="parent" />
+        app:layout_constraintBottom_toTopOf="@id/votes_cast_text" />
+
+    <TextView
+        android:id="@+id/votes_cast_text"
+        style="@style/Overline.Secondary"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        android:layout_marginHorizontal="15dp"
+        android:layout_marginBottom="15dp"
+        android:gravity="center"
+        android:textAlignment="gravity"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        tools:text="@string/multiple_votes_cast" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/wallet/res/layout/fragment_more.xml b/wallet/res/layout/fragment_more.xml
index 6a3a64d745..6bf31a746d 100644
--- a/wallet/res/layout/fragment_more.xml
+++ b/wallet/res/layout/fragment_more.xml
@@ -120,6 +120,7 @@
                         app:layout_constraintVertical_bias="0"
                         tools:src="@drawable/user5" />
 
+                    <!-- QR code button currently hidden -->
                     <ImageButton
                         android:id="@+id/profile_qr_icon"
                         android:layout_width="wrap_content"
@@ -127,7 +128,8 @@
                         android:background="@drawable/transparent_button_background"
                         app:layout_constraintBottom_toBottomOf="@id/dashpayUserAvatar"
                         app:layout_constraintEnd_toEndOf="@id/dashpayUserAvatar"
-                        app:srcCompat="@drawable/ic_profile_qr" />
+                        app:srcCompat="@drawable/ic_profile_qr"
+                        android:visibility="gone"/>
 
                     <TextView
                         android:id="@+id/username1"
@@ -179,59 +181,90 @@
 
             </ViewFlipper>
 
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/requested_username_container"
-                android:visibility="gone"
-                tools:visibility="visible"
-                android:layout_height="110dp"
-                style="@style/MenuRow">
-
-                <ImageView
-                    android:id="@+id/requested_username_icon"
-                    style="@style/MenuRowIcon"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:srcCompat="@drawable/ic_avatar_blue" />
-
-                <TextView
-                    android:id="@+id/requested_username_title"
-                    style="@style/MenuRowTitle"
-                    app:layout_constraintStart_toEndOf="@+id/requested_username_icon"
-                    app:layout_constraintTop_toTopOf="@+id/requested_username_icon"
-                    tools:text="@string/shortcut_action_join_dashpay" />
-
-                <TextView
-                    android:id="@+id/requested_username_subtitle"
-                    style="@style/MenuRowSubTitle"
-                    android:text="@string/requested_username_has_been"
-                    app:layout_constraintStart_toStartOf="@+id/requested_username_title"
-                    app:layout_constraintTop_toBottomOf="@+id/requested_username_title" />
-
-
-                <TextView
-                    android:id="@+id/requested_username_subtitle_two"
-                    style="@style/MenuRowSubTitle"
-                    android:text="@string/requested_voting_duration"
-                    app:layout_constraintStart_toStartOf="@+id/requested_username_subtitle"
-                    app:layout_constraintTop_toBottomOf="@+id/requested_username_subtitle" />
-
-                <ImageView
-                    android:id="@+id/requested_username_arrow"
-                    style="@style/MenuRowArrow"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:srcCompat="@drawable/ic_menu_row_arrow" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:animateLayoutChanges="true"
                 android:orientation="vertical"
-                android:paddingTop="20dp">
+                android:paddingTop="0dp">
+
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/requested_username_container"
+                    style="@style/MenuRow"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone"
+                    tools:visibility="visible">
+
+                    <ImageView
+                        android:id="@+id/requested_username_icon"
+                        style="@style/MenuRowIcon"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:srcCompat="@drawable/ic_join_dashpay" />
+
+                    <LinearLayout
+                        android:id="@+id/join_dashpay_text_section"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16dp"
+                        android:orientation="vertical"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toStartOf="@+id/request_button_container"
+                        app:layout_constraintStart_toEndOf="@+id/requested_username_icon"
+                        app:layout_constraintTop_toTopOf="parent">
+
+                        <TextView
+                            android:id="@+id/requested_username_title"
+                            style="@style/MenuRowTitle"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="0dp"
+                            tools:text="requested-username" />
+
+                        <TextView
+                            android:id="@+id/requested_username_subtitle"
+                            style="@style/MenuRowSubTitle"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:maxLines="3"
+                            android:text="@string/requested_username_has_been" />
+
+                        <TextView
+                            android:id="@+id/requested_username_subtitle_two"
+                            style="@style/MenuRowSubTitle"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/requested_voting_duration" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/request_button_container"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent">
+
+                        <TextView
+                            android:id="@+id/retry_request_button"
+                            style="@style/Overline.SemiBold.Blue"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="12dp"
+                            android:layout_marginEnd="20dp"
+                            android:text="@string/retry" />
+
+                        <ImageView
+                            android:id="@+id/requested_username_arrow"
+                            style="@style/MenuRowArrow"
+                            app:srcCompat="@drawable/ic_menu_row_arrow" />
+                    </LinearLayout>
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/invite"
diff --git a/wallet/res/layout/fragment_payments_pay.xml b/wallet/res/layout/fragment_payments_pay.xml
index 5ecadca6a8..30674ab037 100644
--- a/wallet/res/layout/fragment_payments_pay.xml
+++ b/wallet/res/layout/fragment_payments_pay.xml
@@ -34,36 +34,33 @@
                 android:paddingHorizontal="15dp"
                 android:paddingBottom="10dp">
 
-                <ImageView
-                    android:layout_width="34dp"
-                    android:layout_height="34dp"
-                    android:padding="9dp"
-                    android:src="@drawable/ic_payments_send_to_contact"
-                    android:background="@drawable/rounded_background"
-                    android:theme="@style/EncircledIconBlueTheme"
-                    app:tint="@android:color/white"
-                    tools:background="@color/dash_blue" />
-
-                <TextView
-                    style="@style/Body2.Medium"
-                    android:layout_width="wrap_content"
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="15dp"
-                    android:text="@string/payments_pay_to_contact_title"
-                    android:layout_gravity="center_vertical" />
+                    android:orientation="horizontal" >
+                    <ImageView
+                        android:layout_width="34dp"
+                        android:layout_height="34dp"
+                        android:padding="9dp"
+                        android:src="@drawable/ic_payments_send_to_contact"
+                        android:background="@drawable/rounded_background"
+                        android:theme="@style/EncircledIconBlueTheme"
+                        app:tint="@android:color/white"
+                        tools:background="@color/dash_blue" />
 
-                <FrameLayout
-                    android:id="@+id/frequent_contacts_rv_top_line"
-                    android:layout_width="match_parent"
-                    android:layout_height="1px"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginEnd="16dp"
-                    android:background="@color/dash_gray" />
+                    <TextView
+                        style="@style/Body2.Medium"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="15dp"
+                        android:text="@string/payments_pay_to_contact_title"
+                        android:layout_gravity="center_vertical" />
+                </LinearLayout>
 
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/frequent_contacts_rv"
-                    android:layout_width="match_parent"
-                    android:layout_height="84dp" />
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/frequent_contacts_rv"
+                        android:layout_width="match_parent"
+                        android:layout_height="84dp" />
             </LinearLayout>
 
             <LinearLayout
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 14d14fb8b4..ccdf0216de 100644
--- a/wallet/res/layout/fragment_username_voting_info.xml
+++ b/wallet/res/layout/fragment_username_voting_info.xml
@@ -61,21 +61,22 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 app:srcCompat ="@drawable/ic_voting_icon"
-                app:layout_constraintEnd_toStartOf="@id/create_a_username_title"
+                android:layout_marginTop="10dp"
+                android:layout_marginStart="15dp"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintBottom_toBottomOf="@id/create_a_username_title"
-                app:layout_constraintTop_toTopOf="@id/create_a_username_title" />
+                app:layout_constraintTop_toTopOf="parent" />
 
             <TextView
                 android:id="@+id/create_a_username_title"
                 style="@style/Subtitle2"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="63dp"
-                android:layout_marginTop="14dp"
+                android:layout_marginStart="20dp"
                 android:text="@string/voting_requirement_title"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintBottom_toBottomOf="@id/create_a_username_icon"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/create_a_username_icon"
+                app:layout_constraintTop_toTopOf="@id/create_a_username_icon" />
 
             <TextView
                 android:id="@+id/create_a_username_subtitle"
@@ -104,21 +105,22 @@
                 android:layout_width="30dp"
                 android:layout_height="30dp"
                 android:layout_marginTop="10dp"
+                android:layout_marginStart="15dp"
                 app:srcCompat ="@drawable/ic_error"
-                app:layout_constraintEnd_toStartOf="@id/blocked_title"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
             <TextView
                 android:id="@+id/blocked_title"
                 style="@style/Subtitle2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="63dp"
-                android:layout_marginTop="14dp"
+                android:layout_width="0dp"
+                android:layout_height="43dp"
+                android:layout_marginStart="20dp"
                 android:text="@string/usernames_blocked_title"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintBottom_toBottomOf="@id/blocked_icon"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/blocked_icon"
+                app:layout_constraintTop_toTopOf="@id/blocked_icon" />
 
             <TextView
                 android:id="@+id/blocked_subtitle"
@@ -127,6 +129,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="2dp"
                 android:text="@string/usernames_blocked_subtitle"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="@+id/blocked_title"
                 app:layout_constraintTop_toBottomOf="@+id/blocked_title" />
@@ -140,6 +143,7 @@
             android:layout_marginTop="10dp"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
+            android:visibility="gone"
             android:focusable="true">
 
             <ImageView
@@ -147,9 +151,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 app:srcCompat ="@drawable/ic_face_sad"
-                app:layout_constraintEnd_toStartOf="@id/request_not_approved_title"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="@+id/request_not_approved_title" />
+                app:layout_constraintTop_toTopOf="parent" />
 
             <TextView
                 android:id="@+id/request_not_approved_title"
@@ -159,8 +162,11 @@
                 android:layout_marginStart="63dp"
                 android:layout_marginTop="14dp"
                 android:text="@string/case_your_request_is_not_approved"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintBottom_toBottomOf="@id/request_not_approved_icon"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/request_not_approved_icon"
+                app:layout_constraintTop_toTopOf="@id/request_not_approved_icon"
+                />
 
             <TextView
                 android:id="@+id/request_not_approved_subtitle"
@@ -196,11 +202,11 @@
             <TextView
                 android:id="@+id/passphrase_title"
                 style="@style/Subtitle2"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="63dp"
-                android:layout_marginTop="14dp"
                 android:text="@string/keep_your_passphrase_safe"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/wallet/res/layout/fragment_voting_request_details.xml b/wallet/res/layout/fragment_voting_request_details.xml
index 5fcf116b9a..aa53dc6076 100644
--- a/wallet/res/layout/fragment_voting_request_details.xml
+++ b/wallet/res/layout/fragment_voting_request_details.xml
@@ -98,7 +98,7 @@
                     android:text="@string/link" />
 
                 <LinearLayout
-                    android:id="@+id/verfiy_now_layout"
+                    android:id="@+id/verify_now_layout"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
diff --git a/wallet/res/layout/notification_contact_request_received_row.xml b/wallet/res/layout/notification_contact_request_received_row.xml
index 42ee7c6176..e767801171 100644
--- a/wallet/res/layout/notification_contact_request_received_row.xml
+++ b/wallet/res/layout/notification_contact_request_received_row.xml
@@ -63,11 +63,14 @@
             android:id="@+id/accept_contact_request"
             style="@style/Button.Primary.ExtraSmall.Blue"
             android:paddingHorizontal="0dp"
-            android:layout_width="67dp"
+            android:layout_width="wrap_content"
             android:layout_height="30dp"
             android:layout_gravity="center_vertical"
             android:layout_weight="1"
             android:text="@string/contact_request_accept"
+            android:maxWidth="80dp"
+            android:maxLines="1"
+            android:ellipsize="end"
             android:textAllCaps="false" />
 
         <ImageButton
diff --git a/wallet/res/layout/profile_picture_state_dialog.xml b/wallet/res/layout/profile_picture_state_dialog.xml
index 659f90a86f..eec535dc74 100644
--- a/wallet/res/layout/profile_picture_state_dialog.xml
+++ b/wallet/res/layout/profile_picture_state_dialog.xml
@@ -77,6 +77,8 @@
             android:layout_marginTop="30dp"
             android:layout_marginBottom="32dp"
             android:text="@string/profile_picture_upload_try_again"
+            android:maxLines="1"
+            android:ellipsize="end"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -92,6 +94,8 @@
             android:layout_marginBottom="32dp"
             android:background="@drawable/white_button_background_no_shadow"
             android:text="@string/button_cancel"
+            android:maxLines="1"
+            android:ellipsize="end"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/wallet/res/layout/update_profile_error.xml b/wallet/res/layout/update_profile_error.xml
index eaa5cc0738..d40f70a95b 100644
--- a/wallet/res/layout/update_profile_error.xml
+++ b/wallet/res/layout/update_profile_error.xml
@@ -29,6 +29,7 @@
         android:layout_marginTop="14dp"
         android:layout_marginEnd="20dp"
         android:gravity="center"
+        android:textAlignment="center"
         android:text="@string/error_updating_profile_msg"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -60,17 +61,25 @@
         <Button
             android:id="@+id/error_try_again"
             style="@style/Button.Primary.Blue"
-            android:layout_width="110dp"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginStart="15dp"
             android:layout_marginEnd="5dp"
-            android:layout_height="40dp"
-            android:text="@string/error_updating_profile_try_again"/>
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:minWidth="110dp"
+            android:text="@string/error_updating_profile_try_again" />
 
         <Button
             android:id="@+id/cancel"
             style="@style/Button.Secondary.Blue"
+            android:layout_marginEnd="15dp"
             android:layout_marginStart="5dp"
-            android:layout_width="110dp"
+            android:minWidth="110dp"
+            android:layout_width="wrap_content"
             android:layout_height="40dp"
+            android:maxLines="1"
+            android:ellipsize="end"
             android:text="@string/error_updating_profile_cancel"/>
 
     </LinearLayout>
diff --git a/wallet/res/layout/upload_policy_dialog.xml b/wallet/res/layout/upload_policy_dialog.xml
index 5bac580da9..9a4f221d7e 100644
--- a/wallet/res/layout/upload_policy_dialog.xml
+++ b/wallet/res/layout/upload_policy_dialog.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/transaction_details_dialog_container"
     android:layout_width="match_parent"
@@ -18,13 +19,18 @@
         <TextView
             android:id="@+id/title"
             style="@style/Headline6"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="32dp"
+            android:layout_marginHorizontal="26dp"
             android:text="@string/picture_upload_policy"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            android:maxLines="2"
+            android:ellipsize="end"
+            android:textAlignment="center"
+            tools:text="A very long title of this dialogue, ok, very, very long title, so long that it will be " />
 
         <ImageView
             android:id="@+id/icon_1"
@@ -106,18 +112,26 @@
             <Button
                 android:id="@+id/agree_btn"
                 style="@style/Button.Primary.Blue"
-                android:layout_width="110dp"
-                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:minWidth="100dp"
                 android:layout_marginEnd="5dp"
-                android:text="@string/agree" />
+                android:layout_marginStart="10dp"
+                android:text="@string/agree"
+                android:singleLine="true"
+                android:ellipsize="end" />
 
             <Button
                 android:id="@+id/cancel_btn"
                 style="@style/Button.Secondary.Blue"
-                android:layout_width="110dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:minWidth="100dp"
                 android:layout_marginStart="5dp"
-                android:text="@string/button_cancel" />
+                android:layout_marginEnd="10dp"
+                android:text="@string/button_cancel"
+                android:singleLine="true"
+                android:ellipsize="end" />
 
         </LinearLayout>
 
diff --git a/wallet/res/layout/username_request_group_view.xml b/wallet/res/layout/username_request_group_view.xml
index a6f58c5ad5..0050fe4ed2 100644
--- a/wallet/res/layout/username_request_group_view.xml
+++ b/wallet/res/layout/username_request_group_view.xml
@@ -26,39 +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/link_included"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        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"
@@ -67,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 7db40ee1a0..f107f02037 100644
--- a/wallet/res/layout/username_request_view.xml
+++ b/wallet/res/layout/username_request_view.xml
@@ -22,58 +22,94 @@
     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">
 
-    <View
-        android:id="@+id/bullet"
-        android:layout_width="3dp"
-        android:layout_height="3dp"
-        android:background="@color/content_primary"
-        android:layout_marginStart="15dp"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/info"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/selectable_round_corners_border_light"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent" />
+        app:layout_constraintTop_toTopOf="parent">
 
-    <TextView
-        android:id="@+id/date_registered"
-        style="@style/Overline"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:paddingVertical="13dp"
-        android:layout_marginStart="8dp"
-        app:layout_constraintStart_toEndOf="@id/bullet"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        tools:text="16 Feb 2023 · 9:45" />
+        <TextView
+            android:id="@+id/date_registered"
+            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"
+            app:layout_constraintVertical_chainStyle="packed"
+            tools:text="16 Feb 2023 · 9:45" />
 
-    <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:background="@drawable/rounded_background"
-        android:theme="@style/LightBlueBadgeTheme"
-        app:layout_constraintEnd_toStartOf="@id/vote_amount"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent" />
+        <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/date_registered"
+            app:layout_constraintStart_toStartOf="@id/date_registered"
+            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/link_included"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="link included"
+            style="@style/Caption.Blue"
+            app:layout_constraintTop_toTopOf="@id/link_badge"
+            app:layout_constraintStart_toEndOf="@id/link_badge" />
+
+        <Button
+            android:id="@+id/approvals_button"
+            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/vote_amount"-->
+<!--        style="@style/Overline.Tertiary"-->
+<!--        android:layout_width="0dp"-->
+<!--        android:layout_height="20dp"-->
+<!--        android:layout_marginEnd="15dp"-->
+<!--        android:minWidth="20dp"-->
+<!--        android:paddingHorizontal="7dp"-->
+<!--        android:gravity="center"-->
+<!--        android:textAlignment="gravity"-->
+<!--        android:background="@drawable/rounded_background"-->
+<!--        android:theme="@style/InactiveBadgeTheme"-->
+<!--        app:layout_constraintEnd_toEndOf="parent"-->
+<!--        app:layout_constraintTop_toTopOf="parent"-->
+<!--        app:layout_constraintBottom_toBottomOf="parent"-->
+<!--        tools:text="10" />-->
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/wallet/res/layout/view_masternode_ip.xml b/wallet/res/layout/view_masternode_ip.xml
index dcb3a3343b..e5ce2e6fc4 100644
--- a/wallet/res/layout/view_masternode_ip.xml
+++ b/wallet/res/layout/view_masternode_ip.xml
@@ -14,28 +14,50 @@
   ~ You should have received a copy of the GNU General Public License
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_marginVertical="5dp"
     android:paddingHorizontal="15dp"
     android:paddingVertical="10dp"
     android:background="@drawable/rounded_background"
     android:theme="@style/SecondaryBackground">
-
-    <TextView
-        style="@style/Overline.Secondary"
-        android:layout_width="match_parent"
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/masternode_ip" />
+        android:orientation="vertical"
 
-    <TextView
-        android:id="@+id/ip_address"
-        style="@style/Body2"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="2dp"
-        tools:text="XXX.XXX.XX.X1" />
-</LinearLayout>
\ No newline at end of file
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent">
+
+        <TextView
+            style="@style/Overline.Secondary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/masternode_ip" />
+
+        <TextView
+            android:id="@+id/ip_address"
+            style="@style/Body2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            tools:text="XXX.XXX.XX.X1" />
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/remove_masternode"
+        android:layout_width="11dp"
+        android:layout_height="11dp"
+        android:padding="12dp"
+        android:layout_marginEnd="15dp"
+        android:background="@drawable/ic_x"
+        android:visibility="invisible"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/wallet/res/navigation/nav_voting.xml b/wallet/res/navigation/nav_voting.xml
index 25c6828102..f05381875a 100644
--- a/wallet/res/navigation/nav_voting.xml
+++ b/wallet/res/navigation/nav_voting.xml
@@ -40,6 +40,22 @@
             app:enterAnim="@anim/slide_in_right"
             app:exitAnim="@anim/activity_stay"
             app:popExitAnim="@anim/slide_out_left" />
+
+        <action
+            android:id="@+id/requests_to_addVotingKeysFragment"
+            app:destination="@+id/addVotingKeysFragment"
+            app:enterAnim="@anim/slide_in_right"
+            app:exitAnim="@anim/activity_stay"
+            app:popExitAnim="@anim/slide_out_left"
+            />
+
+        <action
+            android:id="@+id/requests_to_votingKeyInputFragment"
+            app:destination="@+id/votingKeyInputFragment"
+            app:enterAnim="@anim/slide_in_right"
+            app:exitAnim="@anim/activity_stay"
+            app:popExitAnim="@anim/slide_out_left"
+            />
     </fragment>
 
     <dialog
@@ -83,6 +99,10 @@
             android:name="requestId"
             app:argType="string" />
 
+        <argument
+            android:name="vote"
+            app:argType="string" />
+
         <action
             android:id="@+id/votingKeyInput_to_addKeys"
             app:popUpTo="@id/usernameRequestDetailsFragment"
@@ -103,6 +123,9 @@
             android:name="requestId"
             app:argType="string" />
 
+        <argument android:name="vote"
+            app:argType="string" />
+
         <action
             android:id="@+id/addKeys_to_votingKeyInput"
             app:destination="@id/votingKeyInputFragment"
diff --git a/wallet/res/values-de/strings-dashpay.xml b/wallet/res/values-de/strings-dashpay.xml
index 7f00e5a3e5..9786edcd11 100644
--- a/wallet/res/values-de/strings-dashpay.xml
+++ b/wallet/res/values-de/strings-dashpay.xml
@@ -269,7 +269,8 @@ 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 andere Nutzer diese erstellen können.</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>
     <string name="n_usernames">%d Benutzernamen</string>
     <string name="n_requests">%d Anfragen</string>
@@ -292,8 +293,9 @@ Benutzernamen</b></string>
         <item>Alles</item>
         <item>Ich habe zugestimmt.</item>
         <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>
     <string name="request_username">Nutzernamen beantragen</string>
@@ -301,8 +303,12 @@ Benutzernamen</b></string>
     <string name="request_username_available">Benutzername ist verfügbar</string>
     <string name="request_username_unavailable">Benutzername ist nicht verfügbar oder gesperrt</string>
     <string name="request_username_taken">Benutzername ist vergeben</string>
+    <string name="request_username_taken_results">Benutzername wurde von einem anderen Nutzer beansprucht</string>
     <string name="requesting_your_username_title">Benutzernamen erstellen</string>
+    <string name="requesting_your_username_message">Dein Benutzername %s wird im Dash-Netzwerk angefordert. Dies kann einige Zeit in Anspruch nehmen.</string>
+    <string name="creating_your_username_message">Dein Benutzername %s wird im Dash-Netzwerk erstellt. Dies kann einige Zeit in Anspruch nehmen.</string>
     <string name="requesting_your_username_error_title">Deine Anfrage für einen Benutzernamen ist fehlgeschlagen</string>
+    <string name="requesting_your_username_error_message">Aus unerfindlichen Gründen ist die Anfrage für den Benutzernamen %s fehlgeschlagen. </string>
     <string name="voting">Abstimmung:</string>
     <string name="this_username_has_already_been_requested">Dieser Nutzername wurde bereits angefragt, aber du kannst ihn auch beantragen. Das Netzwerk wird darüber abstimmen, wer ihn erhält.</string>
     <string name="request_details">Details anfordern</string>
@@ -323,15 +329,14 @@ Benutzernamen</b></string>
     <string name="make_a_post_with_the_text">Verfasse einen Beitrag mit dem obigen Text auf einer bekannten Social Media- oder Messaging-Plattform und füge den unten stehenden Link ein, um zu überprüfen, ob du der ursprüngliche Besitzer des gewünschten Benutzernamens bist</string>
     <string name="paste_the_link">Link einfügen</string>
     <string name="voting_key_title">Gebe deinen Voting-Schlüssel ein.</string>
-    <string name="voting_key_hint">Masternode Voting-Schlüssel</string>
+    <string name="voting_key_hint">Privater Masternode Voting-Schlüssel</string>
     <string name="voting_key_input_error">Du hast einen ungültigen Schlüssel eingegeben.</string>
+    <string name="voting_key_input_not_active_error">Du hast einen Schlüssel eingegeben, der keinem aktiven Masternode zugeordnet werden kann</string>
     <string name="voting_key_add">Füge deine Abstimmungs-Schlüssel hinzu</string>
     <string name="voting_key_add_subtitle">Die folgende(n) IP-Adresse(n) sind mit dieser Wallet verbunden</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>
@@ -397,4 +402,15 @@ Benutzernamen</b></string>
     <string name="request_username_balance_requirement">Du benötigst 0,25 DASH um einen Benutzernamen erstellen zu können</string>
     <string name="request_username_length_requirement">Zwischen 3 und 23 Zeichen</string>
     <string name="request_username_confirm">Ich akzeptiere</string>
+    <string name="username_vote_one_left_message">Du hast bereits %d Mal für diesen Benutzernamen abgestimmt. Du kannst nur noch einmal für diesen Benutzernamen abstimmen.</string>
+    <string name="username_vote_one_left">Ein Vote übrig</string>
+    <string name="username_vote_none_left_message">Du hast bereits %d Mal für diesen Benutzernamen abgestimmt. Du kannst nur noch einmal für diesen Benutzernamen abstimmen.</string>
+    <string name="username_vote_none_left">Kein Vote übrig</string>
+    <string name="request_username_blocked">Angefragter Benutzername wurde blockiert</string>
+    <string name="request_username_lost_vote">Angefragter Benutzername wurde an eine andere Person vergeben</string>
+    <string name="request_username_blocked_message">Der Benutzername %s wurde vom Dash Netzwerk blockiert. Bitte versuche es erneut, aber mit einem anderen Benutzernamen.</string>
+    <string name="request_username_lost_vote_message">Aufgrund des Voting-Prozesses hat das Dash Netzwerk entschieden, den Benutzernamen %s an jemand anderen zu vergeben. Bitte versuche es erneut mit einem anderen Benutzernamen.</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>
diff --git a/wallet/res/values-de/strings-extra.xml b/wallet/res/values-de/strings-extra.xml
index b0e5e02159..c283c36a84 100644
--- a/wallet/res/values-de/strings-extra.xml
+++ b/wallet/res/values-de/strings-extra.xml
@@ -25,6 +25,8 @@
     <string name="dialog_confirm_secured_by">Geschützt durch</string>
     <string name="dialog_confirm_fee">Netzwerk-Gebühr</string>
     <string name="dialog_confirm_total">Gesamt</string>
+    <string name="dialog_confirm_accept_contact_request">Kontaktanfrage akzeptieren</string>
+
     <string name="shortcut_action_join_dashpay">DashPay beitreiten</string>
     <!-- Home Screen: Shortcut Button: 2 lines, 9 characters across -->
     <string name="shortcut_secure_now">Backup</string>
@@ -188,6 +190,9 @@
     <string name="notification_settings_title">Benachrichtigungen</string>
     <string name="notification_explainer_title">Dash Wallet möchte dir Benachrichtigungen schicken</string>
     <string name="notification_explainer_message">Die Benachrichtigungen umfassen Warnungen, Töne und Symbolabzeichen. Diese können in den Telefoneinstellungen konfiguriert werden.</string>
+    <string name="notification_dashpay_channel_name">DashPay</string>
+    <string name="notification_dashpay_channel_description">Status der laufenden DashPay-Operationen.</string>
+
     <string name="net_type_indicator" />
 
     <string name="unlock_with_fingerprint">Fingerabdruck zum Entsperren verwenden.</string>
@@ -240,6 +245,7 @@
     <string name="transaction_close">Schließen</string>
     <string name="transaction_details_amount_received">Guthaben empfangen</string>
     <string name="transaction_details_amount_sent">Guthaben gesendet</string>
+    <string name="transaction_details_amount_sent_successfully">Erfolgreich versendet</string>
     <string name="transaction_details_sent_from">Senden von</string>
     <string name="transaction_details_sent_to">Senden an</string>
     <string name="transaction_details_received_at">Empfangen bei</string>
@@ -258,6 +264,7 @@
     <string name="authenticate_switch_to_pin">PIN verwenden</string>
 
     <string name="menu_invite_title">Einladen</string>
+    <string name="menu_invite_subtitle">Helfe deinen Freunden und deiner Familie dabei, Dash zu nutzen</string>
     <string name="menu_buy_and_sell_title">Kaufe &amp; Verkaufe Dash</string>
     <string name="menu_buy_and_sell_subtitle">Mit Drittanbieter-Börsen verknüpfen</string>
     <string name="liquid_unavailable">Die Integrierung von Liquid in der Dash Wallet ist nicht mehr verfügbar</string>
@@ -369,16 +376,28 @@
     <string name="import_image_invalid_private">Ungültiger privater Schlüssel</string>
     <string name="okay">OK</string>
 
+    <string name="onboard_from_invite_title">Los geht\'s</string>
     <string name="onboard_from_invite_subtitle">Willkommen bei DashPay</string>
+    <string name="onboard_from_invite_step1">Schritt 1</string>
+    <string name="onboard_from_invite_step2">Schritt 2</string>
+    <string name="onboard_from_invite_step3">Schritt 3</string>
     <string name="onboard_from_invite_step1_title">Wähle deinen Benutzernamen</string>
     <string name="onboard_from_invite_step2_title">PIN festlegen</string>
     <string name="onboard_from_invite_step3_title">Sichere deine Wallet</string>
 
     <string name="restore_wallet_please_wait">Bitte warten</string>
+    <string name="restore_wallet_restoring">Deine Wallet wird wiederhergestellt</string>
+
+
+
     <string name="network_unavailable">Netzwerk nicht verfügbar</string>
     <string name="network_error_contact_details">Kontaktinformationen können nicht abgerufen werden</string>
     <string name="network_error_user_search">Nutzer können nicht gesucht werden</string>
     <string name="network_error_contact_suggestions">Kann keine Vorschläge machen</string>
+    <string name="network_error_unable_to_update_profile">Es ist nicht möglich, dein Profil zu updaten</string>
+
+
+
     <string name="today">Heute</string>
     <string name="yesterday">Gestern</string>
 
@@ -388,6 +407,8 @@
     <string name="all_transactions">Alles</string>
     <string name="received_transactions">Erhalten</string>
     <string name="sent_transactions">Gesendet</string>
+    <string name="serious_error_title">Schwerwiegender Fehler</string>
+    <string name="serious_error_unknown">Kontaktiere den Support.</string>
     <string name="set_pin_error_missing_wallet_title">Fehlende Wallet Fehler</string>
     <string name="set_pin_error_missing_wallet_message">Die Wallet ist nicht vorhanden. Bitte melde dies dem Support Desk.</string>
     <string name="wallet_encryption_error_title">Fehler bei der Wallet-Erstellung</string>
@@ -437,6 +458,9 @@
     <string name="masternode_key_not_used">Nicht benutzt</string>
     <string name="masternode_key_revoked">Widerrufen</string>
     <string name="masternode_key_private_public_base64">Privater/ Öffentlicher Schlüssel (base64)</string>
+    <string name="timeskew_ahead">weiter</string>
+    <string name="timeskew_behind">zurück</string>
+
     <!-- stale rates messages -->
     <string name="stale_exchange_rates_error">Die Preise konnten nicht abgerufen werden.  Es ist möglich, dass die Fiat-Werte nicht korrekt sind.</string>
     <string name="stale_exchange_rates_stale">Die Preise sind mindestens 30 Minuten alt. Es ist möglich, dass die Fiat-Werte nicht korrekt sind.</string>
diff --git a/wallet/res/values-de/strings.xml b/wallet/res/values-de/strings.xml
index 3d35486dfe..a52af07975 100644
--- a/wallet/res/values-de/strings.xml
+++ b/wallet/res/values-de/strings.xml
@@ -9,9 +9,11 @@
     <string name="blockchain_state_progress_days">%1$s, hinkt %2$d Tage hinterher</string>
     <string name="blockchain_state_progress_weeks">%1$s, hinkt %2$d Wochen hinterher</string>
     <string name="blockchain_state_progress_months">%1$s, hinkt %2$d Monate hinterher</string>
+    <string name="blockchain_state_progress_downloading">Synchronisierung mit dem Netzwerk (%1$s%%)</string>
     <string name="blockchain_state_progress_stalled">Synchronisation blockiert</string>
     <string name="blockchain_state_progress_problem_storage">Synchronisation: Speicherplatz-Problem</string>
     <string name="blockchain_state_progress_problem_network">Synchronisation: Netzwerk-Problem</string>
+    <string name="mixing_state_progress_mixing">Coins mixen (%1$s%%)</string>
     <string name="wallet_address_fragment_clipboard_msg">Dash Adresse wurde in die Zwischenablage kopiert</string>
     <string name="wallet_address_dialog_fragment_hint">Um deine Privatsphäre zu schützen, ändert sich deine Adresse sobald sie eine Zahlung empfängt.</string>
     <string name="wallet_balance_fragment_too_much">Dieser Wert scheint recht hoch dafür zu sein, dass er in der Tasche herum getragen wird. Bitte verschiebe etwas an einen sichereren Ort.</string>
@@ -42,6 +44,8 @@
     <string name="wallet_timeskew_dialog_title">Datums- und Zeit-Einstellungen überprüfen</string>
     <string name="wallet_timeskew_dialog_msg">Die Gerätezeit geht %dMinuten falsch. Daher ist es möglicherweise nicht möglich Dash zu senden. 
 Überprüfe und korrigiere bitte Datum, Uhrzeit und Zeitzone, falls dies nötig ist.</string>
+    <string name="wallet_coinjoin_timeskew_dialog_msg">Deine Gerätezeit ist %s zu %d Sekunden. Du kannst CoinJoin aufgrund dieses Unterschiedes nicht nutzen.\n\nDie Zeiteinstellungen auf deinem Gerät muss auf „Zeit automatisch einstellen“ geändert werden, um CoinJoin nutzen zu können.</string>
+    <string name="settings_coinjoin_timeskew_dialog_msg">Die Uhrzeit deines Geräts weicht um mehr als 5 Sekunden ab. Du kannst CoinJoin aufgrund dieses Unterschiedes nicht nutzen.\n\nDie Zeiteinstellungen auf deinem Gerät muss auf „Zeit automatisch einstellen“ geändert werden, bevor du den Dienst nutzen kannst.</string>
     <string name="send_coins_activity_title">Dash senden</string>
     <string name="send_coins_fragment_request_payment_request_progress">Rufe Signatur von %s ab…</string>
     <string name="send_coins_fragment_request_payment_request_failed_title">Abrufen der Signatur fehlgeschlagen</string>
@@ -171,6 +175,10 @@
     <string name="transaction_row_status_masternode_revoke">Masternode-Rücknahme</string>
     <string name="transaction_row_status_masternode_reward">Masternode-Belohnung</string>
     <string name="transaction_row_status_mining_reward">Mining-Belohnung</string>
+    <string name="transaction_row_status_coinjoin_mixing_fee">Coinjoin-Mixinggebühr</string>
+    <string name="transaction_row_status_coinjoin_make_collateral">CoinJoin Collateral Inputs</string>
+    <string name="transaction_row_status_coinjoin_mixing">CoinJoin-Mixing</string>
+    <string name="transaction_row_status_coinjoin_create_denominations">CoinJoin erstellt Stückelungen</string>
     <string name="network_monitor_activity_title">Netzwerk-Monitor</string>
     <string name="network_monitor_peer_list_title">Peers</string>
     <string name="network_monitor_block_list_title">Blöcke</string>
@@ -329,6 +337,7 @@
     <string name="notification_inactivity_message">Auf dem Gerät befinden sich noch immer Dash! Versichere dich, dass du deine Wiederherstellungsphrase aufgeschrieben hast, bevor du die Dash Wallet deinstallierst, oder du wirst den Zugang zu deinem Guthaben in Höhe von %s verlieren.</string>
     <string name="notification_inactivity_action_dismiss">Später erinnern</string>
     <string name="notification_inactivity_action_dismiss_forever">Nicht weiter erinnern</string>
+    <string name="notification_bluetooth_service_listening">Bereit zum Empfang von Zahlungen über Bluetooth</string>
     <string name="appwidget_wallet_balance_title">Dash-Guthaben</string>
 
     <!-- generic buttons -->
diff --git a/wallet/res/values-el/strings-dashpay.xml b/wallet/res/values-el/strings-dashpay.xml
index 132b8fce8d..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,8 @@
     <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>
     <string name="n_usernames">%d ονόματα χρήστη</string>
     <string name="n_requests">%d αιτήματα</string>
@@ -292,8 +292,9 @@
         <item>Όλα</item>
         <item>Έχω εγκρίνει</item>
         <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>
     <string name="request_username">Αίτημα ονόματος χρήστη</string>
@@ -301,8 +302,12 @@
     <string name="request_username_available">Το όνομα χρήστη είναι διαθέσιμο</string>
     <string name="request_username_unavailable">Το όνομα χρήστη δεν είναι διαθέσιμο ή είναι μπλοκαρισμένο</string>
     <string name="request_username_taken">Το όνομα χρήστη είναι πιασμένο</string>
+    <string name="request_username_taken_results">Το όνομα χρήστη λήφθηκε από άλλον χρήστη</string>
     <string name="requesting_your_username_title">Δημιουργία του ονόματος χρήστη σας</string>
+    <string name="requesting_your_username_message">Το όνομα χρήστη  %s  ζητείται στο δίκτυο Dash. Μπορεί να πάρει λίγο χρόνο.</string>
+    <string name="creating_your_username_message">Το όνομα χρήστη %s δημιουργείται στο δίκτυο Dash. Μπορεί να πάρει λίγο χρόνο.</string>
     <string name="requesting_your_username_error_title">Το αίτημα για το όνομα χρήστη απέτυχε</string>
+    <string name="requesting_your_username_error_message">Για κάποιο λόγο, το αίτημα για το όνομα χρήστη %s απέτυχε.</string>
     <string name="voting">Ψηφοφορία:</string>
     <string name="this_username_has_already_been_requested">Αυτό το όνομα χρήστη έχει ήδη ζητηθεί, αλλά μπορείτε να το ζητήσετε κι εσείς και να αφήσετε το δίκτυο να ψηφίσει για να αποφασίσει αν μπορείτε να το έχετε.</string>
     <string name="request_details">Λεπτομέρειες αιτήματος</string>
@@ -323,15 +328,14 @@
     <string name="make_a_post_with_the_text">Κάντε μια ανάρτηση με το παραπάνω κείμενο σε ένα γνωστό μέσο κοινωνικής δικτύωσης ή σε μια πλατφόρμα ανταλλαγής μηνυμάτων για να επαληθεύσετε ότι είστε ο αρχικός κάτοχος του ζητούμενου ονόματος χρήστη και επικολλήστε τον παρακάτω σύνδεσμο</string>
     <string name="paste_the_link">Επικολλήστε τον σύνδεσμο</string>
     <string name="voting_key_title">Εισάγετε το κλειδί ψήφου σας</string>
-    <string name="voting_key_hint">Κλειδί ψήφου του Masternode</string>
+    <string name="voting_key_hint">Ιδιωτικό κλειδί ψηφοφορίας Masternode</string>
     <string name="voting_key_input_error">Έχετε εισάγει ένα μη έγκυρο κλειδί</string>
+    <string name="voting_key_input_not_active_error">Έχετε εισάγει ένα κλειδί που δεν είναι συνδεδεμένο με ενεργό Masternode</string>
     <string name="voting_key_add">Προσθέστε τα κλειδιά ψηφοφορίας σας</string>
     <string name="voting_key_add_subtitle">Οι παρακάτω διευθύνσεις IP συνδέονται με αυτό το πορτοφόλι</string>
     <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>
@@ -397,4 +401,15 @@
     <string name="request_username_balance_requirement">Πρέπει να έχετε 0,25 DASH για να δημιουργήσετε αυτό το όνομα χρήστη</string>
     <string name="request_username_length_requirement">Μεταξύ 3 και 23 χαρακτήρων</string>
     <string name="request_username_confirm">Δέχομαι</string>
+    <string name="username_vote_one_left_message">Έχετε ήδη ψηφίσει για αυτό το όνομα χρήστη %d φορές. Μπορείτε να δώσετε μόνο μία ακόμη ψήφο για αυτό το όνομα χρήστη.</string>
+    <string name="username_vote_one_left">Μία ψήφος έμεινε</string>
+    <string name="username_vote_none_left_message">Έχετε ήδη ψηφίσει για αυτό το όνομα χρήστη %d φορές. Δεν μπορείτε να δώσετε άλλη ψήφο για αυτό το όνομα χρήστη.</string>
+    <string name="username_vote_none_left">Δεν έχουν απομείνει ψήφοι</string>
+    <string name="request_username_blocked">Το ζητούμενο όνομα χρήστη έχει μπλοκαριστεί</string>
+    <string name="request_username_lost_vote">Το ζητούμενο όνομα χρήστη έχει δοθεί σε κάποιον άλλο</string>
+    <string name="request_username_blocked_message">Το όνομα χρήστη %s μπλοκαρίστηκε από το Dash Network. Παρακαλώ δοκιμάστε ξανά ζητώντας άλλο όνομα χρήστη.</string>
+    <string name="request_username_lost_vote_message">Βάσει της διαδικασίας της ψηφοφορίας, το Dash Network αποφάσισε να εκχωρήσει το όνομα χρήστη %s σε κάποιον άλλον. Παρακαλώ προσπαθήστε ξανά ζητώντας άλλο όνομα χρήστη.</string>
+    <string name="mix_dash_mix">Υπόλοιπο Ανάμειξης</string>
+    <string name="mix_dash_title">Αναμείξτε τα Dash σας</string>
+    <string name="mix_dash_message">Για να αποτρέψετε άλλα άτομα από το να βλέπουν σε ποιον κάνετε πληρωμές, συνιστάται να αναμίξετε το υπόλοιπό σας πριν δημιουργήσετε το όνομα χρήστη σας.</string>
     </resources>
diff --git a/wallet/res/values-el/strings-extra.xml b/wallet/res/values-el/strings-extra.xml
index 95b8b3d7a1..7bf49416e4 100644
--- a/wallet/res/values-el/strings-extra.xml
+++ b/wallet/res/values-el/strings-extra.xml
@@ -25,6 +25,8 @@
     <string name="dialog_confirm_secured_by">Ασφαλισμένo από</string>
     <string name="dialog_confirm_fee">Τέλος δικτύου</string>
     <string name="dialog_confirm_total">Σύνολο</string>
+    <string name="dialog_confirm_accept_contact_request">Αποδοχή αιτήματος επαφής</string>
+
     <string name="shortcut_action_join_dashpay">Εγγραφείτε στο DashPay</string>
     <!-- Home Screen: Shortcut Button: 2 lines, 9 characters across -->
     <string name="shortcut_secure_now">Αντίγραφο ασφαλείας</string>
@@ -188,6 +190,9 @@
     <string name="notification_settings_title">Ειδοποιήσεις</string>
     <string name="notification_explainer_title">Το Dash Wallet θα ήθελε να σας στέλνει ειδοποιήσεις</string>
     <string name="notification_explainer_message">Οι ειδοποιήσεις μπορεί να περιλαμβάνουν ειδοποιήσεις, ήχους και διακριτικά εικονιδίων. Αυτές μπορούν να διαμορφωθούν στις Ρυθμίσεις του τηλεφώνου.</string>
+    <string name="notification_dashpay_channel_name">DashPay</string>
+    <string name="notification_dashpay_channel_description">Κατάσταση των συνεχιζόμενων εργασιών DashPay.</string>
+
     <string name="net_type_indicator" />
 
     <string name="unlock_with_fingerprint">Χρησιμοποιήστε το δακτυλικό σας αποτύπωμα για να ξεκλειδώσετε.</string>
@@ -240,6 +245,7 @@
     <string name="transaction_close">κλείσιμο</string>
     <string name="transaction_details_amount_received">Ποσοστό Ληφθέντων</string>
     <string name="transaction_details_amount_sent">Ποσοστό Απεσταλμένων</string>
+    <string name="transaction_details_amount_sent_successfully">Εστάλη με επιτυχία</string>
     <string name="transaction_details_sent_from">Αποστολή από</string>
     <string name="transaction_details_sent_to">Αποστόλη στο</string>
     <string name="transaction_details_received_at">Ελήφθησαν στο</string>
@@ -258,6 +264,7 @@
     <string name="authenticate_switch_to_pin">Χρησιμοποιήστε το PIN</string>
 
     <string name="menu_invite_title">Πρόσκληση</string>
+    <string name="menu_invite_subtitle">Βοηθήστε τους φίλους και την οικογένειά σας να συμμετάσχουν στο Dash</string>
     <string name="menu_buy_and_sell_title">Αγορά και Πώληση Dash</string>
     <string name="menu_buy_and_sell_subtitle">Συνδεθείτε με ανταλλακτήρια τρίτων</string>
     <string name="liquid_unavailable">Η ενσωμάτωση της Liquid με το Dash Wallet δεν είναι πλέον διαθέσιμη</string>
@@ -369,16 +376,28 @@
     <string name="import_image_invalid_private">Μη έγκυρο ιδιωτικό κλειδί</string>
     <string name="okay">Εντάξει</string>
 
+    <string name="onboard_from_invite_title">Ας ξεκινήσουμε</string>
     <string name="onboard_from_invite_subtitle">Καλώς ήρθατε στο DashPay</string>
+    <string name="onboard_from_invite_step1">Βήμα 1</string>
+    <string name="onboard_from_invite_step2">Βήμα 2</string>
+    <string name="onboard_from_invite_step3">Βήμα 3</string>
     <string name="onboard_from_invite_step1_title">Επιλέξτε το όνομα χρήστη σας</string>
     <string name="onboard_from_invite_step2_title">Ορίστε το PIN σας</string>
     <string name="onboard_from_invite_step3_title">Ασφαλίστε το πορτοφόλι σας</string>
 
     <string name="restore_wallet_please_wait">Παρακαλώ περιμένετε</string>
+    <string name="restore_wallet_restoring">Το πορτοφόλι σας αποκαθίσταται</string>
+
+
+
     <string name="network_unavailable">Μη διαθέσιμο δίκτυο</string>
     <string name="network_error_contact_details">Αδυναμία λήψης στοιχείων επαφής</string>
     <string name="network_error_user_search">Αδυναμία αναζήτησης για χρήστη</string>
     <string name="network_error_contact_suggestions">Αδυναμία παροχής προτάσεων</string>
+    <string name="network_error_unable_to_update_profile">Αδυναμία ενημέρωσης του προφίλ σας</string>
+
+
+
     <string name="today">Σήμερα</string>
     <string name="yesterday">Εχθές</string>
 
@@ -388,6 +407,8 @@
     <string name="all_transactions">Όλα</string>
     <string name="received_transactions">Ελήφθησαν</string>
     <string name="sent_transactions">Εστάλη</string>
+    <string name="serious_error_title">Σοβαρό σφάλμα</string>
+    <string name="serious_error_unknown">Επικοινωνήστε με την υποστήριξη.</string>
     <string name="set_pin_error_missing_wallet_title">Σφάλμα έλλειψης πορτοφολιού</string>
     <string name="set_pin_error_missing_wallet_message">Το πορτοφόλι λείπει. Παρακαλούμε αναφέρετέ το στο Γραφείο Υποστήριξης.</string>
     <string name="wallet_encryption_error_title">Σφάλμα δημιουργίας πορτοφολιού</string>
@@ -437,6 +458,9 @@
     <string name="masternode_key_not_used">Δεν χρησιμοποιείται</string>
     <string name="masternode_key_revoked">Ανακλήθηκε</string>
     <string name="masternode_key_private_public_base64">Ιδιωτικά/δημόσια κλειδιά (base64)</string>
+    <string name="timeskew_ahead">μπροστά</string>
+    <string name="timeskew_behind">πίσω </string>
+
     <!-- stale rates messages -->
     <string name="stale_exchange_rates_error">Οι τιμές δεν ανακτήθηκαν. Οι Fiat τιμές ενδέχεται να είναι εσφαλμένες.</string>
     <string name="stale_exchange_rates_stale">Οι τιμές είναι τουλάχιστον 30 λεπτά παλαιότερες. Οι τιμές Fiat ενδέχεται να είναι λανθασμένες.</string>
diff --git a/wallet/res/values-el/strings.xml b/wallet/res/values-el/strings.xml
index 82583191b3..e44907aa94 100644
--- a/wallet/res/values-el/strings.xml
+++ b/wallet/res/values-el/strings.xml
@@ -9,9 +9,11 @@
     <string name="blockchain_state_progress_days">Απομένουν %1$s, %2$d μέρες</string>
     <string name="blockchain_state_progress_weeks">Απομένουν %1$s, %2$d εβδομάδες</string>
     <string name="blockchain_state_progress_months">Απομένουν %1$s, %2$d μήνες</string>
+    <string name="blockchain_state_progress_downloading">Συγχρονισμός με το δίκτυο (%1$s%%)</string>
     <string name="blockchain_state_progress_stalled">Συγχρονισμός σε αναστολή</string>
     <string name="blockchain_state_progress_problem_storage">Συγχρονισμός: Πρόβλημα αποθήκευσης</string>
     <string name="blockchain_state_progress_problem_network">Συγχρονισμός: Πρόβλημα δικτύου</string>
+    <string name="mixing_state_progress_mixing">Ανάμειξη νομισμάτων (%1$s%%)</string>
     <string name="wallet_address_fragment_clipboard_msg">Η διεύθυνση Dash αντιγράφτηκε στο πρόχειρο</string>
     <string name="wallet_address_dialog_fragment_hint">Για λόγους προστασίας της ανωνυμίας σας, η διεύθυνσή σας θα αλλάζει με κάθε πληρωμή που θα λαμβάνετε.</string>
     <string name="wallet_balance_fragment_too_much">Το ποσό αυτό είναι αρκετά μεγάλο για να το έχετε σε ένα σημείο. Μετακινήστε μερικά νομίσματα σε άλλο πορτοφόλι για τη δική σας ασφάλεια.</string>
@@ -41,6 +43,8 @@
     <string name="wallet_low_storage_dialog_button_apps">Διαχείριση εφαρμογών</string>
     <string name="wallet_timeskew_dialog_title">Ελέξτε ρυθμίσεις ημερομηνίας &amp; χρόνου</string>
     <string name="wallet_timeskew_dialog_msg">Ο χρόνος της συσκευής σας είναι λάθος κατά %d λεπτά. Ενδεχομένως να μην μπορείτε να στείλετε ή να λάβετε Dash εξαιτίας αυτού του προβλήματος.\n\nΠρέπει να ελέγξετε και αν χρειάζεται να διορθώσετε στις ρυθμίσεις την ημερομηνία, την ώρα και την ζώνη ώρας.</string>
+    <string name="wallet_coinjoin_timeskew_dialog_msg">Η ώρα της συσκευής σας είναι %s με %d δεύτερα. Δεν μπορείτε να χρησιμοποιήσετε το CoinJoin λόγω αυτής της διαφοράς.\n\nΟι ρυθμίσεις ώρας στη συσκευή σας πρέπει να αλλάξουν σε \"Αυτόματη ρύθμιση ώρας\" για να χρησιμοποιήσετε το CoinJoin.</string>
+    <string name="settings_coinjoin_timeskew_dialog_msg">Ο χρόνος της συσκευής σας απέχει περισσότερο από 5 δευτερόλεπτα. Δεν μπορείτε να χρησιμοποιήσετε το CoinJoin λόγω αυτής της διαφοράς.\n\nΟι ρυθμίσεις ώρας στη συσκευή σας πρέπει να αλλάξουν σε \"Αυτόματη ρύθμιση ώρας\" πριν χρησιμοποιήσετε το CoinJoin.</string>
     <string name="send_coins_activity_title">Αποστολή Dash</string>
     <string name="send_coins_fragment_request_payment_request_progress">Παραλαβή υπογραφής από %s...</string>
     <string name="send_coins_fragment_request_payment_request_failed_title">Η παραλαβή της υπογραφής απέτυχε</string>
@@ -170,6 +174,10 @@
     <string name="transaction_row_status_masternode_revoke">Ανάκληση Masternode</string>
     <string name="transaction_row_status_masternode_reward">Ανταμοιβή για Masternode</string>
     <string name="transaction_row_status_mining_reward">Ανταμοιβή για Mining</string>
+    <string name="transaction_row_status_coinjoin_mixing_fee">Προμήθεια ανάμειξης CoinJoin</string>
+    <string name="transaction_row_status_coinjoin_make_collateral">CoinJoin Collateral Inputs</string>
+    <string name="transaction_row_status_coinjoin_mixing">Ανάμειξη CoinJoin</string>
+    <string name="transaction_row_status_coinjoin_create_denominations">CoinJoin Δημιουργία ονομαστικών μονάδων</string>
     <string name="network_monitor_activity_title">Παρακολούθηση δικτύου</string>
     <string name="network_monitor_peer_list_title">Ομότιμοι</string>
     <string name="network_monitor_block_list_title">Τμήματα</string>
@@ -328,6 +336,7 @@
     <string name="notification_inactivity_message">Εξακολουθείτε να έχετε Dash σε αυτή τη συσκευή! Βεβαιωθείτε ότι έχετε γράψει κάπου τη φράση ανάκτησης προτού απεγκαταστήσετε το Πορτοφόλι Dash αλλιώς θα χάσετε το υπόλοιπο %s.</string>
     <string name="notification_inactivity_action_dismiss">Υπενθυμίστε το μου αργότερα</string>
     <string name="notification_inactivity_action_dismiss_forever">Μήν μου το υπενθυμίσετε</string>
+    <string name="notification_bluetooth_service_listening">Έτοιμο για λήψη πληρωμών μέσω Bluetooth</string>
     <string name="appwidget_wallet_balance_title">Υπόλοιπο Dash</string>
 
     <!-- generic buttons -->
diff --git a/wallet/res/values-es/strings-dashpay.xml b/wallet/res/values-es/strings-dashpay.xml
index d80959b231..a26b717f51 100644
--- a/wallet/res/values-es/strings-dashpay.xml
+++ b/wallet/res/values-es/strings-dashpay.xml
@@ -88,7 +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">ingresa el nombre de usuario para buscar aquí</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>
@@ -262,14 +262,17 @@ de Dash</b></string>
     <string name="keep_your_passphrase_safe">Mantén tu contraseña segura</string>
     <string name="pay_now">Paga ahora y si no es aprobado, puedes crear un nombre diferente sin pagar nuevamente</string>
     <string name="case_your_request_is_not_approved">En caso de que tu solicitud no sea aprobada</string>
-    <string name="voting_requirement_subtitle">Cualquier nombre de usuario que tenga un número del 2 al 9 o que tenga más de 20 caracteres será aprobado automáticamente.</string>
+    <string name="voting_requirement_subtitle">Cualquier nombre de usuario que tenga un número de 2 a 9 o 20 o más caracteres será aprobado automáticamente.</string>
     <string name="voting_requirement_title">El voto sólo es necesario en algunos casos</string>
     <string name="dash_network_must_vote_to_approve">La red Dash debe votar para aprobar tu nombre de usuario antes de que se cree.</string>
     <string name="what_is_username_voting">¿Qué es la votación por nombre de usuario\?</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 los usuarios puedan crearlos.</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>
     <string name="n_usernames">%d nombres de usuario</string>
     <string name="n_requests">%d solicitudes</string>
@@ -292,22 +295,39 @@ de Dash</b></string>
         <item>Todos</item>
         <item>Yo he aprobado</item>
         <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">Por favor no olvides que no podrás cambiarlo en el futuro.</string>
+    <string name="request_your_hint">Ten en cuenta que no podrás cambiarlo en el futuro.</string>
     <string name="request_username">Solicitar nombre de usuario</string>
     <string name="request_voting_range">La red de Dash votará por este nombre de usuario. Te notificaremos los resultados el %s.</string>
     <string name="request_username_available">El nombre de usuario está disponible</string>
     <string name="request_username_unavailable">El nombre de usuario no está disponible o está bloqueado</string>
     <string name="request_username_taken">El nombre de usuario ya está en uso</string>
+    <string name="request_username_taken_results">El nombre de usuario fue tomado por otro usuario</string>
     <string name="requesting_your_username_title">Creando tu nombre de usuario</string>
+    <string name="requesting_your_username_message">Tu nombre de usuario %s se está solicitando en la red Dash. Puede que tarde un poco.</string>
+    <string name="creating_your_username_message">Tu nombre de usuario %s se está creando en la red Dash. Puede que tarde un poco.</string>
     <string name="requesting_your_username_error_title">Tu solicitud de nombre de usuario falló</string>
+    <string name="requesting_your_username_error_message">Por alguna razón, la solicitud del nombre de usuario %s ha fallado.</string>
     <string name="voting">Votación:</string>
     <string name="this_username_has_already_been_requested">Este nombre de usuario ya ha sido solicitado, pero tú también puedes solicitarlo y dejar que la red vote para decidir si puedes tenerlo.</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>
@@ -323,15 +343,34 @@ de Dash</b></string>
     <string name="make_a_post_with_the_text">Haz una publicación con el texto anterior en una red social o plataforma de mensajería conocida para verificar que eres el propietario original del nombre de usuario solicitado y pega el enlace a continuación.</string>
     <string name="paste_the_link">Pega el enlace</string>
     <string name="voting_key_title">Introduce tu clave de votación</string>
-    <string name="voting_key_hint">Llave de votación de Masternode</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="vote_submitted">Tu voto fue enviado</string>
-    <string name="vote_cancelled">Tu voto fue cancelado</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>
@@ -397,4 +436,15 @@ de Dash</b></string>
     <string name="request_username_balance_requirement">Necesitas tener 0,25 DASH para crear este nombre de usuario</string>
     <string name="request_username_length_requirement">Entre 3 y 23 caracteres</string>
     <string name="request_username_confirm">Yo acepto</string>
+    <string name="username_vote_one_left_message">Ya has votado por este nombre de usuario %d veces. Sólo puedes emitir un voto más para este nombre de usuario.</string>
+    <string name="username_vote_one_left">Queda un voto</string>
+    <string name="username_vote_none_left_message">Ya has votado por este nombre de usuario %d veces. No puedes emitir más votos para este nombre de usuario.</string>
+    <string name="username_vote_none_left">No quedan votos</string>
+    <string name="request_username_blocked">El nombre de usuario solicitado ha sido bloqueado</string>
+    <string name="request_username_lost_vote">El nombre de usuario solicitado ha sido proporcionado a otra persona</string>
+    <string name="request_username_blocked_message">El nombre de usuario %s fué bloqueado por la red Dash. Inténtalo nuevamente solicitando otro nombre de usuario.</string>
+    <string name="request_username_lost_vote_message">Debido al proceso de votación, Dash Network ha decidido asignar el nombre de usuario %s a otra persona. Inténtalo de nuevo solicitando otro nombre de usuario.</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>
diff --git a/wallet/res/values-es/strings-extra.xml b/wallet/res/values-es/strings-extra.xml
index ac0ef17b84..6d92ff63cf 100644
--- a/wallet/res/values-es/strings-extra.xml
+++ b/wallet/res/values-es/strings-extra.xml
@@ -25,6 +25,8 @@
     <string name="dialog_confirm_secured_by">Protegido por</string>
     <string name="dialog_confirm_fee">Comisión de red</string>
     <string name="dialog_confirm_total">Total</string>
+    <string name="dialog_confirm_accept_contact_request">Aceptar solicitud de contacto</string>
+
     <string name="shortcut_action_join_dashpay">Unirse a DashPay</string>
     <!-- Home Screen: Shortcut Button: 2 lines, 9 characters across -->
     <string name="shortcut_secure_now">Respaldo</string>
@@ -191,6 +193,9 @@
     <string name="notification_settings_title">Notificaciones</string>
     <string name="notification_explainer_title">La billetera de Dash desea enviarte notificaciones</string>
     <string name="notification_explainer_message">Las notificaciones pueden incluir alertas, sonidos e íconos distintivos. Estos se pueden configurar en la configuración del teléfono.</string>
+    <string name="notification_dashpay_channel_name">DashPay</string>
+    <string name="notification_dashpay_channel_description">Estado de las operaciones en curso de DashPay.</string>
+
     <string name="net_type_indicator" />
 
     <string name="unlock_with_fingerprint">Usa tu huella para desbloquear.</string>
@@ -243,6 +248,7 @@
     <string name="transaction_close">Cerrar</string>
     <string name="transaction_details_amount_received">Monto Recibido</string>
     <string name="transaction_details_amount_sent">Monto Enviado</string>
+    <string name="transaction_details_amount_sent_successfully">Enviado exitosamente</string>
     <string name="transaction_details_sent_from">Enviado de</string>
     <string name="transaction_details_sent_to">Enviado a</string>
     <string name="transaction_details_received_at">Recibido en</string>
@@ -261,6 +267,7 @@
     <string name="authenticate_switch_to_pin">Usar PIN</string>
 
     <string name="menu_invite_title">Invitar</string>
+    <string name="menu_invite_subtitle">Ayuda a tus amigos y familiares a unirse a Dash</string>
     <string name="menu_buy_and_sell_title">Comprar &amp; Vender Dash</string>
     <string name="menu_buy_and_sell_subtitle">Conectar con exchanges de terceros</string>
     <string name="liquid_unavailable">La integración líquida con la billetera de Dash ya no está disponible</string>
@@ -372,16 +379,28 @@
     <string name="import_image_invalid_private">Clave Privada Inválida</string>
     <string name="okay">¡Listo!</string>
 
+    <string name="onboard_from_invite_title">Empecemos</string>
     <string name="onboard_from_invite_subtitle">Bienvenido a DashPay</string>
+    <string name="onboard_from_invite_step1">Paso 1</string>
+    <string name="onboard_from_invite_step2">Paso 2</string>
+    <string name="onboard_from_invite_step3">Paso 3</string>
     <string name="onboard_from_invite_step1_title">Elige tu nombre de usuario</string>
     <string name="onboard_from_invite_step2_title">Establece tu PIN</string>
     <string name="onboard_from_invite_step3_title">Asegura tu billetera</string>
 
     <string name="restore_wallet_please_wait">Por favor espera</string>
+    <string name="restore_wallet_restoring">Tu billetera está siendo restaurada</string>
+
+
+
     <string name="network_unavailable">Red no disponible</string>
     <string name="network_error_contact_details">No se pueden obtener los datos de contacto</string>
     <string name="network_error_user_search">No se puede buscar un usuario</string>
     <string name="network_error_contact_suggestions">No se pueden proporcionar sugerencias</string>
+    <string name="network_error_unable_to_update_profile">No se puede actualizar tu perfil</string>
+
+
+
     <string name="today">Hoy</string>
     <string name="yesterday">Ayer</string>
 
@@ -391,6 +410,8 @@
     <string name="all_transactions">Todos</string>
     <string name="received_transactions">Recibido</string>
     <string name="sent_transactions">Enviado</string>
+    <string name="serious_error_title">Error grave</string>
+    <string name="serious_error_unknown">Por favor, ponte en contacto con el soporte.</string>
     <string name="set_pin_error_missing_wallet_title"> Error de billetera inexistente</string>
     <string name="set_pin_error_missing_wallet_message"> No existe la billetera. Por favor escribir al centro de soporte.</string>
     <string name="wallet_encryption_error_title"> Error de creación de billetera</string>
@@ -440,6 +461,9 @@
     <string name="masternode_key_not_used">No usada</string>
     <string name="masternode_key_revoked">Revocado</string>
     <string name="masternode_key_private_public_base64">Llaves privadas / públicas (base64)</string>
+    <string name="timeskew_ahead">adelante</string>
+    <string name="timeskew_behind">detrás</string>
+
     <!-- stale rates messages -->
     <string name="stale_exchange_rates_error">Los precios no fueron encontrados. Los valores mostrados en FIAT pueden estar equivocados.</string>
     <string name="stale_exchange_rates_stale">Los precios mostrados tienen al menos 30 minutos de antiguedad. Los valores en FIAT pueden ser incorrectos.</string>
diff --git a/wallet/res/values-es/strings.xml b/wallet/res/values-es/strings.xml
index 958a25bccd..bf9815d0de 100644
--- a/wallet/res/values-es/strings.xml
+++ b/wallet/res/values-es/strings.xml
@@ -9,9 +9,11 @@
     <string name="blockchain_state_progress_days">%1$s, %2$d días atrás</string>
     <string name="blockchain_state_progress_weeks">%1$s, %2$d semanas atrás</string>
     <string name="blockchain_state_progress_months">%1$s, %2$d meses atrás</string>
+    <string name="blockchain_state_progress_downloading">Sincronizando con la red (%1$s%%)</string>
     <string name="blockchain_state_progress_stalled">Sincronización interrumpida</string>
     <string name="blockchain_state_progress_problem_storage">Sincronización: Problema de almacenamiento</string>
     <string name="blockchain_state_progress_problem_network">Sincronización: Problema de red</string>
+    <string name="mixing_state_progress_mixing">Mezclando monedas (%1$s%%)</string>
     <string name="wallet_address_fragment_clipboard_msg">Dirección de Dash copiada al portapapeles</string>
     <string name="wallet_address_dialog_fragment_hint">Para proteger tu privacidad, tu dirección cambiará una vez reciba un pago.</string>
     <string name="wallet_balance_fragment_too_much">Esta cantidad es muy grande para llevar en tu bolsillo, por favor, muévela a un lugar más seguro.</string>
@@ -41,6 +43,8 @@
     <string name="wallet_low_storage_dialog_button_apps">Gestionar aplicaciones</string>
     <string name="wallet_timeskew_dialog_title">Verifica la fecha&amp; y configuración de hora.s</string>
     <string name="wallet_timeskew_dialog_msg">Tu dispositivo se ha desconectado por %d minutos. Probablemente no podrás enviar o recibir Dash por este problema.\\n\\nDeberás revisar si es necesario corregir la configuración de fecha, hora o zona horaria.</string>
+    <string name="wallet_coinjoin_timeskew_dialog_msg">La hora de tu dispositivo es %s por %d segundos. No puedes usar CoinJoin debido a esta diferencia .\n\nLa configuración de hora en tu dispositivo debe cambiarse a “Establecer hora automáticamente” para usar CoinJoin.</string>
+    <string name="settings_coinjoin_timeskew_dialog_msg">La hora de tu dispositivo tiene un desfase de más de 5 segundos. No puedes usar CoinJoin debido a esta diferencia.\n\nLa configuración de hora de tu dispositivo debe cambiarse a “Establecer hora automáticamente” antes de usar CoinJoin.</string>
     <string name="send_coins_activity_title">Enviar Dash</string>
     <string name="send_coins_fragment_request_payment_request_progress">Adquiriendo firma de %s…</string>
     <string name="send_coins_fragment_request_payment_request_failed_title">Ha fallado la adquisición de firma</string>
@@ -170,6 +174,10 @@
     <string name="transaction_row_status_masternode_revoke">Revocar masternode</string>
     <string name="transaction_row_status_masternode_reward">Recompensa de masternode</string>
     <string name="transaction_row_status_mining_reward">Minando recompensa</string>
+    <string name="transaction_row_status_coinjoin_mixing_fee">Tarifa de mezcla de CoinJoin</string>
+    <string name="transaction_row_status_coinjoin_make_collateral">Entradas colaterales de CoinJoin</string>
+    <string name="transaction_row_status_coinjoin_mixing">Mezcla de CoinJoin</string>
+    <string name="transaction_row_status_coinjoin_create_denominations">CoinJoin Crea denominaciones</string>
     <string name="network_monitor_activity_title">Monitor de red</string>
     <string name="network_monitor_peer_list_title">Pares</string>
     <string name="network_monitor_block_list_title">Bloques</string>
@@ -328,6 +336,7 @@
     <string name="notification_inactivity_message">Aún tienes Dash en este dispositivo! Por favor escribe la frase de recuperación en un lugar seguro antes de desinstalar la Billetera Dash o perderás el saldo de %s.</string>
     <string name="notification_inactivity_action_dismiss">Recuerdame despues</string>
     <string name="notification_inactivity_action_dismiss_forever">No me recuerdes</string>
+    <string name="notification_bluetooth_service_listening">Listo para recibir pagos vía Bluetooth</string>
     <string name="appwidget_wallet_balance_title">Saldo en Dash</string>
 
     <!-- generic buttons -->
diff --git a/wallet/res/values-fa/strings-dashpay.xml b/wallet/res/values-fa/strings-dashpay.xml
index 14f4d39dd2..89589b43ea 100644
--- a/wallet/res/values-fa/strings-dashpay.xml
+++ b/wallet/res/values-fa/strings-dashpay.xml
@@ -259,6 +259,7 @@
     <string name="upload_your_picture">تصویرتان را به‌روزرسانی کنید، هویت‌تان را شخصی‌سازی کنید</string>
     <string name="in_case_lose_your_passphrase">در صورتی که عبارت بازیابی را گم کنید، حق دسترسی به نام کاربری درخواستی را از دست خواهید داد. </string>
     <string name="keep_your_passphrase_safe">عبارت بازیابی را در جایی امن نگه دارید.</string>
+    <string name="pay_now">همین حالا پرداخت کنید و اگر مورد تائید نبود، می‌توانید یک نام کاربری دیگر، بدون پرداخت دوباره، ایجاد کنید</string>
     <string name="case_your_request_is_not_approved">در صورتی که درخواست‌تان تائيد نشد</string>
     <string name="voting_requirement_subtitle">هر نام کاربری که دارای اعداد ۲ تا ۹ باشد و یا طولانی‌تر از ۲۰ کاراکتر باشد، به صورت خودکار تائید می‌شود.</string>
     <string name="voting_requirement_title">در برخی موارد، نیاز به رای‌گیری است</string>
@@ -267,7 +268,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="voting_duplicates_only_title">تنظیمات پیش‌فرض فیلتر</string>
+    <string name="voting_duplicates_only_message">فیلتر پیشفرض فقط نام‌های کاربری تکراری که رای ندارند را نشان می‌دهد، ولی می‌توانید همه با تغییر فیلتر، همه نام‌های کاربری مورد مناقشه را ببینید. </string>
     <string name="all">همه</string>
     <string name="n_usernames">%dنام کاربری</string>
     <string name="n_requests">%dدرخواست</string>
@@ -290,17 +292,22 @@
         <item>همه</item>
         <item>مواردی که تائید کردم</item>
         <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>
+    <string name="request_your_hint">لطفاً دقت داشته باشید که نمی‌توانید بعدا آن را تغییر دهید</string>
     <string name="request_username">درخواست نام کاربری</string>
     <string name="request_voting_range">شبکه دش برای این نام کاربری رای‌گیری می‌کند. نتیجه را در %s به شما اطلاع می‌دهیم. </string>
     <string name="request_username_available">نام کاربری موجود است</string>
     <string name="request_username_unavailable">نام کاربری موجود نیست یا بلاک شده است</string>
     <string name="request_username_taken">این نام کاربری قبلا گرفته شده است</string>
+    <string name="request_username_taken_results">این نام کاربری قبلاً توسط یک کاربر دیگر گرفته شده است.</string>
     <string name="requesting_your_username_title">ایجاد نام کاربری</string>
+    <string name="requesting_your_username_message">تقاضا برای نام کاربری %s شما در حال ثبت روی شبکه دش است. این فرایند ممکن است کمی زمان ببرد. </string>
+    <string name="creating_your_username_message"> نام کاربری %sشما در حال ثبت روی شبکه دش است. این فرایند ممکن است کمی زمان ببرد. </string>
     <string name="requesting_your_username_error_title">درخواست نام کاربری‌تان ناموفق بود</string>
+    <string name="requesting_your_username_error_message">بنا به دلایلی، درخواست نام کاربری %s ناموفق بود. </string>
     <string name="voting">رای‌گیری:</string>
     <string name="this_username_has_already_been_requested">این نام کاربری قبلا درخواست شده، اما شما نیز می‌توانید آن را  درخواست کنید و تائید آن را به شبکه واگذار کنید.</string>
     <string name="request_details">جزئیات درخواست</string>
@@ -321,15 +328,13 @@
     <string name="make_a_post_with_the_text">یک پست با متن بالا در یک شبکه اجتماعی سرشناس و یا یک پلتفرم پیام‌رسان منتشر کنید تا مشخص شود شما مالک اصلی نام کاربری درخواست شده هستید و لینک زیر را در آن بچسبانید</string>
     <string name="paste_the_link">چسباندن لینک</string>
     <string name="voting_key_title">کلید رای‌گیری‌تان را وارد کنید</string>
-    <string name="voting_key_hint">کلید رای‌دهی مسترنود</string>
+    <string name="voting_key_hint">کلید خصوصی رای‌دهی مسترنود</string>
     <string name="voting_key_input_error">کلید اشتباه وارد کردید</string>
     <string name="voting_key_add">کلیدهای رای‌دهی‌تان را اضافه کنید</string>
     <string name="voting_key_add_subtitle">آی‌پی‌ آدرس‌(های) زیر مربوط به این کیف پول هستند</string>
     <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>
@@ -395,4 +400,15 @@
     <string name="request_username_balance_requirement">برا ایجاد نام کاربری باید ۰.۲۵ دش داشته باشید</string>
     <string name="request_username_length_requirement">بین ۳ تا ۲۳ کاراکتر</string>
     <string name="request_username_confirm">قبول می‌کنم</string>
+    <string name="username_vote_one_left_message">قبلاً با این نام کاربری %dبار رای داده‌اید. با این نام کاربری می‌توانید فقط یک بار رای دهید. </string>
+    <string name="username_vote_one_left">فقط یک رای باقی مانده است. </string>
+    <string name="username_vote_none_left_message">قبلاً با این نام کاربری %dبار رای داده‌اید. با این نام کاربری دیگر نمی‌توانید رای دهید. </string>
+    <string name="username_vote_none_left">هیچ رایی باقی نمانده است. </string>
+    <string name="request_username_blocked">نام کاربری درخواستی‌تان مسدود شده است. </string>
+    <string name="request_username_lost_vote">نام کاربری درخواستی به فرد دیگری داده شده است. </string>
+    <string name="request_username_blocked_message">نام کاربری %s توسط شبکه شد مسدود شد. لطفا یک نام کاربری دیگر را درخواست کنید. </string>
+    <string name="request_username_lost_vote_message">با توجه به فرآیند رای‌گیری، شبکه دش تصمیم گرفته که نام کاربری %s را به کاربری دیگر اختصاص دهد. لطفا یک نام کاربری دیگر را درخواست کنید. </string>
+    <string name="mix_dash_mix">ترکیب موجودی</string>
+    <string name="mix_dash_title">دش‌تان را ترکیب کنید</string>
+    <string name="mix_dash_message">برای اینکه افراد دیگر نتوانند پرداخت‌هایتان را ببینند، توصیه می‌شود پیش از ایجاد نام کاربری، موجودی‌تان را ترکیب کنید. </string>
     </resources>
diff --git a/wallet/res/values-fa/strings-extra.xml b/wallet/res/values-fa/strings-extra.xml
index fe6f91999c..c5acecdf75 100644
--- a/wallet/res/values-fa/strings-extra.xml
+++ b/wallet/res/values-fa/strings-extra.xml
@@ -25,6 +25,8 @@
     <string name="dialog_confirm_secured_by">تامین امنیت توسط</string>
     <string name="dialog_confirm_fee">کارمزد شبکه</string>
     <string name="dialog_confirm_total">مجموع</string>
+    <string name="dialog_confirm_accept_contact_request">پذیرش درخواست ارتباط</string>
+
     <string name="shortcut_action_join_dashpay">به دش‌پی بپیوندید</string>
     <!-- Home Screen: Shortcut Button: 2 lines, 9 characters across -->
     <string name="shortcut_secure_now">نسخه پشتیبان‌گیری</string>
@@ -33,6 +35,8 @@
     <!-- Home Screen: Shortcut Button: 2 lines, 9 characters across -->
     <string name="shortcut_pay_to_address">ارسال</string>
     <!-- Home Screen: Shortcut Button: 2 lines, 9 characters across -->
+    <string name="shortcut_pay_to_contact">ارسال برای مخاطب</string>
+    <!-- Home Screen: Shortcut Button: 2 lines, 9 characters across -->
     <string name="shortcut_buy_sell">خرید &amp;؛ فروش</string>
     <!-- Home Screen: Shortcut Button: 2 lines, 9 characters across -->
     <string name="shortcut_receive">دریافت</string>
@@ -78,6 +82,7 @@
     <string name="payments_tab_pay_label">ارسال</string>
     <string name="payments_tab_receive_label">دریافت</string>
     <string name="payments_pay_to_contact_title">ارسال برای یک مخاطب</string>
+    <string name="payments_pay_to_contact_sub_title">یک نفر در فهرست مخاطبان شما</string>
     <string name="payments_pay_to_contact_button">انتخاب</string>
     <string name="payments_pay_by_qr_title">ارسال توسط</string>
     <string name="payments_pay_by_qr_sub_title">اسکن کیوآر کد</string>
@@ -187,6 +192,9 @@
     <string name="notification_settings_title">نوتیفیکیشن‌ها</string>
     <string name="notification_explainer_title">دش والت می‌خواهد برایتان نوتیفیکیشن بفرستد</string>
     <string name="notification_explainer_message">نوتیفیکیشن شامل هشدار، صدا و آیکون هستند. همه اینها را می‌توان در بخش تنظیمات گوشی مشخص کرد. </string>
+    <string name="notification_dashpay_channel_name">دش پی</string>
+    <string name="notification_dashpay_channel_description">وضعیت عملیات در حال اجرای دش‌پی</string>
+
     <string name="net_type_indicator" />
 
     <string name="unlock_with_fingerprint">از اثرانگشت برای باز کردن قفل استفاده کنید.</string>
@@ -239,9 +247,11 @@
     <string name="transaction_close">بستن</string>
     <string name="transaction_details_amount_received">مبلغ دریافتی</string>
     <string name="transaction_details_amount_sent">مبلغ ارسالی</string>
+    <string name="transaction_details_amount_sent_successfully">ارسال موفق</string>
     <string name="transaction_details_sent_from">ارسال شد از</string>
     <string name="transaction_details_sent_to">ارسال شد به</string>
     <string name="transaction_details_received_at">دریافت شد در</string>
+    <string name="transaction_details_received_from">دریافت از</string>
     <string name="transaction_details_moved_from">منتقل شد از</string>
     <string name="transaction_details_moved_internally_to">به صورت داخلی منتقل شد به</string>
     <string name="transaction_failed_details">تراکنش ناموفق</string>
@@ -256,6 +266,7 @@
     <string name="authenticate_switch_to_pin">استفاده از پین کد</string>
 
     <string name="menu_invite_title">دعوت</string>
+    <string name="menu_invite_subtitle">به دوستان و خانواده‌تان کمک کنید به دش بپیوندند</string>
     <string name="menu_buy_and_sell_title">خرید &amp;؛ فروش دش </string>
     <string name="menu_buy_and_sell_subtitle">ارتباط با صرافی‌های طرف سوم</string>
     <string name="liquid_unavailable">امکان ادغام لیکوئید با دش والت دیگر امکان‌پذیر نیست</string>
@@ -367,8 +378,28 @@
     <string name="import_image_invalid_private">کلید خصوصی نامعتبر است</string>
     <string name="okay">باشه</string>
 
+    <string name="onboard_from_invite_title">بیایید شروع کنیم</string>
+    <string name="onboard_from_invite_subtitle">به دش‌پی خوش آمدید</string>
+    <string name="onboard_from_invite_step1">گام یک</string>
+    <string name="onboard_from_invite_step2">گام دو</string>
+    <string name="onboard_from_invite_step3">گام سه</string>
+    <string name="onboard_from_invite_step1_title">نام کاربری‌تان را انتخاب کنید</string>
+    <string name="onboard_from_invite_step2_title">رمز چهاررقمی‌تان را انتخاب کنید</string>
+    <string name="onboard_from_invite_step3_title">کیف پول‌تان را امن کنید</string>
+
     <string name="restore_wallet_please_wait">لطفا منتظر بمانید</string>
+    <string name="restore_wallet_restoring">کیف پول‌تان در حال بازیابی است</string>
+
+
+
     <string name="network_unavailable">شبکه در دسترس نیست</string>
+    <string name="network_error_contact_details">جزئیات مخاطبان منتقل نشد</string>
+    <string name="network_error_user_search">جستجو برای یک کاربر ناموفق بود</string>
+    <string name="network_error_contact_suggestions">ارائه پیشنهاد ناموفق بود</string>
+    <string name="network_error_unable_to_update_profile">به‌روزرسانی پروفایل ناموفق بود</string>
+
+
+
     <string name="today">امروز</string>
     <string name="yesterday">دیروز</string>
 
@@ -378,6 +409,8 @@
     <string name="all_transactions">همه</string>
     <string name="received_transactions">دریافتی</string>
     <string name="sent_transactions">ارسالی</string>
+    <string name="serious_error_title">خطای جدی</string>
+    <string name="serious_error_unknown">لطفا با پشتیبانی تماس بگیرید</string>
     <string name="set_pin_error_missing_wallet_title">خطای عدم دسترسی به کیف پول</string>
     <string name="set_pin_error_missing_wallet_message">کیف پول در دسترس نیست. این موضوع را به بخش پشتیبانی اطلاع دهید. </string>
     <string name="wallet_encryption_error_title">خطای ایجاد کیف پول</string>
@@ -427,4 +460,11 @@
     <string name="masternode_key_not_used">استفاده‌نشده</string>
     <string name="masternode_key_revoked">لغوشده</string>
     <string name="masternode_key_private_public_base64">کلیدهای خصوصی/عمومی (بیش۶۴)</string>
-    </resources>
\ No newline at end of file
+    <string name="timeskew_ahead">جلو</string>
+    <string name="timeskew_behind">عقب</string>
+
+    <!-- stale rates messages -->
+    <string name="stale_exchange_rates_error">قیمت‌ها به دست نیامد. قیمت‌های پول رسمی شاید نادرست باشد</string>
+    <string name="stale_exchange_rates_stale">قیمت‌ها متعلق به حداقل ۳۰ دقیقه پیش است. قیمت‌های پول رسمی شاید درست نباشد. </string>
+    <string name="stale_exchange_rates_volatile">قیمت‌ها از به‌روزرسانی قبلی بیش از ۵۰ درصد نوسان کرده است. </string>
+</resources>
\ No newline at end of file
diff --git a/wallet/res/values-fa/strings.xml b/wallet/res/values-fa/strings.xml
index 0c509df381..71772299c1 100644
--- a/wallet/res/values-fa/strings.xml
+++ b/wallet/res/values-fa/strings.xml
@@ -10,9 +10,11 @@
     <string name="blockchain_state_progress_days">%1$s، %2$d روز گذشته</string>
     <string name="blockchain_state_progress_weeks">%1$s، %2$d هفته گذشته</string>
     <string name="blockchain_state_progress_months">%1$s، %2$d ماه گذشته</string>
+    <string name="blockchain_state_progress_downloading">همزمان‌سازی با شبکه (%1$s%%)</string>
     <string name="blockchain_state_progress_stalled">توقف هماهنگ‌سازی</string>
     <string name="blockchain_state_progress_problem_storage">هماهنگ‌سازی: مشکل در فضای ذخیره</string>
     <string name="blockchain_state_progress_problem_network">هماهنگ‌سازی: مشکل در شبکه</string>
+    <string name="mixing_state_progress_mixing">ترکیب کوین‌ها (%1$s%%)</string>
     <string name="wallet_address_fragment_clipboard_msg">نشانی دش کپی شد</string>
     <string name="wallet_address_dialog_fragment_hint">برای حفاظت از حریم خصوصی‌ شما، نشانی‌تان به محض دریافت مبلغ مورد نظر تغییر خواهد یافت.</string>
     <string name="wallet_balance_fragment_too_much">این مقدار موجودی بیش از حد بالاست و بهتر است در جایی دیگر نگهداری شود. لطفا آن را به جایی امن‌تر منتقل کنید.</string>
@@ -42,6 +44,9 @@
     <string name="wallet_low_storage_dialog_button_apps">مدیریت اپلیکیشن‌ها</string>
     <string name="wallet_timeskew_dialog_title">بررسی تاریخ &amp; تنظیمات تاریخ</string>
     <string name="wallet_timeskew_dialog_msg">زمان دستگاه شما %dدقیقه با زمان رسمی تفاوت دارد. به همین خاطر، امکان ارسال و یا دریافت دش را نخواهید داشت. n\n\ باید زمان دستگاه خود را بررسی کرده و تاریخ، ساعت و نیز منطقه زمانی آن را به درستی تنظیم کنید. </string>
+    <string name="wallet_coinjoin_timeskew_dialog_msg">زمان دستگاه شما %s تا %d ثانیه است. به خاطر این تفاوت زمانی نمی‌توانید از کوین‌جوین استفاده کنید. 
+تنظیمات زمان روی دستگاه شما باید به «تنظیم خودکار» تغییر کند تا بتوانید از کوین‌جوین استفاده کنید. </string>
+    <string name="settings_coinjoin_timeskew_dialog_msg">زمان دستگاه شما بیش از ۵ ثانیه تفاوت دارد. به خاطر این تفاوت زمانی نمی‌توانید از کوین‌جوین استفاده کنید. تنظیمات زمان روی دستگاه شما باید به «تنظیم خودکار» تغییر کند تا بتوانید از کوین‌جوین استفاده کنید. </string>
     <string name="send_coins_activity_title">ارسال دش</string>
     <string name="send_coins_fragment_request_payment_request_progress">در حال دریافت امضاء از %s ...</string>
     <string name="send_coins_fragment_request_payment_request_failed_title">دریافت امضاء ناموفق بود</string>
@@ -171,6 +176,10 @@
     <string name="transaction_row_status_masternode_revoke">بازآوری مسترند</string>
     <string name="transaction_row_status_masternode_reward">پاداش مسترند</string>
     <string name="transaction_row_status_mining_reward">پاداش استخراج</string>
+    <string name="transaction_row_status_coinjoin_mixing_fee">کارمزد ترکیب کوین‌جوین</string>
+    <string name="transaction_row_status_coinjoin_make_collateral">ورودی وثیقه‌ای کوین‌جوین</string>
+    <string name="transaction_row_status_coinjoin_mixing">ترکیب کوین‌جوین</string>
+    <string name="transaction_row_status_coinjoin_create_denominations">کوین‌جوین واحد پولی ایجاد می‌کند. </string>
     <string name="network_monitor_activity_title">بررسی وضعیت شبکه</string>
     <string name="network_monitor_peer_list_title">همتایان</string>
     <string name="network_monitor_block_list_title">بلوک‌ها</string>
@@ -329,6 +338,7 @@
     <string name="notification_inactivity_message">هنوزمقداری دش در کیف پول‌تان در این دستگاه قرار دارد! لطفا پیش از حذف دش والت، عبارت بازیابی را یادداشت کنید، در غیر این صورت، موجودی‌تان به مبلغ %s را از دست خواهید داد. </string>
     <string name="notification_inactivity_action_dismiss">بعدا یادآوری کن!</string>
     <string name="notification_inactivity_action_dismiss_forever">دیگر یادآوری نکن!</string>
+    <string name="notification_bluetooth_service_listening">آماده دریافت پرداختی از طریق بلوتوث</string>
     <string name="appwidget_wallet_balance_title">موجودی دش</string>
 
     <!-- generic buttons -->
diff --git a/wallet/res/values-fil/strings-dashpay.xml b/wallet/res/values-fil/strings-dashpay.xml
index e61be6499f..e13121cca2 100644
--- a/wallet/res/values-fil/strings-dashpay.xml
+++ b/wallet/res/values-fil/strings-dashpay.xml
@@ -262,14 +262,15 @@ Username</b></string>
     <string name="keep_your_passphrase_safe">Panatilihing ligtas ang iyong passphrase</string>
     <string name="pay_now">Magbayad ngayon at kung hindi naaprubahan, maaari kang lumikha ng ibang pangalan nang hindi nagbabayad muli</string>
     <string name="case_your_request_is_not_approved">Kung sakaling hindi maaprubahan ang iyong kahilingan</string>
-    <string name="voting_requirement_subtitle">Awtomatikong maaaprubahan ang anumang username na mayroong numero 2–9 o mas mahaba sa 20 karakter</string>
+    <string name="voting_requirement_subtitle">Awtomatikong maaaprubahan ang anumang username na mayroong numero 2–9 o 20 o higit pang mga character</string>
     <string name="voting_requirement_title">Ang pagboto ay kinakailangan lamang sa ilang mga kaso</string>
     <string name="dash_network_must_vote_to_approve">Dapat bumoto ang Dash network upang aprubahan ang iyong username bago ito malikha.</string>
     <string name="what_is_username_voting">Ano ang pagboto ng username\?</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 magawa ng mga user.</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>
     <string name="n_usernames">%d mga username</string>
     <string name="n_requests">%d mga kahilingan</string>
@@ -292,8 +293,10 @@ Username</b></string>
         <item>Lahat</item>
         <item>Naaprubahan ko na</item>
         <item>hindi ko na inaprubahan</item>
+        <item>May Naka-block na mga boto</item>
     </string-array>
 
+    <string name="block_vote_count">%d (mga) block</string>
     <string name="request_your_username">Gumawa ng iyong username</string>
     <string name="request_your_hint">Pakitandaan na hindi mo na ito mababago sa hinaharap</string>
     <string name="request_username">Humiling ng Username</string>
@@ -301,8 +304,12 @@ Username</b></string>
     <string name="request_username_available">Available ang username</string>
     <string name="request_username_unavailable">Hindi available o naka-block ang username</string>
     <string name="request_username_taken">Kinuha ang username</string>
+    <string name="request_username_taken_results">Ang username ay kinuha ng ibang user</string>
     <string name="requesting_your_username_title">Paglikha ng iyong username</string>
+    <string name="requesting_your_username_message">Ang iyong username %say hinihiling sa network ng Dash. Maaaring tumagal ng ilang oras.</string>
+    <string name="creating_your_username_message">Ang iyong username %say ginagawa sa Dash network. Maaaring tumagal ng ilang oras.</string>
     <string name="requesting_your_username_error_title">Nabigo ang iyong kahilingan sa username</string>
+    <string name="requesting_your_username_error_message">Para sa ilang kadahilanan, ang kahilingan para sa username %say nabigo. </string>
     <string name="voting">Pagboto:</string>
     <string name="this_username_has_already_been_requested">Ang username na ito ay hiniling na, ngunit maaari mo rin itong hilingin at hayaan ang network na bumoto upang magpasya kung maaari mong makuha ito</string>
     <string name="request_details">Mga detalye ng kahilingan</string>
@@ -323,15 +330,14 @@ Username</b></string>
     <string name="make_a_post_with_the_text">Gumawa ng post gamit ang text sa itaas sa isang kilalang social media o messaging platform para i-verify na ikaw ang orihinal na may-ari ng hiniling na username at i-paste ang link sa ibaba</string>
     <string name="paste_the_link">Idikit ang link</string>
     <string name="voting_key_title">Ilagay ang iyong voting key</string>
-    <string name="voting_key_hint">Masternode Voting Key</string>
+    <string name="voting_key_hint">Masternode Voting Private Key</string>
     <string name="voting_key_input_error">Naglagay ka ng di-wastong key</string>
+    <string name="voting_key_input_not_active_error">Naglagay ka ng key na hindi nauugnay sa isang aktibong Masternode</string>
     <string name="voting_key_add">Idagdag ang iyong mga susi sa pagboto</string>
     <string name="voting_key_add_subtitle">Ang (mga) IP address sa ibaba ay nauugnay sa wallet na ito</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>
@@ -397,4 +403,15 @@ Username</b></string>
     <string name="request_username_balance_requirement">Kailangan mong magkaroon ng 0.25 DASH para magawa ang username na ito</string>
     <string name="request_username_length_requirement">Sa pagitan ng 3 at 23 na mga karakter</string>
     <string name="request_username_confirm">Tinatanggap Ko</string>
-    </resources>
+    <string name="username_vote_one_left_message">Nakaboto ka na para sa username na ito %d beses. Maaari ka lamang magsumite ng isa pang boto para sa username na ito.</string>
+    <string name="username_vote_one_left">Isang boto ang natitira</string>
+    <string name="username_vote_none_left_message">Nakaboto ka na para sa username na ito %d beses. Hindi ka na makakapagboto pa para sa username na ito.</string>
+    <string name="username_vote_none_left">Walang natitirang boto</string>
+    <string name="request_username_blocked">Na-block ang hiniling na username</string>
+    <string name="request_username_lost_vote">Ang hiniling na username ay ibinigay sa ibang tao</string>
+    <string name="request_username_blocked_message">Ang username %say hinarangan ng Dash Network. Pakisubukang muli sa pamamagitan ng paghiling ng isa pang username. </string>
+    <string name="request_username_lost_vote_message">Dahil sa proseso ng pagboto, nagpasya ang Dash Network na italaga ang username %s sa ibang tao. Pakisubukang muli sa pamamagitan ng paghiling ng isa pang username.</string>
+    <string name="mix_dash_mix">Paghaluin ang Balanse</string>
+    <string name="mix_dash_title">Paghaluin ang iyong Dash</string>
+    <string name="mix_dash_message">Upang makatulong na pigilan ang ibang tao na makita kung kanino ka magbabayad, inirerekomendang ihalo ang iyong balanse bago mo gawin ang iyong username.</string>
+</resources>
diff --git a/wallet/res/values-fil/strings-extra.xml b/wallet/res/values-fil/strings-extra.xml
index f7f6c78049..e947d14469 100644
--- a/wallet/res/values-fil/strings-extra.xml
+++ b/wallet/res/values-fil/strings-extra.xml
@@ -25,6 +25,8 @@
     <string name="dialog_confirm_secured_by">Siniguro ni</string>
     <string name="dialog_confirm_fee">Network fee</string>
     <string name="dialog_confirm_total">Kabuuan</string>
+    <string name="dialog_confirm_accept_contact_request">Tanggapin ang kahilingan sa pakikipag-ugnayan</string>
+
     <string name="shortcut_action_join_dashpay">Sumali sa DashPay</string>
     <!-- Home Screen: Shortcut Button: 2 lines, 9 characters across -->
     <string name="shortcut_secure_now">back-up</string>
@@ -188,6 +190,9 @@
     <string name="notification_settings_title">Mga Notipikasyon</string>
     <string name="notification_explainer_title">Gustong magpadala sa iyo ng mga notification ang Dash Wallet</string>
     <string name="notification_explainer_message">Maaaring kasama sa mga notification ang mga alerto, tunog, at icon na mga badge. Maaaring i-configure ang mga ito sa Mga Setting ng telepono.</string>
+    <string name="notification_dashpay_channel_name">DashPay</string>
+    <string name="notification_dashpay_channel_description">Status ng patuloy na pagpapatakbo ng DashPay.</string>
+
     <string name="net_type_indicator" />
 
     <string name="unlock_with_fingerprint">Gamitin ang iyong fingerprint para mabuksan.</string>
@@ -240,6 +245,7 @@
     <string name="transaction_close">Sarado</string>
     <string name="transaction_details_amount_received">Halagang natanggap</string>
     <string name="transaction_details_amount_sent">Halagang ipinadala</string>
+    <string name="transaction_details_amount_sent_successfully">Matagumpay na Naipadala</string>
     <string name="transaction_details_sent_from">Pinadala mula</string>
     <string name="transaction_details_sent_to">Ipadala kay</string>
     <string name="transaction_details_received_at">Natanggap sa</string>
@@ -258,6 +264,7 @@
     <string name="authenticate_switch_to_pin">Gamitin ang PIN</string>
 
     <string name="menu_invite_title">Mag-imbita</string>
+    <string name="menu_invite_subtitle">Tulungan ang iyong mga kaibigan at pamilya na sumali sa Dash</string>
     <string name="menu_buy_and_sell_title">Bumili at magbenta ng Dash</string>
     <string name="menu_buy_and_sell_subtitle">Ikonekta sa mga third party na palitan</string>
     <string name="liquid_unavailable">Hindi na available ang liquid integration sa Dash Wallet</string>
@@ -369,16 +376,28 @@
     <string name="import_image_invalid_private">Di-wastong Private Key</string>
     <string name="okay">Okay</string>
 
+    <string name="onboard_from_invite_title">Magsimula na tayo</string>
     <string name="onboard_from_invite_subtitle">Maligayang pagdating sa DashPay</string>
+    <string name="onboard_from_invite_step1">Hakbang 1</string>
+    <string name="onboard_from_invite_step2">Hakbang 2</string>
+    <string name="onboard_from_invite_step3">Hakbang 3</string>
     <string name="onboard_from_invite_step1_title">Piliin ang Iyong Username</string>
     <string name="onboard_from_invite_step2_title">I-set ang Iyong PIN</string>
     <string name="onboard_from_invite_step3_title">I-secure ang Iyong Wallet</string>
 
     <string name="restore_wallet_please_wait">Mangyaring maghintay</string>
+    <string name="restore_wallet_restoring">Ibinabalik ang iyong wallet</string>
+
+
+
     <string name="network_unavailable">Hindi Magagamit ang Network</string>
     <string name="network_error_contact_details">Hindi makuha ang mga detalye ng contact</string>
     <string name="network_error_user_search">Hindi makapaghanap ng user</string>
     <string name="network_error_contact_suggestions">Hindi makapagbigay ng mga mungkahi</string>
+    <string name="network_error_unable_to_update_profile">Hindi ma-update ang iyong profile</string>
+
+
+
     <string name="today">Ngayon</string>
     <string name="yesterday">Kahapon</string>
 
@@ -388,6 +407,8 @@
     <string name="all_transactions">Lahat</string>
     <string name="received_transactions">Natanggap</string>
     <string name="sent_transactions">Ipinadala</string>
+    <string name="serious_error_title">Malubhang Pagkakamali</string>
+    <string name="serious_error_unknown">Mangyaring makipag-ugnayan sa suporta.</string>
     <string name="set_pin_error_missing_wallet_title">Nawawalang Wallet Error</string>
     <string name="set_pin_error_missing_wallet_message">Nawawala ang wallet. Mangyaring iulat ito sa Support Desk.</string>
     <string name="wallet_encryption_error_title">Error sa Paggawa ng Wallet</string>
@@ -437,6 +458,9 @@
     <string name="masternode_key_not_used">hindi ginagamit</string>
     <string name="masternode_key_revoked">Binawi</string>
     <string name="masternode_key_private_public_base64">Pribado / Pampublikong Susi (base64)</string>
+    <string name="timeskew_ahead">sa unahan</string>
+    <string name="timeskew_behind">sa huli</string>
+
     <!-- stale rates messages -->
     <string name="stale_exchange_rates_error">Hindi nakuha ang mga presyo. Maaaring mali ang mga halaga ng Fiat.</string>
     <string name="stale_exchange_rates_stale">Ang mga presyo ay hindi bababa sa 30 minutong gulang. Maaaring mali ang mga halaga ng Fiat.</string>
diff --git a/wallet/res/values-fil/strings.xml b/wallet/res/values-fil/strings.xml
index bb454e78e5..dbb328aab5 100644
--- a/wallet/res/values-fil/strings.xml
+++ b/wallet/res/values-fil/strings.xml
@@ -9,9 +9,11 @@
     <string name="blockchain_state_progress_days">Huli ng %1$s, %2$d araw</string>
     <string name="blockchain_state_progress_weeks">Huli ng %1$s, %2$d linggo</string>
     <string name="blockchain_state_progress_months">Huli ng %1$s, %2$d buwan</string>
+    <string name="blockchain_state_progress_downloading">Pagtutugma sa network (%1$s%%)</string>
     <string name="blockchain_state_progress_stalled">Naantala ang pagtutugma</string>
     <string name="blockchain_state_progress_problem_storage">Pagtutugma: Problema sa storage</string>
     <string name="blockchain_state_progress_problem_network">Pagtutugma: Problema sa network</string>
+    <string name="mixing_state_progress_mixing">Paghahalo ng mga barya (%1$s%%)</string>
     <string name="wallet_address_fragment_clipboard_msg">Ang Dash address ay nakopya na sa clipboard</string>
     <string name="wallet_address_dialog_fragment_hint">Para maprotektahan ang iyong pagiging pribado, babaguhin ang iyong address sa oras na matanggap ang bayad.</string>
     <string name="wallet_balance_fragment_too_much">Ang halagang ito ay masyadong mataas para dalhin ng iyong pitaka. Pakilipat ang iba sa mas ligtas na lugar.</string>
@@ -41,6 +43,8 @@
     <string name="wallet_low_storage_dialog_button_apps">Pangasiwaan ang apps</string>
     <string name="wallet_timeskew_dialog_title">Suriin ang settings ng petsa &amp; oras </string>
     <string name="wallet_timeskew_dialog_msg">Ang oras sa iyong device ay huli ng %d minuto. Maaaring hindi ka makapagpadala o makatanggap ng Dash dahil sa problemang ito.\n\nPalaging suriin at hanggat maaari ayusin ang settings ng iyong petsa, oras at time zone.</string>
+    <string name="wallet_coinjoin_timeskew_dialog_msg">Ang oras ng iyong device ay %s sa pamamagitang ng %d segundo. Hindi mo magagamit ang CoinJoin dahil sa pagkakaibang ito.\n\nAng mga setting ng oras sa iyong device ay kailangang baguhin sa “Awtomatikong itakda ang oras” para magamit ang CoinJoin.</string>
+    <string name="settings_coinjoin_timeskew_dialog_msg">Ang oras ng iyong device ay naka-off nang higit sa 5 segundo. Hindi mo magagamit ang CoinJoin dahil sa pagkakaibang ito.\n\nAng mga setting ng oras sa iyong device ay kailangang baguhin sa “Awtomatikong itakda ang oras” bago gamitin ang CoinJoin.</string>
     <string name="send_coins_activity_title">Ipadala ang Dash</string>
     <string name="send_coins_fragment_request_payment_request_progress">Nakakuha ng pansin ang lagda mula %s…</string>
     <string name="send_coins_fragment_request_payment_request_failed_title">Ang pagkuha ng pansin ng lagda ay hindi nagtagumpay</string>
@@ -170,6 +174,10 @@
     <string name="transaction_row_status_masternode_revoke">Pagbawi ng Masternode</string>
     <string name="transaction_row_status_masternode_reward">Pag-gantimpala ng Masternode</string>
     <string name="transaction_row_status_mining_reward">Gantimpala sa pagmimina</string>
+    <string name="transaction_row_status_coinjoin_mixing_fee">Bayad sa Paghahalo ng CoinJoin</string>
+    <string name="transaction_row_status_coinjoin_make_collateral">Mga Collateral na Input ng CoinJoin</string>
+    <string name="transaction_row_status_coinjoin_mixing">Paghahalo ng CoinJoin</string>
+    <string name="transaction_row_status_coinjoin_create_denominations">CoinJoin Lumikha ng mga Denominasyon</string>
     <string name="network_monitor_activity_title">Network monitor</string>
     <string name="network_monitor_peer_list_title">Mga kapantay</string>
     <string name="network_monitor_block_list_title">Bloke</string>
@@ -328,6 +336,7 @@
     <string name="notification_inactivity_message">Mayroon ka pang dash sa device na ito! Siguraduhing na naisulat ang iyong recovery phrase bago i-uninstall ang Dash Walet o mawawala lahat ng iyong balanse na %s.</string>
     <string name="notification_inactivity_action_dismiss">Paalalahanan mo ako mamaya</string>
     <string name="notification_inactivity_action_dismiss_forever">Wag mo akong paalalahanan</string>
+    <string name="notification_bluetooth_service_listening">Handa nang tumanggap ng mga pagbabayad sa pamamagitan ng Bluetooth</string>
     <string name="appwidget_wallet_balance_title">Balanse ng Dash</string>
 
     <!-- generic buttons -->
diff --git a/wallet/res/values-fr/strings-dashpay.xml b/wallet/res/values-fr/strings-dashpay.xml
index ee6f346a26..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>
@@ -261,14 +261,17 @@
     <string name="keep_your_passphrase_safe">Gardez secrète votre phrase de passe</string>
     <string name="pay_now">Veuillez payer maintenant. En cas de non-approbation, vous pourrez créer un nom différent sans repayer</string>
     <string name="case_your_request_is_not_approved">Dans le cas où votre demande n\'est pas approuvée</string>
-    <string name="voting_requirement_subtitle">Un nom d\'utilisateur qui contient au moins un chiffre de 2 à 9, ou bien qui a une longueur de plus de 20 caractères, sera approuvé automatiquement</string>
+    <string name="voting_requirement_subtitle">Tout nom d\'utilisateur qui contient un chiffre entre 2 et 9, ou bien qui a 20 caractères ou plus, sera automatiquement approuvé</string>
     <string name="voting_requirement_title">Voter est requis seulement dans certains cas</string>
     <string name="dash_network_must_vote_to_approve">Le réseau Dash doit voter pour approuver votre nom d\'utilisateur avant sa création.</string>
     <string name="what_is_username_voting">Qu\'est-ce que le vote des noms d\'utilisateur \?</string>
     <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 noms d\'utilisateur demandés, avant que les utilisateurs ne puissent les créer.</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>
     <string name="n_usernames">%d noms d\'utilisateur</string>
     <string name="n_requests">%d demandes</string>
@@ -291,22 +294,39 @@
         <item>Tous</item>
         <item>J\'ai approuvé</item>
         <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 qu\'il vous sera impossible de le modifier plus tard</string>
+    <string name="request_your_hint">Veuillez noter que vous ne pourrez pas le changer plus tard</string>
     <string name="request_username">Demander un nom d\'utilisateur</string>
     <string name="request_voting_range">Le réseau Dash votera sur ce nom d\'utilisateur. Vous serez informé du résultat le %s.</string>
     <string name="request_username_available">Le nom d\'utilisateur est disponible</string>
     <string name="request_username_unavailable">Le nom d\'utilisateur n\'est pas disponible, ou il est bloqué</string>
     <string name="request_username_taken">Le nom d\'utilisateur est déjà pris</string>
+    <string name="request_username_taken_results">Le nom d\'utilisateur a été pris par un autre utilisateur</string>
     <string name="requesting_your_username_title">Création de votre nom d\'utilisateur</string>
+    <string name="requesting_your_username_message">Votre nom d\'utilisateur %s est en cours de demande sur le réseau Dash. Cela peut prendre un certain temps.</string>
+    <string name="creating_your_username_message">Votre nom d\'utilisateur %s est en train d\'être créé sur le réseau Dash. Cela peut prendre un certain temps.</string>
     <string name="requesting_your_username_error_title">Votre demande de nom d\'utilisateur a échoué</string>
+    <string name="requesting_your_username_error_message">Pour une certaine raison, la demande du nom d\'utilisateur %s a échoué.</string>
     <string name="voting">Votation :</string>
     <string name="this_username_has_already_been_requested">Le nom d\'utilisateur a déjà été demandé, mais vous pouvez aussi le demander et laisser le réseau voter et décider si vous pouvez l\'obtenir</string>
     <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>
@@ -322,15 +342,34 @@
     <string name="make_a_post_with_the_text">Publiez le texte ci-dessus sur un réseau social connu ou une plateforme de messagerie pour vérifier que vous êtes le propriétaire véritable du nom d\'utilisateur demandé, et collez le lien ci-dessous</string>
     <string name="paste_the_link">Copiez-collez le lien</string>
     <string name="voting_key_title">Saisissez votre clé de vote</string>
-    <string name="voting_key_hint">Clé de vote de masternode</string>
+    <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="vote_submitted">Votre vote a été soumis</string>
-    <string name="vote_cancelled">Votre vote a été annulé</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>
@@ -396,4 +435,15 @@
     <string name="request_username_balance_requirement">Vous devez avoir 0,25 dashs pour créer ce nom d\'utilisateur</string>
     <string name="request_username_length_requirement">entre 3 et 23 caractères</string>
     <string name="request_username_confirm">J\'accepte</string>
+    <string name="username_vote_one_left_message">Vous avez déjà voté pour ce nom d\'utilisateur %d fois. Vous pouvez encore voter une seule fois pour ce nom d\'utilisateur.</string>
+    <string name="username_vote_one_left">Plus qu\'un vote</string>
+    <string name="username_vote_none_left_message">Vous avez déjà voté pour ce nom d\'utilisateur %d fois. Vous ne pouvez plus voter pour ce nom d\'utilisateur.</string>
+    <string name="username_vote_none_left">Plus de vote possible</string>
+    <string name="request_username_blocked">Le nom d\'utilisateur demandé a été bloqué</string>
+    <string name="request_username_lost_vote">Le nom d\'utilisateur demandé a été accordé à quelqu\'un d\'autre</string>
+    <string name="request_username_blocked_message">Le nom d\'utilisateur %s a été bloqué par le réseau Dash. Veuillez réessayer avec un autre nom d\'utilisateur.</string>
+    <string name="request_username_lost_vote_message">Dans son processus de vote, le réseau Dash a décidé d\'attribuer le nom d\'utilisateur %s à quelqu\'un d\'autre. Veuillez réessayer avec un autre nom d\'utilisateur.</string>
+    <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>
diff --git a/wallet/res/values-fr/strings-extra.xml b/wallet/res/values-fr/strings-extra.xml
index 8e413b398b..3dd5413df3 100644
--- a/wallet/res/values-fr/strings-extra.xml
+++ b/wallet/res/values-fr/strings-extra.xml
@@ -25,6 +25,8 @@
     <string name="dialog_confirm_secured_by">Sécurisé par</string>
     <string name="dialog_confirm_fee">Frais de réseau</string>
     <string name="dialog_confirm_total">Total</string>
+    <string name="dialog_confirm_accept_contact_request">Accepter la demande de contact</string>
+
     <string name="shortcut_action_join_dashpay">Rejoindre DashPay</string>
     <!-- Home Screen: Shortcut Button: 2 lines, 9 characters across -->
     <string name="shortcut_secure_now">Sauvegarde</string>
@@ -191,6 +193,9 @@
     <string name="notification_settings_title">Notifications</string>
     <string name="notification_explainer_title">Dash Wallet aimerait vous envoyer des notifications</string>
     <string name="notification_explainer_message">Les notifications peuvent inclure des alertes, des sons et des icônes. Cela peut être configuré dans les réglages du smartphone.</string>
+    <string name="notification_dashpay_channel_name">DashPay</string>
+    <string name="notification_dashpay_channel_description">État des opérations DashPay en cours.</string>
+
     <string name="net_type_indicator" />
 
     <string name="unlock_with_fingerprint">Utilisez votre empreinte digitale pour déverrouiller</string>
@@ -243,6 +248,7 @@
     <string name="transaction_close">Fermer</string>
     <string name="transaction_details_amount_received">Montant reçu</string>
     <string name="transaction_details_amount_sent">Montant envoyé</string>
+    <string name="transaction_details_amount_sent_successfully">Envoyé avec succès</string>
     <string name="transaction_details_sent_from">Envoyé depuis</string>
     <string name="transaction_details_sent_to">Envoyé à</string>
     <string name="transaction_details_received_at">Reçu à</string>
@@ -261,6 +267,7 @@
     <string name="authenticate_switch_to_pin">Utiliser code PIN</string>
 
     <string name="menu_invite_title">Inviter</string>
+    <string name="menu_invite_subtitle">Aidez vos amis et votre famille à rejoindre Dash</string>
     <string name="menu_buy_and_sell_title">Acheter &amp; vendre des dashs</string>
     <string name="menu_buy_and_sell_subtitle">Se connecter aux plateformes de change tierces</string>
     <string name="liquid_unavailable">L\'intégration Liquid dans Dash Wallet n\'est plus disponible</string>
@@ -372,16 +379,28 @@
     <string name="import_image_invalid_private">Clé privée invalide</string>
     <string name="okay">OK</string>
 
+    <string name="onboard_from_invite_title">Commençons !</string>
     <string name="onboard_from_invite_subtitle">Bienvenue sur DashPay</string>
+    <string name="onboard_from_invite_step1">Étape 1</string>
+    <string name="onboard_from_invite_step2">Étape 2</string>
+    <string name="onboard_from_invite_step3">Étape 3</string>
     <string name="onboard_from_invite_step1_title">Choisir votre nom d\'utilisateur</string>
     <string name="onboard_from_invite_step2_title">Choisir votre code PIN</string>
     <string name="onboard_from_invite_step3_title">Sécuriser votre portefeuille</string>
 
     <string name="restore_wallet_please_wait">Veuillez patienter</string>
+    <string name="restore_wallet_restoring">Votre portefeuille est en cours de restauration</string>
+
+
+
     <string name="network_unavailable">Réseau non disponible</string>
     <string name="network_error_contact_details">Impossibke de récupérer les détails de contact</string>
     <string name="network_error_user_search">Impossible de rechercher un utilisateur</string>
     <string name="network_error_contact_suggestions">Impossible de fournir des suggestions</string>
+    <string name="network_error_unable_to_update_profile">Impossible de mettre à jour votre profil</string>
+
+
+
     <string name="today">Aujourd\'hui</string>
     <string name="yesterday">Hier</string>
 
@@ -391,6 +410,8 @@
     <string name="all_transactions">Tous</string>
     <string name="received_transactions">Reçu</string>
     <string name="sent_transactions">Envoyé</string>
+    <string name="serious_error_title">Erreur sévère</string>
+    <string name="serious_error_unknown">Veuillez contacter le support.</string>
     <string name="set_pin_error_missing_wallet_title">Erreur de portefeuille manquant</string>
     <string name="set_pin_error_missing_wallet_message">Le portefeuille est absent. Veuillez le signaler au service d\'assistance.</string>
     <string name="wallet_encryption_error_title">Erreur de création de portefeuille</string>
@@ -440,6 +461,9 @@
     <string name="masternode_key_not_used">Non utilisé</string>
     <string name="masternode_key_revoked">Révoqué</string>
     <string name="masternode_key_private_public_base64">Clés privée / publique (base64)</string>
+    <string name="timeskew_ahead">en avant</string>
+    <string name="timeskew_behind">en arrière</string>
+
     <!-- stale rates messages -->
     <string name="stale_exchange_rates_error">Les cours n\'ont pas pu être récupérés. Les valeurs fiduciaires peuvent être incorrectes.</string>
     <string name="stale_exchange_rates_stale">Les cours ont au minimum 30 minutes d\'âge. Les valeurs fiduciaires peuvent être incorrectes.</string>
diff --git a/wallet/res/values-fr/strings.xml b/wallet/res/values-fr/strings.xml
index dbe50cc232..d8f822d8c4 100644
--- a/wallet/res/values-fr/strings.xml
+++ b/wallet/res/values-fr/strings.xml
@@ -9,9 +9,11 @@
     <string name="blockchain_state_progress_days">%1$s, %2$d jours en retard</string>
     <string name="blockchain_state_progress_weeks">%1$s, %2$d semaines en retard</string>
     <string name="blockchain_state_progress_months">%1$s, %2$d mois en retard</string>
+    <string name="blockchain_state_progress_downloading">Synchronisation avec le réseau (%1$s%%)</string>
     <string name="blockchain_state_progress_stalled">Synchronisation en suspens</string>
     <string name="blockchain_state_progress_problem_storage">Synchronisation : problème de stockage</string>
     <string name="blockchain_state_progress_problem_network">Synchronisation : problème de réseau</string>
+    <string name="mixing_state_progress_mixing">Mélange de fonds (%1$s%%)</string>
     <string name="wallet_address_fragment_clipboard_msg">Adresse Dash copiée dans le presse-papier</string>
     <string name="wallet_address_dialog_fragment_hint">Par souci de confidentialité, votre adresse changera après avoir reçu un paiement.</string>
     <string name="wallet_balance_fragment_too_much">Ce montant est un peu trop élevé pour être transporté dans votre poche. Veuillez en déplacer une partie dans un endroit plus sûr.</string>
@@ -41,6 +43,8 @@
     <string name="wallet_low_storage_dialog_button_apps">Gérer les applications</string>
     <string name="wallet_timeskew_dialog_title">Veuillez vérifier les réglages de date &amp; heure.</string>
     <string name="wallet_timeskew_dialog_msg">L\'horloge de votre appareil est décalée de %d minutes. Vous ne pouvez sans doute pas envoyer ou recevoir de dashs pour cette raison.\n\nVeuillez vérifier et éventuellement corriger la date, l\'heure et le fuseau horaire de votre appareil.</string>
+    <string name="wallet_coinjoin_timeskew_dialog_msg">L\'heure de votre appareil est %s de %d secondes. Vous ne pouvez pas utiliser CoinJoin en raison de cette différence.\n\nLes réglages de l\'heure sur votre appareil doivent être réglés sur “Régler l\'heure automatiquement” pour utiliser CoinJoin.</string>
+    <string name="settings_coinjoin_timeskew_dialog_msg">L\'heure de votre appareil est décalée de plus de 5 secondes. Vous ne pouvez pas utiliser CoinJoin en raison de cette différence.\n\nLes réglages de l\'heure sur votre appareil doivent être réglés sur “Régler l\'heure automatiquement” pour utiliser CoinJoin.</string>
     <string name="send_coins_activity_title">Envoyer dashs</string>
     <string name="send_coins_fragment_request_payment_request_progress">Récupération de la signature de %s…</string>
     <string name="send_coins_fragment_request_payment_request_failed_title">Échec lors de la récupération de la signature</string>
@@ -170,6 +174,10 @@
     <string name="transaction_row_status_masternode_revoke">Révocation de masternode</string>
     <string name="transaction_row_status_masternode_reward">Récompense de masternode</string>
     <string name="transaction_row_status_mining_reward">Récompense de minage</string>
+    <string name="transaction_row_status_coinjoin_mixing_fee">Frais de mélange CoinJoin</string>
+    <string name="transaction_row_status_coinjoin_make_collateral">Entrées de caution CoinJoin</string>
+    <string name="transaction_row_status_coinjoin_mixing">Mélange CoinJoin en cours</string>
+    <string name="transaction_row_status_coinjoin_create_denominations">Création de coupures CoinJoin</string>
     <string name="network_monitor_activity_title">Surveillance du réseau</string>
     <string name="network_monitor_peer_list_title">Pairs</string>
     <string name="network_monitor_block_list_title">Blocs</string>
@@ -328,6 +336,7 @@
     <string name="notification_inactivity_message">Il vous reste des dashs sur cet appareil ! Assurez-vous d\'avoir noté votre phrase de récupération avant de désinstaller Dash Wallet, sinon vous perdrez votre solde de %s.</string>
     <string name="notification_inactivity_action_dismiss">Me le rappeler plus tard</string>
     <string name="notification_inactivity_action_dismiss_forever">Ne plus me le rappeler</string>
+    <string name="notification_bluetooth_service_listening">Prêt à recevoir des paiements via Bluetooth</string>
     <string name="appwidget_wallet_balance_title">Solde Dash</string>
 
     <!-- generic buttons -->
diff --git a/wallet/res/values-id/strings-dashpay.xml b/wallet/res/values-id/strings-dashpay.xml
index 5cbca44ee4..0b31164413 100644
--- a/wallet/res/values-id/strings-dashpay.xml
+++ b/wallet/res/values-id/strings-dashpay.xml
@@ -262,14 +262,15 @@ Dash</b> anda</string>
     <string name="keep_your_passphrase_safe">Simpan frasa sandi Anda dengan aman</string>
     <string name="pay_now">Bayar sekarang dan jika tidak disetujui, Anda dapat membuat nama lain tanpa membayar lagi</string>
     <string name="case_your_request_is_not_approved">Jika permintaan Anda tidak disetujui</string>
-    <string name="voting_requirement_subtitle">Nama pengguna apa pun yang memiliki angka 2–9 atau lebih dari 20 karakter akan disetujui secara otomatis</string>
+    <string name="voting_requirement_subtitle">Nama pengguna apa pun yang memiliki jumlah 2–9 atau 20 karakter atau lebih akan disetujui secara otomatis</string>
     <string name="voting_requirement_title">Pemungutan suara hanya diperlukan dalam beberapa kasus</string>
     <string name="dash_network_must_vote_to_approve">Jaringan Dash harus memilih untuk menyetujui nama pengguna Anda sebelum dibuat.</string>
     <string name="what_is_username_voting">Apa itu voting nama pengguna\?</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 memilih untuk menyetujui nama pengguna yang diminta sebelum pengguna dapat membuatnya.</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>
     <string name="n_usernames">%d nama pengguna</string>
     <string name="n_requests">%d permintaan</string>
@@ -292,17 +293,23 @@ Dash</b> anda</string>
         <item>Semua</item>
         <item>Saya telah menyetujui</item>
         <item>Saya tidak menyetujui</item>
+        <item>Telah memblokir suara</item>
     </string-array>
 
+    <string name="block_vote_count">%d Block(s)</string>
     <string name="request_your_username">Buat Nama Pengguna anda</string>
-    <string name="request_your_hint">Mohon diperhatikan bahwa Anda tidak akan dapat mengubahnya di masa mendatang</string>
+    <string name="request_your_hint">Harap dicatat bahwa Anda tidak akan dapat mengubahnya di masa mendatang</string>
     <string name="request_username">Minta Nama Pengguna</string>
     <string name="request_voting_range">Jaringan Dash akan memberikan suara pada nama pengguna ini. Kami akan memberitahukan Anda hasilnya pada %s.</string>
     <string name="request_username_available">Nama pengguna tersedia</string>
     <string name="request_username_unavailable">Nama pengguna tidak tersedia atau diblokir</string>
     <string name="request_username_taken">Nama pengguna telah diambil</string>
+    <string name="request_username_taken_results">Nama pengguna telah diambil oleh pengguna lain</string>
     <string name="requesting_your_username_title">Membuat Nama Pengguna anda</string>
+    <string name="requesting_your_username_message">Nama pengguna anda %s sedang diminta di jaringan Dash. Mungkin perlu waktu.</string>
+    <string name="creating_your_username_message">Nama pengguna anda %s sedang dibuat di jaringan Dash. Mungkin perlu waktu.</string>
     <string name="requesting_your_username_error_title">Permintaan nama pengguna Anda gagal</string>
+    <string name="requesting_your_username_error_message">Untuk beberapa alasan, permintaan untuk nama pengguna %s telah gagal.</string>
     <string name="voting">Voting:</string>
     <string name="this_username_has_already_been_requested">Nama pengguna ini telah diminta, namun Anda juga dapat memintanya dan membiarkan jaringan memberikan suara untuk memutuskan apakah Anda dapat memilikinya</string>
     <string name="request_details">Detail Permintaan</string>
@@ -323,15 +330,14 @@ Dash</b> anda</string>
     <string name="make_a_post_with_the_text">Buat postingan dengan teks di atas di media sosial atau platform perpesanan terkenal untuk memverifikasi bahwa Anda adalah pemilik asli nama pengguna yang diminta dan tempel tautan di bawah</string>
     <string name="paste_the_link">Tempel tautannya</string>
     <string name="voting_key_title">Masukkan kunci pemungutan suara Anda</string>
-    <string name="voting_key_hint">Kunci Voting Masternode</string>
+    <string name="voting_key_hint">Kunci Pribadi Pemungutan Suara Masternode</string>
     <string name="voting_key_input_error">Anda telah memasukkan kunci yang tidak valid</string>
+    <string name="voting_key_input_not_active_error">Anda telah memasukkan kunci yang tidak terkait dengan Masternode aktif</string>
     <string name="voting_key_add">Tambahkan kunci pemungutan suara Anda</string>
     <string name="voting_key_add_subtitle">Alamat IP di bawah ini terkait dengan dompet ini</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>
@@ -397,4 +403,15 @@ Dash</b> anda</string>
     <string name="request_username_balance_requirement">Anda perlu memiliki 0.25 DASH untuk membuat nama pengguna ini</string>
     <string name="request_username_length_requirement">Antara 3 dan 23 karakter</string>
     <string name="request_username_confirm">Saya terima</string>
-    </resources>
+    <string name="username_vote_one_left_message">Anda sudah memberikan suara untuk nama pengguna ini %d kali. Anda hanya dapat memberikan suara satu kali lagi untuk nama pengguna ini.</string>
+    <string name="username_vote_one_left">Satu suara tersisa</string>
+    <string name="username_vote_none_left_message">Anda sudah memberikan suara untuk nama pengguna ini %d kali. Anda sudah tidak dapat memberikan suara untuk nama pengguna ini.</string>
+    <string name="username_vote_none_left">Tidak ada suara tersisa</string>
+    <string name="request_username_blocked">Nama pengguna yang diminta telah diblokir</string>
+    <string name="request_username_lost_vote">Nama pengguna yang diminta telah diberikan kepada orang lain</string>
+    <string name="request_username_blocked_message">Nama pengguna %s telah diblokir oleh Dash Network. Silahkan coba lagi dengan meminta nama pengguna lain.</string>
+    <string name="request_username_lost_vote_message">Karena proses pemungutan suara, Jaringan Dash telah memutuskan untuk menetapkan nama pengguna %suntuk orang lain. Silahkan coba lagi dengan meminta nama pengguna lain.</string>
+    <string name="mix_dash_mix">Campur Saldo</string>
+    <string name="mix_dash_title">Campur Dash anda</string>
+    <string name="mix_dash_message">Untuk membantu mencegah orang lain melihat kepada siapa Anda melakukan pembayaran, disarankan untuk mencampur saldo Anda sebelum Anda membuat nama pengguna.</string>
+</resources>
diff --git a/wallet/res/values-id/strings-extra.xml b/wallet/res/values-id/strings-extra.xml
index caec4d5b72..c70a43028d 100644
--- a/wallet/res/values-id/strings-extra.xml
+++ b/wallet/res/values-id/strings-extra.xml
@@ -25,6 +25,8 @@
     <string name="dialog_confirm_secured_by">Diamankan oleh</string>
     <string name="dialog_confirm_fee">Biaya jaringan</string>
     <string name="dialog_confirm_total">Total</string>
+    <string name="dialog_confirm_accept_contact_request">Terima permintaan kontak</string>
+
     <string name="shortcut_action_join_dashpay">Gabung DashPay</string>
     <!-- Home Screen: Shortcut Button: 2 lines, 9 characters across -->
     <string name="shortcut_secure_now">Cadangan</string>
@@ -185,6 +187,9 @@
     <string name="notification_settings_title">Pemberitahuan</string>
     <string name="notification_explainer_title">Dash Wallet ingin mengirimi Anda pemberitahuan</string>
     <string name="notification_explainer_message">Pemberitahuan dapat mencakup peringatan, suara, dan lencana ikon. Ini dapat dikonfigurasi di Pengaturan telepon.</string>
+    <string name="notification_dashpay_channel_name">DashPay</string>
+    <string name="notification_dashpay_channel_description">Status operasi DashPay yang sedang berlangsung.</string>
+
     <string name="net_type_indicator" />
 
     <string name="unlock_with_fingerprint">Gunakan sidik jari Anda untuk membuka kunci.</string>
@@ -237,6 +242,7 @@
     <string name="transaction_close">Tutup</string>
     <string name="transaction_details_amount_received">Jumlah Diterima</string>
     <string name="transaction_details_amount_sent">Jumlah Dikirim</string>
+    <string name="transaction_details_amount_sent_successfully">Pengiriman berhasil</string>
     <string name="transaction_details_sent_from">Terkirim dari</string>
     <string name="transaction_details_sent_to">Terkirim ke</string>
     <string name="transaction_details_received_at">Diterima di</string>
@@ -255,6 +261,7 @@
     <string name="authenticate_switch_to_pin">Gunakan PIN</string>
 
     <string name="menu_invite_title">Undang</string>
+    <string name="menu_invite_subtitle">Bantu teman dan keluarga anda bergabung dengam Dash</string>
     <string name="menu_buy_and_sell_title">Beli &amp; Jual Dash</string>
     <string name="menu_buy_and_sell_subtitle">Terhubung dengan pertukaran pihak ketiga</string>
     <string name="liquid_unavailable">Integrasi Liquid dengan Dash Wallet tidak lagi tersedia</string>
@@ -366,16 +373,28 @@
     <string name="import_image_invalid_private">Kunci Pribadi Tidak Valid</string>
     <string name="okay">Oke</string>
 
+    <string name="onboard_from_invite_title">Ayo Mulai</string>
     <string name="onboard_from_invite_subtitle">Selamat datang di DashPay</string>
+    <string name="onboard_from_invite_step1">Langkah 1</string>
+    <string name="onboard_from_invite_step2">Langkah 2</string>
+    <string name="onboard_from_invite_step3">Langkah 3</string>
     <string name="onboard_from_invite_step1_title">Pilih Nama pengguna</string>
     <string name="onboard_from_invite_step2_title">Setel PIN Anda</string>
     <string name="onboard_from_invite_step3_title">Amankan Dompet Anda</string>
 
     <string name="restore_wallet_please_wait">Silahkan tunggu</string>
+    <string name="restore_wallet_restoring">Dompet Anda sedang dipulihkan</string>
+
+
+
     <string name="network_unavailable">Jaringan tak tersedia</string>
     <string name="network_error_contact_details">Tidak dapat mengambil detail kontak</string>
     <string name="network_error_user_search">Tidak dapat mencari pengguna</string>
     <string name="network_error_contact_suggestions">Tidak dapat memberikan saran</string>
+    <string name="network_error_unable_to_update_profile">Tidak dapat memperbarui profil Anda</string>
+
+
+
     <string name="today">Hari ini</string>
     <string name="yesterday">Kemarin</string>
 
@@ -385,6 +404,8 @@
     <string name="all_transactions">Semua</string>
     <string name="received_transactions">Diterima</string>
     <string name="sent_transactions">Terkirim</string>
+    <string name="serious_error_title">Kesalahan serius</string>
+    <string name="serious_error_unknown">Silahkan hubungi Dukungan</string>
     <string name="set_pin_error_missing_wallet_title">Kesalahan Dompet Hilang</string>
     <string name="set_pin_error_missing_wallet_message">Dompetnya hilang. Harap laporkan hal ini ke Bagian Dukungan.</string>
     <string name="wallet_encryption_error_title">Kesalahan Pembuatan Dompet</string>
@@ -434,6 +455,9 @@
     <string name="masternode_key_not_used">Tidak digunakan</string>
     <string name="masternode_key_revoked">Dicabut</string>
     <string name="masternode_key_private_public_base64">Kunci private / publik (base64)</string>
+    <string name="timeskew_ahead">lebih awal</string>
+    <string name="timeskew_behind">dibelakang</string>
+
     <!-- stale rates messages -->
     <string name="stale_exchange_rates_error">Harga tidak diambil. Nilai Fiat mungkin salah.</string>
     <string name="stale_exchange_rates_stale">Harga setidaknya berumur 30 menit. Nilai Fiat mungkin salah.</string>
diff --git a/wallet/res/values-id/strings.xml b/wallet/res/values-id/strings.xml
index 50b8ebeec7..143ce7fad6 100644
--- a/wallet/res/values-id/strings.xml
+++ b/wallet/res/values-id/strings.xml
@@ -9,9 +9,11 @@
     <string name="blockchain_state_progress_days">%1$s, %2$d hari terlambat</string>
     <string name="blockchain_state_progress_weeks">%1$s, %2$d minggu terlambat</string>
     <string name="blockchain_state_progress_months">%1$s, %2$d bulan terlambat</string>
+    <string name="blockchain_state_progress_downloading">Mensinkronkan dengan jaringan (%1$s%%)</string>
     <string name="blockchain_state_progress_stalled">Sinkronisasi terhenti</string>
     <string name="blockchain_state_progress_problem_storage">Sinkronisasi: Masalah penyimpanan</string>
     <string name="blockchain_state_progress_problem_network">Sinkronisasi: Masalah jaringan</string>
+    <string name="mixing_state_progress_mixing">Pencampuran koin (%1$s%%)</string>
     <string name="wallet_address_fragment_clipboard_msg">Alamat Dash disalin</string>
     <string name="wallet_address_dialog_fragment_hint">Untuk melindungi privasi, alamat anda tidak akan berubah sampai alamat tersebut menerima pembayaran.</string>
     <string name="wallet_balance_fragment_too_much">Jumlahnya terlalu besar untuk ditampung pada kantong anda. Silahkan allihkan sebagian ke tempat yang aman.</string>
@@ -41,6 +43,8 @@
     <string name="wallet_low_storage_dialog_button_apps">Mengelola Aplikasi</string>
     <string name="wallet_timeskew_dialog_title">Periksa pengaturan tanggal &amp; waktu</string>
     <string name="wallet_timeskew_dialog_msg">Waktu perangkat Anda tidak aktif dalam %d menit. Anda mungkin tidak dapat mengirim atau menerima Dash karena masalah ini.\n\nAnda harus memeriksa dan jika perlu memperbaiki pengaturan tanggal, waktu dan zona waktu Anda.</string>
+    <string name="wallet_coinjoin_timeskew_dialog_msg">Waktu perangkat anda %s dalam %d Detik. Anda tidak dapat menggunakan CoinJoin karena perbedaan ini.\n\nPengaturan waktu pada perangkat Anda perlu diubah ke “Atur waktu secara otomatis” untuk menggunakan CoinJoin.</string>
+    <string name="settings_coinjoin_timeskew_dialog_msg">Waktu perangkat Anda berbeda lebih dari 5 detik. Anda tidak dapat menggunakan CoinJoin karena perbedaan ini.\n\nPengaturan waktu pada perangkat Anda perlu diubah ke “Atur waktu secara otomatis” sebelum menggunakan CoinJoin.</string>
     <string name="send_coins_activity_title">Kirim Dash</string>
     <string name="send_coins_fragment_request_payment_request_progress">Mengambil tanda tangan dari %s...</string>
     <string name="send_coins_fragment_request_payment_request_failed_title">Gagal mengambil tanda tangan</string>
@@ -170,6 +174,10 @@
     <string name="transaction_row_status_masternode_revoke">Cabut Masternode</string>
     <string name="transaction_row_status_masternode_reward">Imbalan Masternode</string>
     <string name="transaction_row_status_mining_reward">Imabalan penambang</string>
+    <string name="transaction_row_status_coinjoin_mixing_fee">Biaya CoinJoin Mixing</string>
+    <string name="transaction_row_status_coinjoin_make_collateral">Input Agunan CoinJoin</string>
+    <string name="transaction_row_status_coinjoin_mixing">CoinJoin Mixing</string>
+    <string name="transaction_row_status_coinjoin_create_denominations">CoinJoin Buat Denominasi</string>
     <string name="network_monitor_activity_title">Monitor Jaringan</string>
     <string name="network_monitor_peer_list_title">Peer</string>
     <string name="network_monitor_block_list_title">Blok</string>
@@ -328,6 +336,7 @@
     <string name="notification_inactivity_message">Anda masih memiliki Dash di perangkat ini! Pastikan untuk menuliskan frasa pemulihan Anda sebelum Anda mencopot Dompet Dash atau Anda akan kehilangan saldo sebesar %s.</string>
     <string name="notification_inactivity_action_dismiss">Ingatkan saya nanti</string>
     <string name="notification_inactivity_action_dismiss_forever">Jangan ingatkan saya</string>
+    <string name="notification_bluetooth_service_listening">Siap untuk menerima pembayaran melalui Bluetooth</string>
     <string name="appwidget_wallet_balance_title">Saldo Dash</string>
 
     <!-- generic buttons -->
diff --git a/wallet/res/values-it/strings-dashpay.xml b/wallet/res/values-it/strings-dashpay.xml
index 6afe4d1bb3..65749f111f 100644
--- a/wallet/res/values-it/strings-dashpay.xml
+++ b/wallet/res/values-it/strings-dashpay.xml
@@ -262,14 +262,17 @@ Username</b></string>
     <string name="keep_your_passphrase_safe">Mantieni la tua passphrase al sicuro</string>
     <string name="pay_now">Paga ora e se non approvato</string>
     <string name="case_your_request_is_not_approved">Nel caso in cui la tua richiesta non venga approvata</string>
-    <string name="voting_requirement_subtitle">Qualsiasi nome utente che abbia un numero compreso tra 2 e 9 o che contenga più di 20 caratteri verrà approvato automaticamente</string>
+    <string name="voting_requirement_subtitle">Qualsiasi nome utente contenente un numero compreso tra 2 e 9 o 20 o più caratteri verrà approvato automaticamente</string>
     <string name="voting_requirement_title">La votazione è necessaria solo in alcuni casi</string>
     <string name="dash_network_must_vote_to_approve">La rete Dash deve votare per approvare il tuo nome utente prima che venga creato.</string>
     <string name="what_is_username_voting">Cos\'è la votazione del nome utente\?</string>
     <string name="usernames_blocked_title">Alcuni nomi utente possono essere bloccati</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 Nome utente Votazione </string>
-    <string name="username_voting_subtitle">Come proprietario di un masternode puoi votare per approvare i nomi utente richiesti prima che gli utenti possano crearli.</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>
     <string name="n_usernames">%d nomi utente</string>
     <string name="n_requests">%d richieste</string>
@@ -292,8 +295,20 @@ Username</b></string>
         <item>Tutte</item>
         <item>Ho approvato</item>
         <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>
     <string name="request_username">Richiedi nome utente</string>
@@ -301,13 +316,18 @@ Username</b></string>
     <string name="request_username_available">Nome utente disponibile</string>
     <string name="request_username_unavailable">Il nome utente non è disponibile o è bloccato</string>
     <string name="request_username_taken">Il nome utente è preso</string>
+    <string name="request_username_taken_results">Il nome utente è stato preso da un altro utente</string>
     <string name="requesting_your_username_title">Creazione del tuo nome utente</string>
+    <string name="requesting_your_username_message">Il tuo nome utente %s viene richiesto sulla rete Dash. Potrebbe volerci del tempo.</string>
+    <string name="creating_your_username_message">Il tuo nome utente %s viene creato sulla rete Dash. Potrebbe volerci del tempo.</string>
     <string name="requesting_your_username_error_title">La tua richiesta di nome utente non è riuscita</string>
+    <string name="requesting_your_username_error_message">Per qualche motivo, la richiesta del nome utente %s non è adata a buon fine.</string>
     <string name="voting">Voto:</string>
     <string name="this_username_has_already_been_requested">Questo nome utente è già stato richiesto, ma puoi richiederlo anche tu e lasciare che sia la rete a votare per decidere se puoi averlo</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>
@@ -323,15 +343,34 @@ Username</b></string>
     <string name="make_a_post_with_the_text">Pubblica un post con il testo sopra su un social media o una piattaforma di messaggistica ben nota per verificare di essere il proprietario originale del nome utente richiesto e incolla il collegamento qui sotto</string>
     <string name="paste_the_link">Incolla il collegamento</string>
     <string name="voting_key_title">Inserisci la tua chiave di voto</string>
-    <string name="voting_key_hint">Chiave di voto Masternode</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>
@@ -397,4 +436,15 @@ Username</b></string>
     <string name="request_username_balance_requirement">Devi avere 0,25 DASH per creare questo nome utente</string>
     <string name="request_username_length_requirement">Tra 3 e 23 caratteri</string>
     <string name="request_username_confirm">Accetto</string>
-    </resources>
+    <string name="username_vote_one_left_message">Hai già votato per questo nome utente %d volte. Puoi esprimere solo un altro voto per questo nome utente.</string>
+    <string name="username_vote_one_left">Ti rimane un voto</string>
+    <string name="username_vote_none_left_message">Hai già votato per questo nome utente %d tempi. Non puoi esprimere altri voti per questo nome utente.</string>
+    <string name="username_vote_none_left">Nessun voto rimasto</string>
+    <string name="request_username_blocked">Il nome utente richiesto è stato bloccato</string>
+    <string name="request_username_lost_vote">Il nome utente richiesto è stato assegnato a qualcun altro</string>
+    <string name="request_username_blocked_message">Il nome utente %s è stato bloccato dalla rete Dash. Riprova richiedendo un altro nome utente.</string>
+    <string name="request_username_lost_vote_message">A causa del processo di votazione, Dash Network ha deciso di assegnare il nome utente %s a qualcun altro. Riprova richiedendo un altro nome utente.</string>
+    <string name="mix_dash_mix">Mescolare Bilancio</string>
+    <string name="mix_dash_title">Mescola i tuoi Dash</string>
+    <string name="mix_dash_message">Per evitare che altre persone vedano a chi effettui i pagamenti, ti consigliamo di mescolare il tuo saldo prima di creare il tuo nome utente.</string>
+</resources>
diff --git a/wallet/res/values-it/strings-extra.xml b/wallet/res/values-it/strings-extra.xml
index 3152668fba..149f50ef9b 100644
--- a/wallet/res/values-it/strings-extra.xml
+++ b/wallet/res/values-it/strings-extra.xml
@@ -25,6 +25,8 @@
     <string name="dialog_confirm_secured_by">Garantito da</string>
     <string name="dialog_confirm_fee">Commissione di Rete</string>
     <string name="dialog_confirm_total">Totale</string>
+    <string name="dialog_confirm_accept_contact_request">Accetta richiesta di contatto</string>
+
     <string name="shortcut_action_join_dashpay">Unisciti a DashPay</string>
     <!-- Home Screen: Shortcut Button: 2 lines, 9 characters across -->
     <string name="shortcut_secure_now">Backup</string>
@@ -191,6 +193,9 @@
     <string name="notification_settings_title">Notifiche</string>
     <string name="notification_explainer_title">Dash Wallet vorrebbe inviarti notifiche</string>
     <string name="notification_explainer_message">Le notifiche possono includere avvisi, suoni e badge con icone. Questi possono essere configurati nelle Impostazioni del telefono.</string>
+    <string name="notification_dashpay_channel_name">DashPay</string>
+    <string name="notification_dashpay_channel_description">Stato delle operazioni DashPay in corso.</string>
+
     <string name="net_type_indicator" />
 
     <string name="unlock_with_fingerprint">Usa la tua impronta digitale per sbloccare.</string>
@@ -243,6 +248,7 @@
     <string name="transaction_close">Chiudi</string>
     <string name="transaction_details_amount_received">Importo Ricevuto</string>
     <string name="transaction_details_amount_sent">Importo Inviato</string>
+    <string name="transaction_details_amount_sent_successfully">Inviato con successo</string>
     <string name="transaction_details_sent_from">Inviato da</string>
     <string name="transaction_details_sent_to">Inviato a</string>
     <string name="transaction_details_received_at">Ricevuto a</string>
@@ -261,6 +267,7 @@
     <string name="authenticate_switch_to_pin">Usa PIN</string>
 
     <string name="menu_invite_title">Invita</string>
+    <string name="menu_invite_subtitle">Aiuta i tuoi amici e la tua famiglia a unirsi a Dash</string>
     <string name="menu_buy_and_sell_title">Compra &amp; Vendi Dash</string>
     <string name="menu_buy_and_sell_subtitle">Connetti a Exchanges esterni</string>
     <string name="liquid_unavailable">L\'integrazione Liquid con Dash Wallet non è più disponibile</string>
@@ -372,16 +379,28 @@
     <string name="import_image_invalid_private">Chiave privata non valida</string>
     <string name="okay">Bene</string>
 
+    <string name="onboard_from_invite_title">Iniziamo</string>
     <string name="onboard_from_invite_subtitle">Benvenuto su DashPay</string>
+    <string name="onboard_from_invite_step1">Passaggio 1</string>
+    <string name="onboard_from_invite_step2">Passaggio 2</string>
+    <string name="onboard_from_invite_step3">Passaggio 3</string>
     <string name="onboard_from_invite_step1_title">Scegli il tuo Username</string>
     <string name="onboard_from_invite_step2_title">Imposta il tuo PIN</string>
     <string name="onboard_from_invite_step3_title">Proteggi il tuo Wallet</string>
 
     <string name="restore_wallet_please_wait">Attendere prego</string>
+    <string name="restore_wallet_restoring">Il tuo portafoglio è in fase di ripristino</string>
+
+
+
     <string name="network_unavailable">Rete non Disponibile</string>
     <string name="network_error_contact_details">Impossibile recuperare i dettagli di contatto</string>
     <string name="network_error_user_search">Impossibile cercare un utente</string>
     <string name="network_error_contact_suggestions">Impossibile fornire suggerimenti</string>
+    <string name="network_error_unable_to_update_profile">Impossibile aggiornare il tuo profilo</string>
+
+
+
     <string name="today">In data odierna</string>
     <string name="yesterday">Ieri</string>
 
@@ -391,6 +410,8 @@
     <string name="all_transactions">Tutte</string>
     <string name="received_transactions">Ricevuto</string>
     <string name="sent_transactions">Inviato</string>
+    <string name="serious_error_title">Errore grave</string>
+    <string name="serious_error_unknown">Si prega di contattare l\'assistenza.</string>
     <string name="set_pin_error_missing_wallet_title">Errore portafoglio mancante</string>
     <string name="set_pin_error_missing_wallet_message">Manca il portafoglio. Si prega di segnalarlo al Support Desk.</string>
     <string name="wallet_encryption_error_title">Errore di Creazione del Portafoglio</string>
@@ -440,6 +461,9 @@
     <string name="masternode_key_not_used">Non usato</string>
     <string name="masternode_key_revoked">Revocato</string>
     <string name="masternode_key_private_public_base64">Chiavi private/pubbliche (base64)</string>
+    <string name="timeskew_ahead">avanti</string>
+    <string name="timeskew_behind">indietro</string>
+
     <!-- stale rates messages -->
     <string name="stale_exchange_rates_error">I prezzi non sono stati recuperati. I valori Fiat potrebbero essere errati.</string>
     <string name="stale_exchange_rates_stale">I prezzi risalgono ad almeno 30 minuti. I valori Fiat potrebbero essere errati.</string>
diff --git a/wallet/res/values-it/strings.xml b/wallet/res/values-it/strings.xml
index a25bfef94c..93aad57995 100644
--- a/wallet/res/values-it/strings.xml
+++ b/wallet/res/values-it/strings.xml
@@ -9,9 +9,11 @@
     <string name="blockchain_state_progress_days">%1$s, %2$d giorni indietro</string>
     <string name="blockchain_state_progress_weeks">%1$s, %2$d settimane indietro</string>
     <string name="blockchain_state_progress_months">%1$s, %2$d mesi indietro</string>
+    <string name="blockchain_state_progress_downloading">Sincronizzazione con la rete (%1$s %%)</string>
     <string name="blockchain_state_progress_stalled">La sincronizzazione è in fase di stallo</string>
     <string name="blockchain_state_progress_problem_storage">Sincronizzazione: problema di Memorizzazione</string>
     <string name="blockchain_state_progress_problem_network">Sincronizzazione: problema di Rete</string>
+    <string name="mixing_state_progress_mixing">Miscelazione Monete (%1$s %%) </string>
     <string name="wallet_address_fragment_clipboard_msg">Indirizzo Dash copiato negli appunti</string>
     <string name="wallet_address_dialog_fragment_hint">Per proteggere la tua privacy, il tuo indirizzo cambierà alla ricezione di un pagamento.</string>
     <string name="wallet_balance_fragment_too_much">Questo importo è alto per essere portato con se. Si prega di spostarne una parte in un luogo più sicuro.</string>
@@ -41,6 +43,8 @@
     <string name="wallet_low_storage_dialog_button_apps">Gestisci applicazioni</string>
     <string name="wallet_timeskew_dialog_title">Controlla data &amp; impostazioni di tempo</string>
     <string name="wallet_timeskew_dialog_msg">Il tuo dispositivo è spento da %d minuti. Probabilmente non puoi inviare ne ricevere Dash per via di questo problema.\n\nDevi controllare e correggere l\'ora e il fuso orario del tuo dispositivo.</string>
+    <string name="wallet_coinjoin_timeskew_dialog_msg">L\'ora del tuo dispositivo è %s da %d secondi. Non puoi utilizzare CoinJoin a causa di questa differenza.\n\nLe impostazioni dell\'ora sul tuo dispositivo devono essere modificate in \"Imposta l\'ora automaticamente\" per utilizzare CoinJoin.</string>
+    <string name="settings_coinjoin_timeskew_dialog_msg">L\'orario del tuo dispositivo è sfasato di più di 5 secondi. Non puoi utilizzare CoinJoin a causa di questa differenza.\n\nLe impostazioni dell\'ora sul tuo dispositivo devono essere modificate in \"Imposta ora automaticamente\" prima di utilizzare CoinJoin.</string>
     <string name="send_coins_activity_title">Invia Dash</string>
     <string name="send_coins_fragment_request_payment_request_progress">Acquisizione firma da %s…</string>
     <string name="send_coins_fragment_request_payment_request_failed_title">Acquisizione firma fallita</string>
@@ -170,6 +174,10 @@
     <string name="transaction_row_status_masternode_revoke">Revoca Masternode</string>
     <string name="transaction_row_status_masternode_reward">Ricompensa Masternode</string>
     <string name="transaction_row_status_mining_reward">Ricompensa Mining</string>
+    <string name="transaction_row_status_coinjoin_mixing_fee">Commissione di miscelazione CoinJoin</string>
+    <string name="transaction_row_status_coinjoin_make_collateral">Collaterale Input CoinJoin</string>
+    <string name="transaction_row_status_coinjoin_mixing">Miscelazione CoinJoin</string>
+    <string name="transaction_row_status_coinjoin_create_denominations">CoinJoin Crea denominazioni</string>
     <string name="network_monitor_activity_title">Controllo della rete</string>
     <string name="network_monitor_peer_list_title">Peers</string>
     <string name="network_monitor_block_list_title">Blocchi</string>
@@ -328,6 +336,7 @@
     <string name="notification_inactivity_message">Hai ancora Dash su questo dispositivo! Assicurati di annotare la tua frase di recupero prima di disinstallare il Dash Wallet o perderai il tuo saldo di %s.</string>
     <string name="notification_inactivity_action_dismiss">Ricordamelo in seguito</string>
     <string name="notification_inactivity_action_dismiss_forever">Non ricordarmelo</string>
+    <string name="notification_bluetooth_service_listening">Pronto per ricevere pagamenti tramite Bluetooth</string>
     <string name="appwidget_wallet_balance_title">Bilancio Dash</string>
 
     <!-- generic buttons -->
diff --git a/wallet/res/values-ja/strings-dashpay.xml b/wallet/res/values-ja/strings-dashpay.xml
index 45078124c5..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>
@@ -261,14 +260,15 @@
     <string name="keep_your_passphrase_safe">パスフレーズを安全に保つ</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_subtitle">ユーザー名に2～9の数字、または20文字以上が含まれていれば、自動的に承認されます。</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">ネットワーク上の多数のユーザーがそのユーザー名を不適切と判断した場合、それをブロックできます</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>
     <string name="n_usernames">%dのユーザー名</string>
     <string name="n_requests">%dのリクエスト</string>
@@ -291,17 +291,22 @@
         <item>全て</item>
         <item>承認しました</item>
         <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>
+    <string name="request_your_hint">一度決めたユーザー名は、今後変更することはできませんのでご注意ください</string>
     <string name="request_username">ユーザー名の申請</string>
     <string name="request_voting_range">Dashネットワークはこのユーザー名に投票することになります。投票結果は%sに通知されます。</string>
     <string name="request_username_available">ユーザー名は使用可能です</string>
     <string name="request_username_unavailable">ユーザー名は使用不可またはブロックされています</string>
     <string name="request_username_taken">ユーザー名はすでに使用されています</string>
+    <string name="request_username_taken_results">ユーザー名は他のユーザーによって使用されていました</string>
     <string name="requesting_your_username_title">ユーザー名の作成中</string>
+    <string name="requesting_your_username_message">お客様のユーザー名%sが、Dashネットワークでリクエストされています。しばらくお時間がかかる場合があります。</string>
+    <string name="creating_your_username_message">お客様のユーザー名%sが、Dashネットワークで作成されています。しばらくお時間がかかる場合があります。</string>
     <string name="requesting_your_username_error_title">ユーザー名の申請に失敗しました</string>
+    <string name="requesting_your_username_error_message">何らかの理由で、%sというユーザー名のリクエストに失敗しました。</string>
     <string name="voting">投票：</string>
     <string name="this_username_has_already_been_requested">このユーザー名はすでに申請されていますが、お客様も同じものを申請でき、ネットワークの投票によってユーザー名の使用可否が決定されます。</string>
     <string name="request_details">詳細の申請</string>
@@ -322,15 +327,14 @@
     <string name="make_a_post_with_the_text">よく知られたSNSやメッセージング・プラットフォームに上記の文章を投稿し、ご自身が申請されたユーザー名の本来の所有者であることを確認した上で、以下のリンクを貼り付けてください</string>
     <string name="paste_the_link">リンクを貼り付ける</string>
     <string name="voting_key_title">投票キーを入力する</string>
-    <string name="voting_key_hint">マスターノードの投票キー</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_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="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>
@@ -396,4 +400,15 @@
     <string name="request_username_balance_requirement">このユーザー名を作成するには、0.25DASHが必要です</string>
     <string name="request_username_length_requirement">3〜23文字以内</string>
     <string name="request_username_confirm">承認します</string>
+    <string name="username_vote_one_left_message">このユーザー名にはすでに%d回投票しています。このユーザー名にはあと1回しか投票できません。</string>
+    <string name="username_vote_one_left">あと1票</string>
+    <string name="username_vote_none_left_message">このユーザー名にはすでに%d回投票しています。このユーザー名にはもう投票できません。</string>
+    <string name="username_vote_none_left">あと0票</string>
+    <string name="request_username_blocked">リクエストされたユーザー名はブロックされています</string>
+    <string name="request_username_lost_vote">リクエストしたユーザー名は、すでに他の人が使用しています</string>
+    <string name="request_username_blocked_message">%sというユーザー名は、Dashネットワークでブロックされました。別のユーザー名をリクエストして再度お試しください。</string>
+    <string name="request_username_lost_vote_message">投票の結果、Dashネットワークはユーザー名%sを他のユーザーに割り当てることに決定しました。別のユーザー名をリクエストして再度お試しください。</string>
+    <string name="mix_dash_mix">ミキシング残高</string>
+    <string name="mix_dash_title">Dashをミキシングする</string>
+    <string name="mix_dash_message">他者に送金先を閲覧されないようにするため、残高をミキシングしてからユーザー名を作成することを推奨します。</string>
     </resources>
diff --git a/wallet/res/values-ja/strings-extra.xml b/wallet/res/values-ja/strings-extra.xml
index ce37740a37..68416210a7 100644
--- a/wallet/res/values-ja/strings-extra.xml
+++ b/wallet/res/values-ja/strings-extra.xml
@@ -25,6 +25,8 @@
     <string name="dialog_confirm_secured_by">Secured by</string>
     <string name="dialog_confirm_fee">ネットワーク手数料</string>
     <string name="dialog_confirm_total">総計</string>
+    <string name="dialog_confirm_accept_contact_request">連絡先リクエストを承認する</string>
+
     <string name="shortcut_action_join_dashpay">DashPayに参加する</string>
     <!-- Home Screen: Shortcut Button: 2 lines, 9 characters across -->
     <string name="shortcut_secure_now">バックアップ</string>
@@ -185,6 +187,9 @@
     <string name="notification_settings_title">通知</string>
     <string name="notification_explainer_title">Dash Walletから通知をお送りします。</string>
     <string name="notification_explainer_message">通知には、アラート、サウンド、アイコンバッジが含まれる場合があります。これらは、端末の設定で設定することができます。</string>
+    <string name="notification_dashpay_channel_name">DashPay</string>
+    <string name="notification_dashpay_channel_description">DashPayの手続きの進行状況</string>
+
     <string name="net_type_indicator" />
 
     <string name="unlock_with_fingerprint">ロック解除に指紋認証を使う。</string>
@@ -239,6 +244,7 @@
     <string name="transaction_close">閉じる</string>
     <string name="transaction_details_amount_received">入金総額</string>
     <string name="transaction_details_amount_sent">総額送金</string>
+    <string name="transaction_details_amount_sent_successfully">正常に送金されました</string>
     <string name="transaction_details_sent_from">から送金済み</string>
     <string name="transaction_details_sent_to">へ送金済み</string>
     <string name="transaction_details_received_at">で入金済み</string>
@@ -257,6 +263,7 @@
     <string name="authenticate_switch_to_pin">PINを使う</string>
 
     <string name="menu_invite_title">招待する</string>
+    <string name="menu_invite_subtitle">お友達やご家族のDashの加入をサポートしましょう</string>
     <string name="menu_buy_and_sell_title">Dashを買う &amp; 売る</string>
     <string name="menu_buy_and_sell_subtitle">サードパーティーの取引所に接続する</string>
     <string name="liquid_unavailable">DashウォレットとのLiquid連携は終了いたしました。</string>
@@ -370,16 +377,28 @@
     <string name="import_image_invalid_private">無効な非公開キー</string>
     <string name="okay">OK</string>
 
+    <string name="onboard_from_invite_title">さあ、始めましょう</string>
     <string name="onboard_from_invite_subtitle">DashPayにようこそ</string>
+    <string name="onboard_from_invite_step1">ステップ1</string>
+    <string name="onboard_from_invite_step2">ステップ2</string>
+    <string name="onboard_from_invite_step3">ステップ3</string>
     <string name="onboard_from_invite_step1_title">ユーザー名を選択する</string>
     <string name="onboard_from_invite_step2_title">PINを設定します</string>
     <string name="onboard_from_invite_step3_title">ウォレットを保護する</string>
 
     <string name="restore_wallet_please_wait">お待ちください</string>
+    <string name="restore_wallet_restoring">お客様のウォレットを復元中です</string>
+
+
+
     <string name="network_unavailable">ネットワークが利用できません</string>
     <string name="network_error_contact_details">連絡先情報を取得できません</string>
     <string name="network_error_user_search">ユーザーの検索ができません</string>
     <string name="network_error_contact_suggestions">提案できません</string>
+    <string name="network_error_unable_to_update_profile">プロフィールを更新できません</string>
+
+
+
     <string name="today">今日</string>
     <string name="yesterday">昨日</string>
 
@@ -389,6 +408,8 @@
     <string name="all_transactions">全て</string>
     <string name="received_transactions">受取済み</string>
     <string name="sent_transactions">送信済み</string>
+    <string name="serious_error_title">重大なエラー</string>
+    <string name="serious_error_unknown">サポートまでご連絡ください。</string>
     <string name="set_pin_error_missing_wallet_title">ウォレット紛失のエラー</string>
     <string name="set_pin_error_missing_wallet_message">ウォレットが行方不明です。 サポートデスクにご報告ください。</string>
     <string name="wallet_encryption_error_title">ウォレット作成時のエラー</string>
@@ -438,6 +459,9 @@
     <string name="masternode_key_not_used">未使用です</string>
     <string name="masternode_key_revoked">無効になっています</string>
     <string name="masternode_key_private_public_base64">プライベート/パブリックキー(ベース64)</string>
+    <string name="timeskew_ahead">進む</string>
+    <string name="timeskew_behind">戻る</string>
+
     <!-- stale rates messages -->
     <string name="stale_exchange_rates_error">価格を取得できませんでした。フィアットの値が正しくない可能性があります。</string>
     <string name="stale_exchange_rates_stale">価格は30分以上前のものです。フィアットの値が正しくない可能性があります。</string>
diff --git a/wallet/res/values-ja/strings.xml b/wallet/res/values-ja/strings.xml
index 12eb72de94..bc860cc96a 100644
--- a/wallet/res/values-ja/strings.xml
+++ b/wallet/res/values-ja/strings.xml
@@ -9,9 +9,11 @@
     <string name="blockchain_state_progress_days">%1$s, %2$d日遅れ</string>
     <string name="blockchain_state_progress_weeks">%1$s, %2$d週遅れ</string>
     <string name="blockchain_state_progress_months">%1$s, %2$dか月遅れ</string>
+    <string name="blockchain_state_progress_downloading">ネットワークと同期中（%1$s%%）</string>
     <string name="blockchain_state_progress_stalled">同期が停滞しています</string>
     <string name="blockchain_state_progress_problem_storage">同期：ストレージに問題があります</string>
     <string name="blockchain_state_progress_problem_network">同期：ネットワークに問題があります</string>
+    <string name="mixing_state_progress_mixing">ミキシング中のコイン（%1$s%%）</string>
     <string name="wallet_address_fragment_clipboard_msg">Dashアドレスがクリップボードにコピーされました</string>
     <string name="wallet_address_dialog_fragment_hint">プライバシー保護のため、アドレスは支払いを受け取るごとに変化します。</string>
     <string name="wallet_balance_fragment_too_much">この額はポケットに入れて運ぶには多すぎます。一部をもっと安全な場所に移してください。</string>
@@ -41,6 +43,8 @@
     <string name="wallet_low_storage_dialog_button_apps">アプリの管理</string>
     <string name="wallet_timeskew_dialog_title">時刻の設定を確認してください！</string>
     <string name="wallet_timeskew_dialog_msg">デバイスの時間が%d分ずれてます。 この問題の為、Dashのやり取りが出来なくなる可能性があります。\n\n正確な時間とタイムゾーンを設定してください。</string>
+    <string name="wallet_coinjoin_timeskew_dialog_msg">お客様のデバイスの時刻は%d秒で%sの誤差があります。この誤差により、お客様はCoinJoinをご利用いただけません。\n\nお客様のデバイスの時刻設定を「自動時刻設定」に変更していただいてから、CoinJoinをご利用ください。</string>
+    <string name="settings_coinjoin_timeskew_dialog_msg">お客様のデバイスの時刻が5秒以上ずれています。この誤差により、お客様はCoinJoinをご利用いただけません。\n\nCoinJoinをご利用になる前に、お客様のデバイスの時刻設定を「自動時刻設定」に変更する必要があります。</string>
     <string name="send_coins_activity_title">Dashの送金</string>
     <string name="send_coins_fragment_request_payment_request_progress">%s から署名の取得中…</string>
     <string name="send_coins_fragment_request_payment_request_failed_title">署名の取得に失敗しました</string>
@@ -170,6 +174,10 @@
     <string name="transaction_row_status_masternode_revoke">マスターノードの取り消し</string>
     <string name="transaction_row_status_masternode_reward">マスターノード報酬</string>
     <string name="transaction_row_status_mining_reward">マイニング報酬</string>
+    <string name="transaction_row_status_coinjoin_mixing_fee">CoinJoinのミキシング料</string>
+    <string name="transaction_row_status_coinjoin_make_collateral">CoinJoinの担保入力</string>
+    <string name="transaction_row_status_coinjoin_mixing">CoinJoinのミキシング</string>
+    <string name="transaction_row_status_coinjoin_create_denominations">CoinJoinの通貨単位の作成</string>
     <string name="network_monitor_activity_title">ネットワークモニタ</string>
     <string name="network_monitor_peer_list_title">ピア</string>
     <string name="network_monitor_block_list_title">ブロック</string>
@@ -328,6 +336,7 @@
     <string name="notification_inactivity_message">あなたはこのデバイスにまだDashを保有しています！Dashウォレットをアンイストールする前に必ず復元フレーズを書き留めて下さい。そうしないと、あなたの残高 %sが失われます。</string>
     <string name="notification_inactivity_action_dismiss">後で通知する</string>
     <string name="notification_inactivity_action_dismiss_forever">今後通知しない</string>
+    <string name="notification_bluetooth_service_listening">Bluetoothで支払いを受け取れるようになっています</string>
     <string name="appwidget_wallet_balance_title">Dash残高</string>
 
     <!-- generic buttons -->
diff --git a/wallet/res/values-ko/strings-dashpay.xml b/wallet/res/values-ko/strings-dashpay.xml
index 8671ad3306..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>
@@ -262,14 +261,15 @@
     <string name="keep_your_passphrase_safe">당신의 복구 문구를 안전하게 보호하세요</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_subtitle">2-9 사이의 숫자가 포함되었거나 20글자 이상인 사용자 이름은 자동으로 승인됩니다.</string>
     <string name="voting_requirement_title">투표는 일부 경우에만 필요합니다</string>
     <string name="dash_network_must_vote_to_approve">사용자 이름이 생성되기 전 대시 네트워크가 투표를 통해 승인해야 합니다.</string>
     <string name="what_is_username_voting">사용자이름 투표란 무엇인가요\?</string>
     <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>
     <string name="n_usernames">%d 사용자 이름</string>
     <string name="n_requests">%d 요청</string>
@@ -292,8 +292,9 @@
         <item>모두</item>
         <item>승인하였습니다</item>
         <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>
     <string name="request_username">사용자 이름 요청하기</string>
@@ -301,8 +302,12 @@
     <string name="request_username_available">사용자이름을 사용할 수 있습니다</string>
     <string name="request_username_unavailable">사용자 이름을 사용할 수 없거나 블록되었습니다</string>
     <string name="request_username_taken">사용자 이름을 이미 사용중입니다</string>
+    <string name="request_username_taken_results">이미 다른 사용자가 사용하고 있는 이름입니다</string>
     <string name="requesting_your_username_title">당신의 사용자 이름을 생성중입니다</string>
+    <string name="requesting_your_username_message">당신의 사용자 이름인 %s 이 대시 네트워크에 요청되었습니다. 이 과정에는 시간이 걸릴 수 있습니다.</string>
+    <string name="creating_your_username_message">당신의 사용자 이름인 %s 이 대시 네트워크에 생성되는 중입니다. 이 과정에는 시간이 걸릴 수 있습니다.</string>
     <string name="requesting_your_username_error_title">당신의 사용자 이름 요청이 실패하였습니다</string>
+    <string name="requesting_your_username_error_message">알 수 없는 이유로 사용자 이름 %s에 대한 요청이 실패하였습니다.</string>
     <string name="voting">투표중:</string>
     <string name="this_username_has_already_been_requested">이 사용자 이름은 이미 요청이 진행중이나, 당신도 요청할 수 있으며 누가 가지게 될 지는 네트워크가 투표로 결정합니다</string>
     <string name="request_details">요청 세부 내용</string>
@@ -323,15 +328,14 @@
     <string name="make_a_post_with_the_text">위의 텍스트를 잘 알려진 소셜 미디어나 메시지 플랫폼상에 포스팅하고, 아래의 링크를 붙여 넣음으로써 당신이 요청된 사용자 이름의 진정한 소유주임을 증명하세요</string>
     <string name="paste_the_link">링크 붙여넣기</string>
     <string name="voting_key_title">투표 키를 입력하세요</string>
-    <string name="voting_key_hint">마스터노드 투표 키</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_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="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>
@@ -397,4 +401,15 @@
     <string name="request_username_balance_requirement">이 사용자 이름을 생성하기 위해서는 0.25 DASH가 필요합니다</string>
     <string name="request_username_length_requirement">3에서 23글자 사이</string>
     <string name="request_username_confirm">수락합니다</string>
+    <string name="username_vote_one_left_message">이미 이 사용자이름에 대해 %d회 투표하였습니다. 이 사용자 이름에 대하여 한 번의 투표만 남았습니다.</string>
+    <string name="username_vote_one_left">한 번의 투표만 남음</string>
+    <string name="username_vote_none_left_message">이 사용자 이름에 대해 이미 %d회 투표하였습니다. 이 사용자 이름에 대해 더이상 투표할 수 없습니다.</string>
+    <string name="username_vote_none_left">남은 투표 없음</string>
+    <string name="request_username_blocked">요청된 사용자 이름이 블록되었습니다</string>
+    <string name="request_username_lost_vote">요청된 사용자 이름이 다른 사람에게 주어졌습니다</string>
+    <string name="request_username_blocked_message">사용자 이름 %s은 대시 네트워크에 의해 블록되었습니다. 다른 사용자 이름으로 다시 시도해주십시오.</string>
+    <string name="request_username_lost_vote_message">투표 과정에 의하여, 대시 네트워크가 사용자 이름 %s 을 다른 사용자에게 배치하기로 결정하였습니다. 다른 사용자이름으로 다시 시도해주십시오.</string>
+    <string name="mix_dash_mix">믹스 잔고</string>
+    <string name="mix_dash_title">당신의 대시를 믹스하세요</string>
+    <string name="mix_dash_message">당신이 누구에게 송금하는 지를 아무도 알 수 없게 하기 위해서는, 사용자 이름을 만들기 전에 잔고를 믹싱할 것을 권장합니다.</string>
     </resources>
diff --git a/wallet/res/values-ko/strings-extra.xml b/wallet/res/values-ko/strings-extra.xml
index 4df49d0625..3be1f83787 100644
--- a/wallet/res/values-ko/strings-extra.xml
+++ b/wallet/res/values-ko/strings-extra.xml
@@ -25,6 +25,8 @@
     <string name="dialog_confirm_secured_by">다음이 보증합니다</string>
     <string name="dialog_confirm_fee">네트워크 비용</string>
     <string name="dialog_confirm_total">총계</string>
+    <string name="dialog_confirm_accept_contact_request">연락처 요청 수락</string>
+
     <string name="shortcut_action_join_dashpay">대시페이 가입하기</string>
     <!-- Home Screen: Shortcut Button: 2 lines, 9 characters across -->
     <string name="shortcut_secure_now">백업</string>
@@ -185,6 +187,9 @@
     <string name="notification_settings_title">알림</string>
     <string name="notification_explainer_title">대시 지갑이 알림을 보내고자 합니다</string>
     <string name="notification_explainer_message">알림에는 경고, 사운드 및 아이콘 배지가 포함될 수 있습니다. 본 내용은 휴대폰의 설정에서 변경할 수 있습니다.</string>
+    <string name="notification_dashpay_channel_name">대시페이</string>
+    <string name="notification_dashpay_channel_description">진행중인 대시페이 작업 상태</string>
+
     <string name="net_type_indicator" />
 
     <string name="unlock_with_fingerprint">잠금 해제를 위해서 지문을 사용합니다</string>
@@ -237,6 +242,7 @@
     <string name="transaction_close">닫기</string>
     <string name="transaction_details_amount_received">받은 금액</string>
     <string name="transaction_details_amount_sent">보낸 금액</string>
+    <string name="transaction_details_amount_sent_successfully">성공적으로 전송되었습니다</string>
     <string name="transaction_details_sent_from">다음으로부터 전송되었습니다</string>
     <string name="transaction_details_sent_to">다음에 전송하였습니다</string>
     <string name="transaction_details_received_at">다음에서 수신하였습니다</string>
@@ -255,6 +261,7 @@
     <string name="authenticate_switch_to_pin">PIN 사용하기</string>
 
     <string name="menu_invite_title">초대하기</string>
+    <string name="menu_invite_subtitle">당신의 친구와 가족이 대시에 가입하도록 도와주세요</string>
     <string name="menu_buy_and_sell_title">대시 매수 &amp; 매도</string>
     <string name="menu_buy_and_sell_subtitle">제3자 거래소에 연결</string>
     <string name="liquid_unavailable">대시 지갑 내 리퀴드 통합은 더이상 지원되지 않습니다.</string>
@@ -366,16 +373,28 @@
     <string name="import_image_invalid_private">유효하지 않은 개인 키</string>
     <string name="okay">알겠습니다</string>
 
+    <string name="onboard_from_invite_title">지금 시작하세요</string>
     <string name="onboard_from_invite_subtitle">대시페이에 오신 것을 환영합니다</string>
+    <string name="onboard_from_invite_step1">1단계</string>
+    <string name="onboard_from_invite_step2">2단계</string>
+    <string name="onboard_from_invite_step3">3단계</string>
     <string name="onboard_from_invite_step1_title">사용자 이름을 선택하세요</string>
     <string name="onboard_from_invite_step2_title">당신의 PIN을 설정하세요</string>
     <string name="onboard_from_invite_step3_title">당신의 지갑을 안전하게 지키세요</string>
 
     <string name="restore_wallet_please_wait">기다려주십시오</string>
+    <string name="restore_wallet_restoring">당신의 지갑이 복원되었습니다</string>
+
+
+
     <string name="network_unavailable">네트워크를 이용할 수 없음</string>
     <string name="network_error_contact_details">연락처 세부 내용을 불러올 수 없습니다</string>
     <string name="network_error_user_search">사용자를 검색할 수 없습니다</string>
     <string name="network_error_contact_suggestions">제안을 제공할 수 없습니다</string>
+    <string name="network_error_unable_to_update_profile">당신의 프로필을 업데이트할 수 없습니다</string>
+
+
+
     <string name="today">오늘</string>
     <string name="yesterday">어제</string>
 
@@ -385,6 +404,8 @@
     <string name="all_transactions">모두</string>
     <string name="received_transactions">받음</string>
     <string name="sent_transactions">전송 완료</string>
+    <string name="serious_error_title">심각한 오류</string>
+    <string name="serious_error_unknown">고객 지원부에 문의하세요.</string>
     <string name="set_pin_error_missing_wallet_title">사라진 지갑 오류</string>
     <string name="set_pin_error_missing_wallet_message">지갑이 사라졌습니다. 지원 데스크에 보고해주십시오.</string>
     <string name="wallet_encryption_error_title">지갑 생성 에러</string>
@@ -434,6 +455,9 @@
     <string name="masternode_key_not_used">사용되지 않음</string>
     <string name="masternode_key_revoked">취소됨</string>
     <string name="masternode_key_private_public_base64">개인 / 공공 키 (base64)</string>
+    <string name="timeskew_ahead">앞</string>
+    <string name="timeskew_behind">뒤</string>
+
     <!-- stale rates messages -->
     <string name="stale_exchange_rates_error">가격을 불러오지 않았습니다. 금액이 정확하지 않을 수 있습니다.</string>
     <string name="stale_exchange_rates_stale">마지막 가격 업데이트가 최소 30분을 경과했습니다. 금액이 정확하지 않을 수 있습니다.</string>
diff --git a/wallet/res/values-ko/strings.xml b/wallet/res/values-ko/strings.xml
index c48c21c738..929e15e6f2 100644
--- a/wallet/res/values-ko/strings.xml
+++ b/wallet/res/values-ko/strings.xml
@@ -9,9 +9,11 @@
     <string name="blockchain_state_progress_days">%1$s, %2$d일 이전으로부터 동기화 중</string>
     <string name="blockchain_state_progress_weeks">%1$s, %2$d주 이전으로부터 동기화 중</string>
     <string name="blockchain_state_progress_months">%1$s, %2$d개월 이전으로부터 동기화 중</string>
+    <string name="blockchain_state_progress_downloading">네트워크 동기화중 (%1$s%%)</string>
     <string name="blockchain_state_progress_stalled">동기화 멈춤</string>
     <string name="blockchain_state_progress_problem_storage">동기화 중 : 저장 공간 문제 발생</string>
     <string name="blockchain_state_progress_problem_network">동기화 중 : 네트워크에 문제 발생</string>
+    <string name="mixing_state_progress_mixing">코인 믹싱중 (%1$s%%)</string>
     <string name="wallet_address_fragment_clipboard_msg">대시 주소가 클립보드에 복사되었습니다</string>
     <string name="wallet_address_dialog_fragment_hint">프라이버시를 보호하기 위해 송금을 한 번 받으면 새로운 주소가 생성됩니다.</string>
     <string name="wallet_balance_fragment_too_much">이 금액은 보관하기에 너무 큰 금액입니다. 일부를 안전한 장소로 옮기십시오.</string>
@@ -41,6 +43,8 @@
     <string name="wallet_low_storage_dialog_button_apps">앱 정리하기</string>
     <string name="wallet_timeskew_dialog_title">날짜&amp;시간 설정 확인</string>
     <string name="wallet_timeskew_dialog_msg">기기에 설정된 시간에 %d분의 오차가 있습니다. 이 문제로 인하여 대시를 보내거나 받을 수 없을 지도 모릅니다.\n\n현재의 설정을 확인하신 후 필요한 경우 당신의 날짜, 시간 및 표준 시간대를 수정해주십시오.</string>
+    <string name="wallet_coinjoin_timeskew_dialog_msg">당신의 기기에 설정된 시간이 %d초 차이로 %s 입니다. 이 차이로 인하여 코인조인을 사용할 수 없습니다. \n\n기기의 설정을 \"자동으로 시간 설정\"으로 변경하여 코인조인을 사용하세요.</string>
+    <string name="settings_coinjoin_timeskew_dialog_msg">당신의 기기에 설정된 시간이 5초 이상 잘못되었습니다. 이 차이로 인하여 코인조인을 사용할 수 없습니다. \n\n코인조인을 사용하기 전, 기기의 설정을 \"자동으로 시간 설정\"으로 변경하세요.</string>
     <string name="send_coins_activity_title">대시 보내기</string>
     <string name="send_coins_fragment_request_payment_request_progress"> %s에서 전자 서명을 불러오는 중...</string>
     <string name="send_coins_fragment_request_payment_request_failed_title">전자 서명 불러오기 실패</string>
@@ -170,6 +174,10 @@
     <string name="transaction_row_status_masternode_revoke">마스터노드 취소</string>
     <string name="transaction_row_status_masternode_reward">마스터노드 리워드</string>
     <string name="transaction_row_status_mining_reward">채굴 리워드</string>
+    <string name="transaction_row_status_coinjoin_mixing_fee">코인조인 믹싱 수수료</string>
+    <string name="transaction_row_status_coinjoin_make_collateral">코인조인 담보 입력</string>
+    <string name="transaction_row_status_coinjoin_mixing">코인조인 믹싱</string>
+    <string name="transaction_row_status_coinjoin_create_denominations">코인조인 디노미네이션 생성</string>
     <string name="network_monitor_activity_title">블럭체인 모니터링</string>
     <string name="network_monitor_peer_list_title">피어</string>
     <string name="network_monitor_block_list_title">블럭</string>
@@ -328,6 +336,7 @@
     <string name="notification_inactivity_message">이 기기에 아직 대시가 남아 있습니다! 이 대시 지갑을 삭제하기 전에 당신의 복원 문구를 적어두세요. 그렇지 않으면 당신의 잔고 %s를 잃게 됩니다.</string>
     <string name="notification_inactivity_action_dismiss">다시 알림</string>
     <string name="notification_inactivity_action_dismiss_forever">알림 없음</string>
+    <string name="notification_bluetooth_service_listening">블루투스를 통해 지불 받을 준비를 마쳤습니다</string>
     <string name="appwidget_wallet_balance_title">대시 잔고</string>
 
     <!-- generic buttons -->
diff --git a/wallet/res/values-nl/strings-dashpay.xml b/wallet/res/values-nl/strings-dashpay.xml
index 05b780bef6..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,8 @@ 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 gebruikers deze kunnen aanmaken.</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>
     <string name="n_usernames">%d gebruikersnamen</string>
     <string name="n_requests">%d verzoeken</string>
@@ -293,8 +293,9 @@ gebruikersnaam</b></string>
         <item>Alles</item>
         <item>Ik heb het goedgekeurd</item>
         <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>
     <string name="request_username">Vraag gebruikersnaam aan</string>
@@ -302,8 +303,12 @@ gebruikersnaam</b></string>
     <string name="request_username_available">Gebruikersnaam is beschikbaar</string>
     <string name="request_username_unavailable">Gebruikersnaam is niet beschikbaar of geblokkeerd</string>
     <string name="request_username_taken">Gebruikersnaam is bezet</string>
+    <string name="request_username_taken_results">Gebruikersnaam bezet door een andere gebruiker</string>
     <string name="requesting_your_username_title">Je gebruikersnaam aan het maken</string>
+    <string name="requesting_your_username_message">Je gebruikersnaam %s wordt aangevraagd op het Dash Netwerk. Dit kan even duren.</string>
+    <string name="creating_your_username_message">Je gebruikersnaam %s wordt gecreëerd op het Dash Netwerk. Dit kan even duren.</string>
     <string name="requesting_your_username_error_title">Je verzoek  om gebruikersnaam is mislukt.</string>
+    <string name="requesting_your_username_error_message">De aanvraag voor gebruikersnaam%s is mislukt door onbekende reden.</string>
     <string name="voting">Stemming:</string>
     <string name="this_username_has_already_been_requested">Deze gebruikersnaam is al aangevraagd, maar je kan deze alsnog aanvragen en het netwerk laten beslissen of je deze kunt krijgen</string>
     <string name="request_details">Verkrijg details</string>
@@ -324,15 +329,14 @@ gebruikersnaam</b></string>
     <string name="make_a_post_with_the_text">Maak een post met de bovenstaande tekst op een bekend sociaal netwerk of berichtenplatform om te verifiëren dat jij de oorspronkelijke eigenaar van de gevraagde gebruikersnaam bent en plak de link hieronder.</string>
     <string name="paste_the_link">Plak de link</string>
     <string name="voting_key_title">Voer je stem sleutel in</string>
-    <string name="voting_key_hint">Masternode stem-sleutel</string>
+    <string name="voting_key_hint">Masternode Voting Private Key</string>
     <string name="voting_key_input_error">Je hebt een verkeerde sleutel ingevoerd</string>
+    <string name="voting_key_input_not_active_error">je hebt een sleutel ingevoerd die niet is gekoppeld aan een actieve Masternode</string>
     <string name="voting_key_add">Voeg je stemssleutels toe.</string>
     <string name="voting_key_add_subtitle">De onderstaande IP-adres(sen) zijn geassocieerd met deze portemonnee.</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>
@@ -398,4 +402,15 @@ gebruikersnaam</b></string>
     <string name="request_username_balance_requirement">Je hebt 0,25 DASH nodig om deze gebruikersnaam aan te maken</string>
     <string name="request_username_length_requirement">Tussen 3 en 23 tekens</string>
     <string name="request_username_confirm">Ik accepteer</string>
+    <string name="username_vote_one_left_message">Je hebt al %d keer gestemd op deze gebruikersnaam. Je kan nog maar één stem uitbrengen op deze gebruikersnaam.</string>
+    <string name="username_vote_one_left">Eén stem over</string>
+    <string name="username_vote_none_left_message">Je hebt al %d keer gestemd op deze gebruikersnaam. Je kan geen stem meer uitbrengen op deze gebruikersnaam.</string>
+    <string name="username_vote_none_left">Geen stemmen over</string>
+    <string name="request_username_blocked">De aangevraagde gebruikersnaam is geblokkeerd</string>
+    <string name="request_username_lost_vote">De aangevraagde gebruikersnaam is aan iemand anders gegeven</string>
+    <string name="request_username_blocked_message">De gebruikersnaam %s is geblokkeerd door het Dash Netwerk. Probeer het opnieuw door een andere gebruikersnaam aan te vragen.</string>
+    <string name="request_username_lost_vote_message">Vanwege het stemproces heeft het Dash Netwerk besloten om de gebruikersnaam %s aan iemand anders toe te wijzen. Probeer het opnieuw door een andere gebruikersnaam aan te vragen.</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>
diff --git a/wallet/res/values-nl/strings-extra.xml b/wallet/res/values-nl/strings-extra.xml
index afda6f1908..b80de5e48c 100644
--- a/wallet/res/values-nl/strings-extra.xml
+++ b/wallet/res/values-nl/strings-extra.xml
@@ -25,6 +25,8 @@
     <string name="dialog_confirm_secured_by">Beveiligd door</string>
     <string name="dialog_confirm_fee">Netwerk transactiekosten</string>
     <string name="dialog_confirm_total">Totaal</string>
+    <string name="dialog_confirm_accept_contact_request">Contactverzoek accepteren</string>
+
     <string name="shortcut_action_join_dashpay">Word lid van DashPay</string>
     <!-- Home Screen: Shortcut Button: 2 lines, 9 characters across -->
     <string name="shortcut_secure_now">Backup</string>
@@ -188,6 +190,9 @@
     <string name="notification_settings_title">Notificaties</string>
     <string name="notification_explainer_title">Dash Wallet wil je graag meldingen sturen</string>
     <string name="notification_explainer_message">Meldingen kunnen waarschuwingen, geluiden en pictogrambadges bevatten. Deze kunnen worden geconfigureerd in de telefooninstellingen.</string>
+    <string name="notification_dashpay_channel_name">DashPay</string>
+    <string name="notification_dashpay_channel_description">Status van de lopende DashPay activiteiten.</string>
+
     <string name="net_type_indicator" />
 
     <string name="unlock_with_fingerprint">Gebruik je vingerafdruk om te ontgrendelen.</string>
@@ -240,6 +245,7 @@
     <string name="transaction_close">Sluiten</string>
     <string name="transaction_details_amount_received">Ontvangen bedrag</string>
     <string name="transaction_details_amount_sent">Verzonden bedrag</string>
+    <string name="transaction_details_amount_sent_successfully">Succesvol verzonden</string>
     <string name="transaction_details_sent_from">Verzonden vanaf</string>
     <string name="transaction_details_sent_to">Verzonden naar</string>
     <string name="transaction_details_received_at">Ontvangen met</string>
@@ -258,6 +264,7 @@
     <string name="authenticate_switch_to_pin">gebruik PIN</string>
 
     <string name="menu_invite_title">Nodig uit</string>
+    <string name="menu_invite_subtitle">Help je vrienden en familie lid te worden van Dash</string>
     <string name="menu_buy_and_sell_title">Koop &amp; verkoop Dash</string>
     <string name="menu_buy_and_sell_subtitle">Verbind met beurzen van derden</string>
     <string name="liquid_unavailable">Liquid integratie met Dash portemonnee is niet langer beschikbaar</string>
@@ -369,16 +376,28 @@
     <string name="import_image_invalid_private">Ongeldige persoonlijke sleutel</string>
     <string name="okay">Oké</string>
 
+    <string name="onboard_from_invite_title">Laten we beginnen</string>
     <string name="onboard_from_invite_subtitle">Welkom bij DashPay</string>
+    <string name="onboard_from_invite_step1">Stap 1</string>
+    <string name="onboard_from_invite_step2">Stap 2</string>
+    <string name="onboard_from_invite_step3">Stap 3</string>
     <string name="onboard_from_invite_step1_title">Kies je gebruikersnaam</string>
     <string name="onboard_from_invite_step2_title">Stel je pincode in</string>
     <string name="onboard_from_invite_step3_title">Beveilig je portemonnee</string>
 
     <string name="restore_wallet_please_wait">Even wachten a.u.b.</string>
+    <string name="restore_wallet_restoring">Je portemonnee wordt hersteld</string>
+
+
+
     <string name="network_unavailable">Netwerk niet beschikbaar</string>
     <string name="network_error_contact_details">Kan contactgegevens niet ophalen</string>
     <string name="network_error_user_search">Kan niet naar een gebruiker zoeken</string>
     <string name="network_error_contact_suggestions">Kan geen suggesties geven</string>
+    <string name="network_error_unable_to_update_profile">Kan je profiel niet bijwerken</string>
+
+
+
     <string name="today">Vandaag</string>
     <string name="yesterday">Gisteren</string>
 
@@ -388,6 +407,8 @@
     <string name="all_transactions">Alles</string>
     <string name="received_transactions">Ontvangen</string>
     <string name="sent_transactions">Verzonden</string>
+    <string name="serious_error_title">Ernstige fout</string>
+    <string name="serious_error_unknown">Neem contact op met support.</string>
     <string name="set_pin_error_missing_wallet_title">Fout missende portemonnee</string>
     <string name="set_pin_error_missing_wallet_message">De portemonnee is zoek. Meld dit bij de Support Desk.</string>
     <string name="wallet_encryption_error_title">Fout bij aanmaken portemonnee</string>
@@ -437,6 +458,9 @@
     <string name="masternode_key_not_used">Niet gebruikt</string>
     <string name="masternode_key_revoked">Ingetrokken</string>
     <string name="masternode_key_private_public_base64">persoonlijke / publieke sleutels (base64)</string>
+    <string name="timeskew_ahead">voor</string>
+    <string name="timeskew_behind">achter</string>
+
     <!-- stale rates messages -->
     <string name="stale_exchange_rates_error">Prijzen zijn niet opgehaald. Fiat waarden kunnen onjuist zijn.</string>
     <string name="stale_exchange_rates_stale">Prijzen zijn minstens 30 minuten oud. Fiat waarden kunnen onjuist zijn.</string>
diff --git a/wallet/res/values-nl/strings.xml b/wallet/res/values-nl/strings.xml
index eb65fe406a..8587e588a6 100644
--- a/wallet/res/values-nl/strings.xml
+++ b/wallet/res/values-nl/strings.xml
@@ -9,9 +9,11 @@
     <string name="blockchain_state_progress_days">%1$s, %2$d dagen achter</string>
     <string name="blockchain_state_progress_weeks">%1$s, %2$d weken achter</string>
     <string name="blockchain_state_progress_months">%1$s, %2$d maanden achter</string>
+    <string name="blockchain_state_progress_downloading">Synchroniseren met netwerk (%1$s%%)</string>
     <string name="blockchain_state_progress_stalled">Synchronisatie is tot stilstand gekomen</string>
     <string name="blockchain_state_progress_problem_storage">Synchronisatie: Opslagprobleem</string>
     <string name="blockchain_state_progress_problem_network">Synchronisatie: Netwerkprobleem</string>
+    <string name="mixing_state_progress_mixing">Munten aan het mixen (%1$s%%)</string>
     <string name="wallet_address_fragment_clipboard_msg">Dashadres is gekopieerd naar klembord</string>
     <string name="wallet_address_dialog_fragment_hint">Om je privacy te beschermen zal je adres wijzigen zodra een betaling ontvangen is.</string>
     <string name="wallet_balance_fragment_too_much">Dit Dashsaldo is behoorlijk hoog om op zak te hebben. Advies: breng een deel van je saldo onder op een veiliger plek.</string>
@@ -41,6 +43,8 @@
     <string name="wallet_low_storage_dialog_button_apps">Apps beheren</string>
     <string name="wallet_timeskew_dialog_title">controleer datum &amp; tijd instellingen</string>
     <string name="wallet_timeskew_dialog_msg">De tijd op je apparaat is %d minuten uit sync. Door dit probleem kun je waarschijnlijk geen Dash versturen of ontvangen.\\n\\nJe dient uw datum, tijd en tijdzone-instellingen te controleren en zo nodig te corrigeren. </string>
+    <string name="wallet_coinjoin_timeskew_dialog_msg">De tijd op dit apparaat is %s bij %d seconden. Je kan CoinJoin niet gebruiken vanwege dit verschil.\n\nDe tijdinstellingen op dit apparaat moet worden gewijzigd naar \'Tijd automatisch instellen\'.</string>
+    <string name="settings_coinjoin_timeskew_dialog_msg">De tijd van dit apparaat wijkt meer dan 5 seconden af. Je kan CoinJoin niet gebruiken vanwege dit verschil.\n\nDe tijdinstellingen op dit apparaat moeten worden gewijzigd naar \"Tijd automatisch instellen\" voordat je CoinJoin kan gebruiken.</string>
     <string name="send_coins_activity_title">Dash versturen</string>
     <string name="send_coins_fragment_request_payment_request_progress">Bezig met ophalen van handtekening van %s...</string>
     <string name="send_coins_fragment_request_payment_request_failed_title">Het ophalen van de handtekening is mislukt</string>
@@ -170,6 +174,10 @@
     <string name="transaction_row_status_masternode_revoke">Masternode intrekken</string>
     <string name="transaction_row_status_masternode_reward">Masternodebeloning</string>
     <string name="transaction_row_status_mining_reward">Miningbeloning</string>
+    <string name="transaction_row_status_coinjoin_mixing_fee">CoinJoin mixkosten</string>
+    <string name="transaction_row_status_coinjoin_make_collateral">CoinJoin inputs</string>
+    <string name="transaction_row_status_coinjoin_mixing">CoinJoin mixen</string>
+    <string name="transaction_row_status_coinjoin_create_denominations">Creëer CoinJoin denominaties</string>
     <string name="network_monitor_activity_title">Netwerkmonitor</string>
     <string name="network_monitor_peer_list_title">Peers</string>
     <string name="network_monitor_block_list_title">Blokken</string>
@@ -328,6 +336,7 @@
     <string name="notification_inactivity_message">Je hebt nog steeds Dash op dit apparaat! Vergeet niet om je herstelzin te noteren voordat je de Dash portemonnee app verwijdert, anders verliest u uw saldo van %s.</string>
     <string name="notification_inactivity_action_dismiss">Herinner me later</string>
     <string name="notification_inactivity_action_dismiss_forever">Herinner me niet</string>
+    <string name="notification_bluetooth_service_listening">Klaar om betalingen via Bluetooth te ontvangen</string>
     <string name="appwidget_wallet_balance_title">Dashsaldo</string>
 
     <!-- generic buttons -->
diff --git a/wallet/res/values-pl/strings-dashpay.xml b/wallet/res/values-pl/strings-dashpay.xml
index 0985768eac..65a5d74ae8 100644
--- a/wallet/res/values-pl/strings-dashpay.xml
+++ b/wallet/res/values-pl/strings-dashpay.xml
@@ -87,7 +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">tutaj wpisz nazwę użytkownika, którą chcesz znaleźć</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>
@@ -261,14 +261,17 @@
     <string name="keep_your_passphrase_safe">Zabezpiecz swoją listę słów do odzysku konta oraz hasło.</string>
     <string name="pay_now">Zapłać teraz, a jeśli nazwa nie zostanie zatwierdzona, możesz utworzyć inną nazwę bez konieczności ponownego uiszczania opłaty</string>
     <string name="case_your_request_is_not_approved">W przypadku, gdy Twoja prośba nie zostanie zatwierdzona</string>
-    <string name="voting_requirement_subtitle">Każda nazwa użytkownika zawierająca cyfrę od 2 do 9 lub dłuższa niż 20 znaków zostanie automatycznie zatwierdzona</string>
+    <string name="voting_requirement_subtitle">Każda nazwa użytkownika, która zawiera numer od 2 do 9 albo składa się z 20 lub więcej znaków, zostanie automatycznie zatwierdzona</string>
     <string name="voting_requirement_title">Głosowanie jest wymagane tylko w niektórych przypadkach</string>
     <string name="dash_network_must_vote_to_approve">Sieć Dash musi głosować nad zatwierdzeniem Twojej nazwy użytkownika zanim zostanie ona stworzona.</string>
     <string name="what_is_username_voting">Na czym polega głosowanie nad nazwą użytkownika\?</string>
     <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 masternodu możesz głosować nad zatwierdzeniem żądanych nazw użytkowników, zanim zostaną one stworzone. </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>
     <string name="n_usernames">%d nazwy użytkowników</string>
     <string name="n_requests">%d żądań</string>
@@ -291,8 +294,22 @@
         <item>Całość</item>
         <item>Zatwierdziłem</item>
         <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>
     <string name="request_username">Poproś o nazwę użytkownika</string>
@@ -300,13 +317,18 @@
     <string name="request_username_available">Nazwa użytkownika jest dostępna</string>
     <string name="request_username_unavailable">Nazwa użytkownika jest niedostępna lub zablokowana</string>
     <string name="request_username_taken">Nazwa użytkownika jest już zajęta</string>
+    <string name="request_username_taken_results">Nazwa ta jest zajęta przez innego użytkownika</string>
     <string name="requesting_your_username_title">Tworzenie twojej nazwy użytkownika</string>
+    <string name="requesting_your_username_message">Twoja nazwa użytkownika %s jest żądana w sieci Dash. Może to zająć trochę czasu.</string>
+    <string name="creating_your_username_message">Twoja nazwa użytkownika %s jest tworzona w sieci Dash. Może to zająć trochę czasu.</string>
     <string name="requesting_your_username_error_title">Żądanie nazwy użytkownika nie powiodło się</string>
+    <string name="requesting_your_username_error_message">Z jakiegoś powodu żądanie nazwy użytkownika %s nie powiodło się.</string>
     <string name="voting">Głosowanie:</string>
     <string name="this_username_has_already_been_requested">Ktoś już poprosił o tę nazwę, ale możesz ty też o nią poprosić i pozwolić sieci głosować, nad tym kto ma ją otrzymać.</string>
     <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>
@@ -322,15 +344,34 @@
     <string name="make_a_post_with_the_text">Stwórz post z powyższym tekstem na platformie społecznościowej lub komunikatorze, aby potwierdzić, że jesteś oryginalnym właścicielem żądanej nazwy użytkownika i wklej poniższy link</string>
     <string name="paste_the_link">Wklej link</string>
     <string name="voting_key_title">Wpisz swój klucz do głosowania</string>
-    <string name="voting_key_hint">Klucz Masternoda  do głosowania</string>
+    <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="vote_submitted">Twój głos został przesłany</string>
-    <string name="vote_cancelled">Twój głos został anulowany</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>
@@ -396,4 +437,15 @@
     <string name="request_username_balance_requirement">Aby stworzyć tę nazwę użytkownika, musisz mieć 0,25 DASH</string>
     <string name="request_username_length_requirement">Pomiędzy 3 a 23 znakami</string>
     <string name="request_username_confirm">Akceptuję</string>
+    <string name="username_vote_one_left_message">Głosowałeś już na tę nazwę użytkownika %d razy. Został ci ostatni głos do oddania na tę nazwę użytkownika.</string>
+    <string name="username_vote_one_left">Został ci tylko jeden głos</string>
+    <string name="username_vote_none_left_message">Głosowałeś już %d razy. Nie możesz oddać więcej głosów na tę nazwę użytkownika.</string>
+    <string name="username_vote_none_left">Nie możesz oddać więcej głosów</string>
+    <string name="request_username_blocked">Żądana nazwa użytkownika została zablokowana</string>
+    <string name="request_username_lost_vote">Żądana nazwa użytkownika została przyznana komuś innemu</string>
+    <string name="request_username_blocked_message">Nazwa użytkownika %s została zablokowana przez sieć Dash. Spróbuj zażądać inną nazwę użytkownika.</string>
+    <string name="request_username_lost_vote_message">Po głosowaniu sieć Dash postanowiła przypisać nazwę użytkownika %s komuś innemu. Spróbuj ponownie, prosząc o inną nazwę użytkownika.</string>
+    <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>
diff --git a/wallet/res/values-pl/strings-extra.xml b/wallet/res/values-pl/strings-extra.xml
index becdd5e6ad..444cef26c3 100644
--- a/wallet/res/values-pl/strings-extra.xml
+++ b/wallet/res/values-pl/strings-extra.xml
@@ -25,6 +25,8 @@
     <string name="dialog_confirm_secured_by">Zabezpieczony przez</string>
     <string name="dialog_confirm_fee">Opłata sieci</string>
     <string name="dialog_confirm_total">Całkowite</string>
+    <string name="dialog_confirm_accept_contact_request">Zaakceptuj prośbę o dodanie do kontaktów</string>
+
     <string name="shortcut_action_join_dashpay">Dołącz do DashPay</string>
     <!-- Home Screen: Shortcut Button: 2 lines, 9 characters across -->
     <string name="shortcut_secure_now">Kopia zapasowa</string>
@@ -194,6 +196,9 @@
     <string name="notification_settings_title">Powiadomienia</string>
     <string name="notification_explainer_title">Portfel Dash chciałby wysłać Ci powiadomienia</string>
     <string name="notification_explainer_message">Powiadomienia mogą obejmować alerty, dźwięki i znaki na ikonach. Można je skonfigurować w ustawieniach telefonu.</string>
+    <string name="notification_dashpay_channel_name">DashPay</string>
+    <string name="notification_dashpay_channel_description">Status operacji DashPay, które są w toku.</string>
+
     <string name="net_type_indicator" />
 
     <string name="unlock_with_fingerprint">Użyj odcisku palca by odblokować.</string>
@@ -246,6 +251,7 @@
     <string name="transaction_close">Zamknij</string>
     <string name="transaction_details_amount_received">Ilość otrzymana</string>
     <string name="transaction_details_amount_sent">Ilość wysłana</string>
+    <string name="transaction_details_amount_sent_successfully">Wysłano pomyślnie</string>
     <string name="transaction_details_sent_from">Wysłane z</string>
     <string name="transaction_details_sent_to">Wysłane do</string>
     <string name="transaction_details_received_at">Odebrane przez</string>
@@ -264,6 +270,7 @@
     <string name="authenticate_switch_to_pin">Użyj kod PIN</string>
 
     <string name="menu_invite_title">Zaproś</string>
+    <string name="menu_invite_subtitle">Pomóż twoim przyjaciołom i rodzinie na dołączanie do Dash</string>
     <string name="menu_buy_and_sell_title">Kupuj &amp; Sprzedawaj Dash</string>
     <string name="menu_buy_and_sell_subtitle">Połącz się z giełdą stron trzecich</string>
     <string name="liquid_unavailable">Integracja portfela Dash z serwisem Liquid jest nieaktualna</string>
@@ -375,16 +382,28 @@
     <string name="import_image_invalid_private">Niewłaściwy Klucz Prywatny</string>
     <string name="okay">OK</string>
 
+    <string name="onboard_from_invite_title">Zacznijmy</string>
     <string name="onboard_from_invite_subtitle">Witaj w DashPay</string>
+    <string name="onboard_from_invite_step1">Krok 1</string>
+    <string name="onboard_from_invite_step2">Krok 2</string>
+    <string name="onboard_from_invite_step3">Krok 3</string>
     <string name="onboard_from_invite_step1_title">Wybierz swoją nazwę użytkownika</string>
     <string name="onboard_from_invite_step2_title">Ustaw swój PIN</string>
     <string name="onboard_from_invite_step3_title">Zabezpiecz swój portfel </string>
 
     <string name="restore_wallet_please_wait">Jedna chwila</string>
+    <string name="restore_wallet_restoring">Twój portfel jest przywracany</string>
+
+
+
     <string name="network_unavailable">Sieć jest niedostępna</string>
     <string name="network_error_contact_details">Pobranie informacji kontaktu nie powiodło się</string>
     <string name="network_error_user_search">Wyszukanie użytkownika jest niemożliwe</string>
     <string name="network_error_contact_suggestions">Niemożliwe dostarczenie żadnych sugesti</string>
+    <string name="network_error_unable_to_update_profile">Aktualizacja twojego profilu nie powiodła się</string>
+
+
+
     <string name="today">Dzisiaj</string>
     <string name="yesterday">Wczoraj</string>
 
@@ -394,6 +413,8 @@
     <string name="all_transactions">Całość</string>
     <string name="received_transactions">Otrzymano</string>
     <string name="sent_transactions">Wysłano</string>
+    <string name="serious_error_title">Poważny błąd</string>
+    <string name="serious_error_unknown">Skontaktuj się z pomocą techniczną</string>
     <string name="set_pin_error_missing_wallet_title">Błąd Braku Portfela</string>
     <string name="set_pin_error_missing_wallet_message">Nie można znaleźć portfela. Skontaktuj się z pomocą techniczną Dash</string>
     <string name="wallet_encryption_error_title">Błąd Tworzenia Portfela</string>
@@ -443,6 +464,9 @@
     <string name="masternode_key_not_used">Nie użyte</string>
     <string name="masternode_key_revoked">Unieważniony</string>
     <string name="masternode_key_private_public_base64">Prywatne / Publiczne (base64)</string>
+    <string name="timeskew_ahead">przed</string>
+    <string name="timeskew_behind">za</string>
+
     <!-- stale rates messages -->
     <string name="stale_exchange_rates_error">Nie pobrano cen. Kursy papierowego pieniądza mogą być nieprawidłowe.</string>
     <string name="stale_exchange_rates_stale">Ceny są sprzed co najmniej 30 minut. Ceny papierowego pieniądza mogą być nieprawidłowe.</string>
diff --git a/wallet/res/values-pl/strings.xml b/wallet/res/values-pl/strings.xml
index c621b85afb..abbac361e1 100644
--- a/wallet/res/values-pl/strings.xml
+++ b/wallet/res/values-pl/strings.xml
@@ -9,9 +9,11 @@
     <string name="blockchain_state_progress_days">%1$s, przestarzały o %2$d dni</string>
     <string name="blockchain_state_progress_weeks">%1$s, przestarzały o %2$d tygodni</string>
     <string name="blockchain_state_progress_months">%1$s, przestarzały o %2$d miesięcy</string>
+    <string name="blockchain_state_progress_downloading">Synchronizowanie z siecią (%1$s%%)</string>
     <string name="blockchain_state_progress_stalled">Synchronizacja wstrzymana</string>
     <string name="blockchain_state_progress_problem_storage">Synchronizowanie: Problem z pamięcią</string>
     <string name="blockchain_state_progress_problem_network">Synchronizowanie: Problem z siecią</string>
+    <string name="mixing_state_progress_mixing">Mieszanie funduszy (%1$s%%)</string>
     <string name="wallet_address_fragment_clipboard_msg">Adres Dash został skopiowany do schowka.</string>
     <string name="wallet_address_dialog_fragment_hint">Aby chronić twoją prywatność, twój adres zmieni się, gdy tylko otrzyma płatność.</string>
     <string name="wallet_balance_fragment_too_much">Ta kwota jest chyba zbyt duża by nosić ją w kieszeni. Proszę przenieś część środków w bezpieczniejsze miejsce.</string>
@@ -41,6 +43,8 @@
     <string name="wallet_low_storage_dialog_button_apps">Zarządzaj aplikacjami</string>
     <string name="wallet_timeskew_dialog_title">Sprawdź datę i ustawienia czasu</string>
     <string name="wallet_timeskew_dialog_msg">Czas na twoim urządzeniu jest opóźniony o %d minuty. Z tego powodu prawdopodobnie nie będziesz mógł wysyłać i odbierać Dash.\\n\\nSprawdź i w razie konieczności popraw ustawienia daty, godziny i strefy czasowej.</string>
+    <string name="wallet_coinjoin_timeskew_dialog_msg">Czas na twoim urządzeniu jest %s na %d sekund. Nie możesz użyć CoinJoin z powodu tej różnicy.\n\nUstawienia czasu na tym urządzeniu muszą zostać zmienione na „Automatycznie ustawiaj czas”, aby użyć CoinJoin.</string>
+    <string name="settings_coinjoin_timeskew_dialog_msg">Czas na twoim urządzeniu jest nieprawidłowy o więcej niż 5 sekund. Nie możesz używać CoinJoin z powodu tej różnicy\n\nUstawienia czasu na urządzeniu muszą zostać zmienione na „Automatycznie ustawiaj czas” przed użyciem CoinJoin.</string>
     <string name="send_coins_activity_title">Wyślij Dashe</string>
     <string name="send_coins_fragment_request_payment_request_progress">Pobieranie podpisu z %s...</string>
     <string name="send_coins_fragment_request_payment_request_failed_title">Pobieranie podpisu nie powiodło się</string>
@@ -170,6 +174,10 @@
     <string name="transaction_row_status_masternode_revoke">Odwołanie Masternoda</string>
     <string name="transaction_row_status_masternode_reward">Nagroda Masternoda</string>
     <string name="transaction_row_status_mining_reward">Nagroda Górnictwa</string>
+    <string name="transaction_row_status_coinjoin_mixing_fee">Opłata za mieszanie funduszy za pomocą CoinJoin</string>
+    <string name="transaction_row_status_coinjoin_make_collateral">Zabezpieczenie dla transakcji wejściowych do CoinJoin</string>
+    <string name="transaction_row_status_coinjoin_mixing">Mieszanie CoinJoin</string>
+    <string name="transaction_row_status_coinjoin_create_denominations">Stwórz Denominacje CoinJoin</string>
     <string name="network_monitor_activity_title">Monitor sieci</string>
     <string name="network_monitor_peer_list_title">Połączenia</string>
     <string name="network_monitor_block_list_title">Bloki</string>
@@ -328,6 +336,7 @@
     <string name="notification_inactivity_message">Wciąż posiadasz Dash na tym urządzeniu! Upewnij się że masz zapisane hasła odzyskiwania portfela zanim odinstalujesz Dash Wallet w innym wypadku stracisz swój balans %s</string>
     <string name="notification_inactivity_action_dismiss">Przypomnij później</string>
     <string name="notification_inactivity_action_dismiss_forever">Nie przypominaj więcej</string>
+    <string name="notification_bluetooth_service_listening">Gotowy do otrzymania płatności przez Bluetooth</string>
     <string name="appwidget_wallet_balance_title">Saldo Dash</string>
 
     <!-- generic buttons -->
diff --git a/wallet/res/values-pt/strings-dashpay.xml b/wallet/res/values-pt/strings-dashpay.xml
index c654bbdf6f..c9b0abb98d 100644
--- a/wallet/res/values-pt/strings-dashpay.xml
+++ b/wallet/res/values-pt/strings-dashpay.xml
@@ -88,7 +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">digite o nome de usuário para pesquisar aqui</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>
@@ -269,7 +269,10 @@ 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 os usuários possam criá-los.</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>
     <string name="n_usernames">%d nomes de usuário</string>
     <string name="n_requests">%d solicitações</string>
@@ -292,22 +295,39 @@ Dash</b></string>
         <item>Todos</item>
         <item>Eu aprovei</item>
         <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, note que você não poderá alterar isso no futuro</string>
+    <string name="request_your_hint">Por favor, observe que você não poderá alterar isso no futuro</string>
     <string name="request_username">Solicitar Nome de Usuário</string>
     <string name="request_voting_range">A rede Dash fará uma votação para escolher este nome de usuário. Você será notificado sobre o resultado em %s.</string>
     <string name="request_username_available">Nome de usuário está disponível</string>
     <string name="request_username_unavailable">Nome de usuário indisponível ou bloqueado</string>
     <string name="request_username_taken">Nome de usuário já foi registrado</string>
+    <string name="request_username_taken_results">Nome já foi escolhido por outro usuário</string>
     <string name="requesting_your_username_title">Criando seu nome de usuário</string>
+    <string name="requesting_your_username_message">Seu nome de usuário %s está sendo solicitado na rede Dash. Isso pode levar algum tempo.</string>
+    <string name="creating_your_username_message">Seu nome de usuário %s está sendo criado na rede Dash. Isso pode levar algum tempo.</string>
     <string name="requesting_your_username_error_title">Sua solicitação de nome de usuário falhou</string>
+    <string name="requesting_your_username_error_message">Por algum motivo, a solicitação para o usuário %s falhou.</string>
     <string name="voting">Votando:</string>
     <string name="this_username_has_already_been_requested">Esse nome de usuário já foi solicitado, mas você também pode solicitá-lo e deixar a rede votar para decidir se você pode ficar com ele</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>
@@ -323,15 +343,34 @@ Dash</b></string>
     <string name="make_a_post_with_the_text">Faça uma publicação com o texto acima em uma rede social ou plataforma de mensagens conhecida para verificar que você é o proprietário original do nome de usuário solicitado e cole o link abaixo</string>
     <string name="paste_the_link">Cole o link</string>
     <string name="voting_key_title">Digite sua chave de votação</string>
-    <string name="voting_key_hint">Chave de Votação de Masternode</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="vote_submitted">Seu voto foi enviado</string>
-    <string name="vote_cancelled">Seu voto foi cancelado</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>
@@ -397,4 +436,15 @@ Dash</b></string>
     <string name="request_username_balance_requirement">Você precisa ter 0,25 DASH para criar este nome de usuário</string>
     <string name="request_username_length_requirement">Entre 3 e 23 caracteres</string>
     <string name="request_username_confirm">Eu aceito</string>
+    <string name="username_vote_one_left_message">Você já votou para este nome de usuário %d vezes. Você pode votar apenas mais uma vez.  </string>
+    <string name="username_vote_one_left">Um voto restante</string>
+    <string name="username_vote_none_left_message">Você já votou para este nome de usuário %d vezes. Você não pode mais votar.</string>
+    <string name="username_vote_none_left">Sem votos restantes</string>
+    <string name="request_username_blocked">O nome de usuário solicitado foi bloqueado</string>
+    <string name="request_username_lost_vote">O nome de usuário solicitado foi dado a outra pessoa</string>
+    <string name="request_username_blocked_message">O nome de usuário %s foi bloqueado pela Rede Dash. Por favor, tente novamente solicitando outro nome de usuário.</string>
+    <string name="request_username_lost_vote_message">Devido ao processo de votação, a Rede Dash decidiu atribuir o nome de usuário %s a outra pessoa. Por favor, tente novamente solicitando outro nome de usuário.</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>
diff --git a/wallet/res/values-pt/strings-extra.xml b/wallet/res/values-pt/strings-extra.xml
index 842eae3e1d..75b1ab88ba 100644
--- a/wallet/res/values-pt/strings-extra.xml
+++ b/wallet/res/values-pt/strings-extra.xml
@@ -25,6 +25,8 @@
     <string name="dialog_confirm_secured_by">Protegido por</string>
     <string name="dialog_confirm_fee">Taxa de rede</string>
     <string name="dialog_confirm_total">Total</string>
+    <string name="dialog_confirm_accept_contact_request">Aceitar solicitação de contato</string>
+
     <string name="shortcut_action_join_dashpay">Junte-se ao DashPay</string>
     <!-- Home Screen: Shortcut Button: 2 lines, 9 characters across -->
     <string name="shortcut_secure_now">Backup</string>
@@ -191,6 +193,9 @@
     <string name="notification_settings_title">Notificações</string>
     <string name="notification_explainer_title">A Carteira Dash gostaria de lhe enviar notificações</string>
     <string name="notification_explainer_message">As notificações podem incluir alertas, sons e ícones. Elas podem ser definidas nas configurações do telefone.</string>
+    <string name="notification_dashpay_channel_name">DashPay</string>
+    <string name="notification_dashpay_channel_description">Status das operações em andamento do DashPay.</string>
+
     <string name="net_type_indicator" />
 
     <string name="unlock_with_fingerprint">Use sua digital para desbloquear.</string>
@@ -243,6 +248,7 @@
     <string name="transaction_close">Fechar</string>
     <string name="transaction_details_amount_received">Valor Recebido</string>
     <string name="transaction_details_amount_sent">Valor Enviado</string>
+    <string name="transaction_details_amount_sent_successfully">Enviado com sucesso</string>
     <string name="transaction_details_sent_from">Enviar para</string>
     <string name="transaction_details_sent_to">Enviado para</string>
     <string name="transaction_details_received_at">Recebido em</string>
@@ -261,6 +267,7 @@
     <string name="authenticate_switch_to_pin">Usar PIN</string>
 
     <string name="menu_invite_title">Convidar</string>
+    <string name="menu_invite_subtitle">Ajude seus amigos e familiares a entrarem no Dash</string>
     <string name="menu_buy_and_sell_title">Comprar &amp; Vender Dash</string>
     <string name="menu_buy_and_sell_subtitle">Conectar com exchange de terceiros</string>
     <string name="liquid_unavailable">A integração de Liquid com a Dash Wallet não está mais disponível</string>
@@ -372,16 +379,28 @@
     <string name="import_image_invalid_private">Chave Privada Inválida</string>
     <string name="okay">Okay</string>
 
+    <string name="onboard_from_invite_title">Vamos começar</string>
     <string name="onboard_from_invite_subtitle">Bem-vindo ao DashPay</string>
+    <string name="onboard_from_invite_step1">Passo 1</string>
+    <string name="onboard_from_invite_step2">Passo 2</string>
+    <string name="onboard_from_invite_step3">Passo 3</string>
     <string name="onboard_from_invite_step1_title">Escolha seu nome de usuário</string>
     <string name="onboard_from_invite_step2_title">Defina seu PIN</string>
     <string name="onboard_from_invite_step3_title">Proteja sua Carteira</string>
 
     <string name="restore_wallet_please_wait">Por favor, aguarde</string>
+    <string name="restore_wallet_restoring">Sua carteira está sendo restaurada</string>
+
+
+
     <string name="network_unavailable">A rede não está disponível</string>
     <string name="network_error_contact_details">Não foi possível buscar os detalhes do contato</string>
     <string name="network_error_user_search">Não foi possível pesquisar um usuário</string>
     <string name="network_error_contact_suggestions">Não foi possível fornecer sugestões</string>
+    <string name="network_error_unable_to_update_profile">Não é possível atualizar seu perfil</string>
+
+
+
     <string name="today">Hoje</string>
     <string name="yesterday">Ontem</string>
 
@@ -391,6 +410,8 @@
     <string name="all_transactions">Todos</string>
     <string name="received_transactions">Recebido</string>
     <string name="sent_transactions">Enviado</string>
+    <string name="serious_error_title">Erro grave</string>
+    <string name="serious_error_unknown">Por favor, entre em contato com o suporte.</string>
     <string name="set_pin_error_missing_wallet_title">Erro de carteira ausente</string>
     <string name="set_pin_error_missing_wallet_message">A carteira está ausente. Por favor, informe isso ao Suporte Técnico.</string>
     <string name="wallet_encryption_error_title">Erro de criação de carteira</string>
@@ -440,6 +461,9 @@
     <string name="masternode_key_not_used">Não utilizado</string>
     <string name="masternode_key_revoked">Revogado</string>
     <string name="masternode_key_private_public_base64">Chaves Públicas / Privadas (base64)</string>
+    <string name="timeskew_ahead">adiante</string>
+    <string name="timeskew_behind">atrás</string>
+
     <!-- stale rates messages -->
     <string name="stale_exchange_rates_error">Os preços não foram recuperados. Os valores em fiat podem estar incorretos.</string>
     <string name="stale_exchange_rates_stale">Os preços têm pelo menos 30 minutos de atraso. Os valores em fiat podem estar incorretos.</string>
diff --git a/wallet/res/values-pt/strings.xml b/wallet/res/values-pt/strings.xml
index cce46d6cc1..d4090cafc6 100644
--- a/wallet/res/values-pt/strings.xml
+++ b/wallet/res/values-pt/strings.xml
@@ -9,9 +9,11 @@
     <string name="blockchain_state_progress_days">%1$s, %2$d dias atrás</string>
     <string name="blockchain_state_progress_weeks">%1$s, %2$d semanas atrás</string>
     <string name="blockchain_state_progress_months">%1$s, %2$d meses atrás</string>
+    <string name="blockchain_state_progress_downloading">Sincronizando com a rede (%1$s%%)</string>
     <string name="blockchain_state_progress_stalled">Sincronização parada</string>
     <string name="blockchain_state_progress_problem_storage">Sincronizando: Problema de armazenamento</string>
     <string name="blockchain_state_progress_problem_network">Sincronizando: Problema na rede</string>
+    <string name="mixing_state_progress_mixing">Mesclando moedas (%1$s%%)</string>
     <string name="wallet_address_fragment_clipboard_msg">Endereço Dash copiado para a área de transferência</string>
     <string name="wallet_address_dialog_fragment_hint">Para proteger a sua privacidade, seu endereço irá mudar assim que você receber um pagamento.</string>
     <string name="wallet_balance_fragment_too_much">Este valor é bastante alto para transportar no seu bolso. Por favor, envie um pouco para um lugar mais seguro.</string>
@@ -41,6 +43,8 @@
     <string name="wallet_low_storage_dialog_button_apps">Gerenciar aplicativos</string>
     <string name="wallet_timeskew_dialog_title">Verifique as configurações de data e hora</string>
     <string name="wallet_timeskew_dialog_msg">A hora do seu dispositivo está atrasada em %d minutos. Você provavelmente não poderá enviar ou receber Dash devido a este problema.\n\nVocê deveria verificar e, se necessário for, corrigir a sua data, hora e fuso horário</string>
+    <string name="wallet_coinjoin_timeskew_dialog_msg">A hora do seu dispositivo está %s em %d segundos. Você não pode usar o CoinJoin devido a essa diferença..\n\nAs configurações de hora no seu dispositivo precisam ser alteradas para \'Definir hora automaticamente\' para usar o CoinJoin.</string>
+    <string name="settings_coinjoin_timeskew_dialog_msg">A hora do seu dispositivo está com mais de 5 segundos de diferença. Você não pode usar o CoinJoin devido a essa diferença..\n\nAs configurações de hora no seu dispositivo precisam ser alteradas para \'Definir hora automaticamente\' antes de usar o CoinJoin.</string>
     <string name="send_coins_activity_title">Enviar Dash</string>
     <string name="send_coins_fragment_request_payment_request_progress">Carregando assinatura de %s…</string>
     <string name="send_coins_fragment_request_payment_request_failed_title">Erro ao carregar assinatura</string>
@@ -170,6 +174,10 @@
     <string name="transaction_row_status_masternode_revoke">Revogação de Masternode</string>
     <string name="transaction_row_status_masternode_reward">Recompensa de Masternode</string>
     <string name="transaction_row_status_mining_reward">Recompensa de Mineração</string>
+    <string name="transaction_row_status_coinjoin_mixing_fee">Taxa de mistura do CoinJoin</string>
+    <string name="transaction_row_status_coinjoin_make_collateral">Entradas de colateral do CoinJoin</string>
+    <string name="transaction_row_status_coinjoin_mixing">Mesclando CoinJoin</string>
+    <string name="transaction_row_status_coinjoin_create_denominations">Criar denominações CoinJoin</string>
     <string name="network_monitor_activity_title">Monitor de rede</string>
     <string name="network_monitor_peer_list_title">Pontos</string>
     <string name="network_monitor_block_list_title">Blocos</string>
@@ -328,6 +336,7 @@
     <string name="notification_inactivity_message">Você ainda tem Dash nesse dispositivo! Por favor escreva a sua frase de recuperação em um lugar seguro antes de desinstalar a Carteira Dash ou perderá seu saldo de %s.</string>
     <string name="notification_inactivity_action_dismiss">Me lembre depois</string>
     <string name="notification_inactivity_action_dismiss_forever">Não me lembre</string>
+    <string name="notification_bluetooth_service_listening">Pronto para receber pagamentos via Bluetooth</string>
     <string name="appwidget_wallet_balance_title">Saldo Dash</string>
 
     <!-- generic buttons -->
diff --git a/wallet/res/values-ru/strings-dashpay.xml b/wallet/res/values-ru/strings-dashpay.xml
index ed133c22e7..af280f6f9a 100644
--- a/wallet/res/values-ru/strings-dashpay.xml
+++ b/wallet/res/values-ru/strings-dashpay.xml
@@ -10,35 +10,35 @@ Dash</b></string>
     <string name="identity_username_available">Имя пользователя доступно</string>
     <string name="identity_username_taken">Имя пользователя уже занято</string>
     <string name="platform_communication_error">Ошибка связи с Dash Platform</string>
-    <string name="register">Регистрация</string>
+    <string name="register">Зарегистрироваться</string>
 
     <string name="new_account_confirm_button_text">Подтвердить и оплатить</string>
     <string name="invitation_confirm_button_text">Подтвердить</string>
     <string name="new_account_confirm_accept">Принимаю</string>
     <string name="new_account_confirm_upgrade_fee">Комиссия за обновление</string>
-    <string name="new_account_confirm_message">Вы выбрали %s в качестве Имени пользователя. Пожалуйста, обратите внимание, что имя пользователя нельзя изменить после регистрации.</string>
+    <string name="new_account_confirm_message">Вы выбрали %s в качестве имени пользователя. Обратите внимание, что имя пользователя нельзя изменить после регистрации.</string>
     <string name="invitation_confirm_title">Комиссия за приглашение</string>
     <string name="invitation_confirm_message">Каждое приглашение сопровождается этой суммой, чтобы получатель мог тут же создать своё имя пользователя в сети Dash</string>
     <string name="invitation_init_title">Пригласить</string>
-    <string name="invitation_init_header">Пригласить членов семьи и друзей</string>
+    <string name="invitation_init_header">Пригласить семью и друзей</string>
     <string name="invitation_init_message">Помогите друзьям и семье подключиться к Dash Network. Пригласите их в мир социального банкинга.</string>
-    <string name="invitation_init_button_text">Создать новое Приглашение</string>
-    <string name="invitation_notifications_hint">Пригласите друзей и членов семьи в сеть Dash.</string>
+    <string name="invitation_init_button_text">Создать новое приглашение</string>
+    <string name="invitation_notifications_hint">Пригласите друзей и семью в сеть Dash.</string>
     <string name="invitation_notifications_hint1">Пригласите кого-то присоединиться к сети Dash</string>
     <string name="invitation_notifications_hint1_or">или</string>
     <string name="invitation_created_title">Приглашение</string>
     <string name="invitation_created_successfully">Приглашение успешно создано</string>
     <string name="invitation_created_tag_title">Примечание</string>
-    <string name="invitation_created_tag">напр.: Папа</string>
+    <string name="invitation_created_tag">Например: Саша</string>
     <string name="invitation_created_preview">Предпросмотр приглашения</string>
-    <string name="invitation_created_copy_link">Скопировать ссылку-приглашение</string>
+    <string name="invitation_created_copy_link">Скопировать ссылку с приглашением</string>
     <string name="invitation_created_send_invitation">Отправить приглашение</string>
     <string name="invitation_created_send_invitation_again">Отправить ещё раз</string>
-    <string name="invitation_created_maybe_later">Может, чуть позже</string>
-    <string name="invitation_preview_title">Войти сейчас</string>
+    <string name="invitation_created_maybe_later">Позже</string>
+    <string name="invitation_preview_title">Начать</string>
     <string name="invitation_preview_message">Вас пригласил %s. Начните пользоваться криптовалютой Dash.</string>
     <string name="invitation_preview_close">Закрыть</string>
-    <string name="invitation_cant_afford_title">Недостаточно средств на балансе кошелька</string>
+    <string name="invitation_cant_afford_title">Недостаточно средств</string>
     <string name="invitation_cant_afford_message">Чтобы создать приглашение, нужно не менее %sDash.</string>
     <string name="invitation_creating_error_title">Ошибка при создании приглашения</string>
     <string name="invitation_creating_error_message">При создании приглашения возникла проблема. Пожалуйста, попробуйте ещё раз.</string>
@@ -48,35 +48,35 @@ Dash</b></string>
     <string name="invitation_share_message">Приглашение можно использовать только один раз. Не делитесь им с кем-то ещё.</string>
     <string name="invitation_share_title">Приглашение DashPay</string>
     <string name="invitation_already_claimed_title">Приглашение уже подтверждено</string>
-    <string name="invitation_already_claimed_message">Ваше приглашение от %sуже забронировано</string>
+    <string name="invitation_already_claimed_message">Ваше приглашение от %s уже было использовано</string>
     <string name="invitation_invalid_invite_title">Приглашение недействительно</string>
-    <string name="invitation_invalid_invite_message">Ваше приглашение от %sнедействительно</string>
+    <string name="invitation_invalid_invite_message">Ваше приглашение от %s недействительно</string>
     <string name="invitation_username_already_found_title">Имя пользователя уже найдено</string>
-    <string name="invitation_username_already_found_message">Нельзя откликнуться на это приглашение, потому что у вас уже есть имя пользователя Dash</string>
+    <string name="invitation_username_already_found_message">Вы не можете принять это приглашение, потому что у вас уже есть имя пользователя</string>
     <string name="invitation_onboarding_has_began_error_title">Ошибка подлючения</string>
-    <string name="invitation_onboarding_has_began_error">Идёт подключение, пожалуйста запросите приглашение после создания кошелька.</string>
-    <string name="invitation_accept_title_1">Получить имя пользователя</string>
-    <string name="invitation_accept_title_2">Добавить друзей и членов семьи</string>
-    <string name="invitation_accept_message_2">Пригласите членов семьи, найдите друзей по имени пользователя</string>
+    <string name="invitation_onboarding_has_began_error">Идёт подключение. Пожалуйста, запросите приглашение после создания кошелька.</string>
+    <string name="invitation_accept_title_1">Создайте ваше имя пользователя</string>
+    <string name="invitation_accept_title_2">Добавить друзей и семью</string>
+    <string name="invitation_accept_message_2">Пригласите семью и найдите друзей по имени пользователя</string>
     <string name="invitation_accept_title_3">Персонализировать</string>
-    <string name="invitation_accept_message_3">Загрузите своё изображение, персонализируйте свой ID</string>
+    <string name="invitation_accept_message_3">Загрузите аватар и дополнительную информацию</string>
     <string name="invitation_accept_continue">Продолжить</string>
-    <string name="invitation_contact_request_sent_message">Запрос на добавление в контакты был отправлен %s как пригласившему вас.</string>
+    <string name="invitation_contact_request_sent_message">Запрос на добавление в контакты был отправлен %s, так как вы получили приглашение от этого пользователя</string>
 
     <string name="username_being_created">Ваше Имя пользователя %s создаётся в Dash Network</string>
-    <string name="username_being_requested">Подаётся запрос на ваше Имя пользователя %s в Dash Network</string>
+    <string name="username_being_requested">Вы подали запрос на имя пользователя %s в Dash Network</string>
 
     <string name="processing_let_me_know">Уведомить, когда всё будет готово</string>
     <string name="processing_home_title">Обновление до Evolution</string>
     <string name="processing_home_step_1" tools:ignore="TypographyFractions">(1/3) Обработка платежа </string>
-    <string name="processing_home_step_2">(2/3) создание ID</string>
+    <string name="processing_home_step_2">(2/3) Создание ID</string>
     <string name="processing_home_step_2_restoring">(2/3) Восстановление ID</string>
     <string name="processing_home_step_3" tools:ignore="TypographyFractions">(3/3) Регистрация имени пользователя</string>
     <string name="processing_home_step_3_requesting" tools:ignore="TypographyFractions">(3/3) Запрос Имени пользователя</string>
     <string name="processing_home_step_3_restoring">(3/3) Восстановление Имени пользователя</string>
     <string name="processing_done_title">Привет %s,</string>
     <string name="processing_done_subtitle">Ваш аккаунт готов</string>
-    <string name="processing_voting_subtitle">Началось голосование за ваше Имя пользователя</string>
+    <string name="processing_voting_subtitle">Голосование за ваше имя пользователя началось</string>
     <string name="processing_error_title">Ошибка при обновлении</string>
     <string name="processing_error_title_from_invite">Ошибка при обновлении по приглашению</string>
     <string name="processing_error_retry">Повторить</string>
@@ -86,33 +86,33 @@ Dash</b></string>
     <string name="dashpay_upgrade_fee">Комиссия за обновление</string>
     <string name="dashpay_invite_fee">Комиссия за приглашение</string>
     <string name="dashpay_topup_fee">Комиссия за пополнение</string>
-    <string name="search_user_find_a_user">Найти пользователя в сети Dash</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>
+    <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>
     <string name="sending_contact_request_short">Приглашение</string>
-    <string name="accepting_contact_request">Принятие запроса на добавление контакта</string>
+    <string name="accepting_contact_request">Принять запрос</string>
     <string name="accepting_contact_request_short">Принятие</string>
-    <string name="search_user_no_results">Совпадений по Имени пользователя не найдено</string>
+    <string name="search_user_no_results">Совпадений по имени пользователя не найдено</string>
     <string name="search_user_loading">Поиск по Имени пользователя <b>"%"</b> в Dash Network</string>
-    <string name="contact_request_pending">Неподтверждённые запросы на добавление в контакты</string>
+    <string name="contact_request_pending">Неподтверждённые запросы</string>
     <string name="pay">Оплатить</string>
-    <string name="contact_request_received_title">%s отправил запрос на добавление в друзья</string>
+    <string name="contact_request_received_title">%s отправил запрос на добавление в контакты</string>
     <string name="contact_request_accept">Подтвердить</string>
     <string name="contact_request_ignore">Игнорировать</string>
 
     <string name="contacts_no_results">Совпадения по контактам не найдено</string>
 
     <string name="contacts_title">Контакты</string>
-    <string name="contacts_send_to_contact_title">Отправить человеку в списке контактов</string>
+    <string name="contacts_send_to_contact_title">Отправить контакту</string>
     <string name="contacts_search_for">Поиск контакта</string>
-    <string name="contact_requests_title">Запросы на добавление в контакты</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">Запросы на добавление в контакты</string>
-    <string name="contacts_contact_requests_view">посмотреть всё</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>
     <string-array name="contacts_sort">
@@ -125,31 +125,31 @@ Dash</b></string>
     <string name="notifications_new">Новые</string>
     <string name="notifications_earlier">Ранее</string>
     <string name="notifications_none_new">У вас нет новых уведомлений</string>
-    <string name="notifications_contact_has_accepted">%sпринял ваш запрос на добавление в контакты.</string>
+    <string name="notifications_contact_has_accepted">%s принял ваш запрос на добавление в контакты.</string>
     <string name="notifications_you_have_accepted">Вы приняли запрос на добавление в контакты от %s</string>
     <string name="notifications_you_sent">Вы отправили %s запрос на добавление в контакты </string>
     <string name="notifications_you_received">%s отправил вам запрос на добавление в контакты</string>
 
-    <string name="identity_complete_message">Ваше Имя пользователя %s успешно создано в Dash Network</string>
-    <string name="request_complete_message">Ваше Имя пользователя %s успешно создано в Dash Network</string>
+    <string name="identity_complete_message">Ваше имя пользователя %s успешно создано в Dash Network</string>
+    <string name="request_complete_message">Ваше имя пользователя %s успешно создано в Dash Network</string>
 
-    <string name="scan_to_pay_username_dialog_message">Некорректное Имя пользователя Dash или ID\n\n%s</string>
+    <string name="scan_to_pay_username_dialog_message">Некорректное имя пользователя Dash или ID\n\n%s</string>
     <string name="send_coins_to_username">Отправка</string>
-    <string name="contact_history_disclaimer">Добавьте % в свой список контактов, чтобы <b>переводить платежи по Имени пользователя</b> и <b>хранить историю взаимных транзакций</b></string>
-    <string name="contact_history_disclaimer_pending">Когда % примет ваш запрос, вы сможете <b>оплатить напрямую по Имени пользователя</b></string>
-    <string name="stranger_activity_disclaimer_text">Платежи напрямую по адресу будут работать как раньше. </string>
+    <string name="contact_history_disclaimer">Добавьте % в свой список контактов, чтобы <b>переводить платежи по имени пользователя</b> и <b>хранить историю взаимных транзакций</b></string>
+    <string name="contact_history_disclaimer_pending">Когда % примет ваш запрос, вы сможете <b>оплатить напрямую по имени пользователя</b></string>
+    <string name="stranger_activity_disclaimer_text">Платежи, сделанные напрямую на адреса, не будут сохраняться в активности</string>
     <string name="error_loading_identity">Ошибка при загрузке ID</string>
 
     <string name="edit_profile">Редактировать профиль</string>
-    <string name="display_name">Отображаемое имя</string>
+    <string name="display_name">Имя</string>
     <string name="about_me">Обо мне</string>
     <string name="char_count">%1$d/%2$d символов</string>
     <!-- overrides default TextInputLayout value. Do not change the name -->
     <string name="save">Сохранить</string>
     <string name="edit_profile_take_picture">Сделать фото с камеры</string>
     <string name="edit_profile_choose_picture">Выбрать из галереи</string>
-    <string name="upgrade_to_evolution_title">Войти в DashPay</string>
-    <string name="upgrade_to_evolution_message">Создайте имя пользователя, найдите членов семьи и друзей по именам пользователей и добавьте их в список контактов</string>
+    <string name="upgrade_to_evolution_title">Перейти на DashPay</string>
+    <string name="upgrade_to_evolution_message">Создайте имя пользователя и добавляйте друзей в контакты, чтобы отправлять Dash без использования адресов.</string>
     <string name="image_cropper_title">Подвигайте и увеличьте фото, чтобы подобрать идеальный вариант</string>
     <string name="select">Выбрать</string>
     <string name="unable_to_load_image">Не удалось загрузить изображение.</string>
@@ -230,8 +230,8 @@ Dash</b></string>
     <string name="invitations_filter_title">Сортировать приглашения</string>
     <string name="invite_history_empty">Не создано ни одного приглашения.</string>
     <string name="invite_history_empty_claimed">У вас нет принятых приглашений.</string>
-    <string name="invite_history_empty_pending">У вас нет приглашений, ожидающих решения.</string>
-    <string name="invitation_details_invite_used_by">Приглашением воспользовался</string>
+    <string name="invite_history_empty_pending">У вас нет активных приглашений</string>
+    <string name="invitation_details_invite_used_by">Приглашением воспользовались</string>
     <string name="invitation_details_invite_without_username">Приглашение принято. Идёт регистрация пользователя.</string>
     <string-array name="invite_filter">
         <item>Все</item>
@@ -245,14 +245,14 @@ Dash</b></string>
     <string name="edit_note">Редактировать заметку</string>
     <string name="note">Заметка</string>
 
-    <string name="select_privacy_preferences">Выбрать настройки безопасности для вашего Имени пользователя</string>
-    <string name="please_note_cant_change_this_later">Обратите внимание, что вы не сможете изменить их позднее</string>
+    <string name="select_privacy_preferences">Выберите уровень безопасности для вашего имени пользователя</string>
+    <string name="please_note_cant_change_this_later">Обратите внимание, что вы не сможете изменить их позже</string>
     <string name="Intermediate_level_WIFI_Warning">Для среднего уровня приватности необходимо надёжное подключение к интернету</string>
     <string name="Advanced_level_WIFI_Warning">Для высокого уровня приватности необходимо надёжное подключение к интернету</string>
     <string name="privcay_level_WIFI_warning_desc">Во избежание потери средств, рекомендуется пользоваться Wi-Fi сетью</string>
-    <string name="continue_anyway">Всё равно продолжить</string>
+    <string name="continue_anyway">Продолжить</string>
     <string name="welcome_to_dash_pay">Добро пожаловать в Dash Pay</string>
-    <string name="pay_to_usernames">Переводите оплату по имени пользователя. Больше никаких буквенно-цифровых адресов. </string>
+    <string name="pay_to_usernames">Платите по имени пользователя. Больше никаких буквенно-цифровых адресов. </string>
     <string name="create_a_username">Создать имя пользователя</string>
     <string name="add_your_friends_family">Добавьте друзей и семью</string>
     <string name="invite_your_family">Пригласите семью и найдите друзей по имени пользователя</string>
@@ -262,16 +262,19 @@ Dash</b></string>
     <string name="keep_your_passphrase_safe">Храните кодовую фразу в надёжном месте</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="dash_network_must_vote_to_approve">Чтобы создать имя пользователя, сеть Dash должна перед этим проголосовать и одобрить его</string>
+    <string name="voting_requirement_subtitle">Автоматически одобряются те имена пользователей, где есть число от 2-9, а длина больше 20 символов</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">Если существенная часть сети сочтёт Имя пользователя неподходящим, его могут заблокировать</string>
-    <string name="username_voting">Голосование за Имя пользователя</string>
-    <string name="username_voting_subtitle">Будучи владельцем мастерноды, вы можете голосовать за одобрение запрошенных имён пользователей до того, как пользователи смогут их создать.</string>
+    <string name="usernames_blocked_subtitle">Если значительная часть сети Dash сочтёт имя пользователя неподходящим, его могут заблокировать.</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>
-    <string name="n_usernames">%d Имён пользователей</string>
+    <string name="n_usernames">%d имён пользователей</string>
     <string name="n_requests">%d запросов</string>
     <string name="search_by_username">Поиск по имени пользователя</string>
     <string name="type">Тип</string>
@@ -290,65 +293,103 @@ Dash</b></string>
 
     <string-array name="usernames_type_options">
         <item>Все</item>
-        <item>Одобряю</item>
-        <item>Не одобряю</item>
+        <item>Одобрено мной</item>
+        <item>Не одобрено мной</item>
+        <item>Есть заблокированные голоса</item>
     </string-array>
-
-    <string name="request_your_username">Создать Имя пользователя</string>
+    <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>
-    <string name="request_username">Запросить Имя пользователя</string>
-    <string name="request_voting_range">Сеть Dash проведёт голосование за это Имя пользователя. Мы пришлём уведомление о результатах по %s.</string>
+    <string name="request_username">Запросить имя пользователя</string>
+    <string name="request_voting_range">Сеть Dash проведёт голосование за это имя пользователя. Мы пришлём уведомление о результатах по %s.</string>
     <string name="request_username_available">Имя пользователя недоступно</string>
     <string name="request_username_unavailable">Имя пользователя недоступно или заблокировано</string>
     <string name="request_username_taken">Имя пользователя уже занято</string>
-    <string name="requesting_your_username_title">Создание Имени пользователя</string>
-    <string name="requesting_your_username_error_title">Запрос на Имя пользователя не выполнен</string>
+    <string name="request_username_taken_results">Имя пользователя уже занято</string>
+    <string name="requesting_your_username_title">Создание имени пользователя</string>
+    <string name="requesting_your_username_message">Подаётся запрос на ваше имя пользователя %s в сети Dash. Это может занять какое-то время.</string>
+    <string name="creating_your_username_message">Ваше имя пользователя %s создаётся в Dash Network. Это может занять какое-то время.</string>
+    <string name="requesting_your_username_error_title">Запрос на имя пользователя не выполнен</string>
+    <string name="requesting_your_username_error_message">По какой-то причине запрос на имя пользователя %s не прошёл. Пожалуйста, попробуйте снова.</string>
     <string name="voting">Голосуют:</string>
-    <string name="this_username_has_already_been_requested">На это имя пользователя уже поступил запрос, но вы тоже можете его запросить и дать сети решить, кому его отдать</string>
+    <string name="this_username_has_already_been_requested">Это имя пользователя уже запрошено, но вы также можете подать запрос и позволить сети решить, кому его назначить.</string>
     <string name="request_details">Узнать подробности</string>
     <string name="request_details_subtitle">Изучите сообщение ниже, чтобы подтвердить владение этим именем пользователя</string>
-    <string name="vote_to_approve">Голосовать \"За\"</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>
     <string name="link_not_provided">Не предусмотрен</string>
-    <string name="cancel_approval">Отозвать голос \"За\"</string>
+    <string name="cancel_approval">Отозвать одобрение</string>
     <string name="verify_your_identity">Чтобы повысить шансы на получение имени пользователя, подтвердите свою личность</string>
-    <string name="if_somebody">Если кто-то запросит такое же имя пользователя, то сеть решит, кому его отдать. </string>
+    <string name="if_somebody">Если кто-то запросит то же имя пользователя, сеть решит, кому его назначить.</string>
     <string name="the_link_will_be_visible">Отправленную ссылку увидят только владельцы сети</string>
     <string name="verify_your_identity_voting">Подтвердите свою личность</string>
     <string name="copy_the_text">Скопировать текст</string>
-    <string name="please_vote_to_approve">Пожалуйста, проголосуйте за утверждение моего запроса на имя пользователя Dash - %s</string>
+    <string name="please_vote_to_approve">Пожалуйста, проголосуйте за одобрение моего запроса на имя пользователя в сети Dash – %s</string>
     <string name="prove_your_identity">Подтвердите вашу личность</string>
-    <string name="make_a_post_with_the_text">Опубликуйте сообщение с таким же текстом как в примере выше в известной соцсети или мессенджере, чтобы подтвердить, что вы действительно являетесь владельцем запрошенного имени пользователя, и вставьте ссылку на этот пост в поле ниже</string>
+    <string name="make_a_post_with_the_text">Опубликуйте сообщение с таким же текстом, как в примере выше, в известной социальной сети или мессенджере, чтобы подтвердить, что вы действительно являетесь владельцем запрашиваемого имени пользователя. Вставьте ссылку на этот пост в поле ниже.</string>
     <string name="paste_the_link">Вставьте ссылку</string>
     <string name="voting_key_title">Введите ключ для голосования</string>
-    <string name="voting_key_hint">Ключ для голосования мастерноды</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="quick_vote_subtitle">Нажав кнопку \"Голосовать за все\" вы автоматически проголосуете за все отфильтрованные имена пользователей (%d), которые были поданы первыми</string>
     <string name="vote_for_all">Голосовать за все</string>
-    <string name="voting_period_active">Идёт активное голосование за Имя пользователя</string>
+    <string name="voting_period_active">Идёт активное голосование за имя пользователя</string>
     <string name="there_was_a_network_error">Произошла ошибка сети, можете сделать ещё одну попытку без дополнительной платы</string>
-    <string name="requested_username_has_been">Запрос на Имя пользователя отправлен.</string>
+    <string name="requested_username_has_been">Запрос на имя пользователя отправлен.</string>
     <string name="requested_voting_duration">Результаты по %s.</string>
-    <string name="cancel_request">Отменить Запрос</string>
+    <string name="cancel_request">Отменить запрос</string>
     <string name="after_the_voting">Когда голосование закончится, вы получите уведомление о его результатах</string>
-    <string name="none">Отсутствует</string>
+    <string name="none">Не указана</string>
     <string name="verify_now">Подтвердить сейчас</string>
-    <string name="if_you_tap_cancel">Если вы нажмёте \"Отменить Запрос\", то у вас останется возможность запросить другое имя пользователя без взноса</string>
+    <string name="if_you_tap_cancel">Если вы нажмёте \"Отменить Запрос\", то у вас останется возможность запросить другое имя пользователя без повторной оплаты</string>
     <string name="do_you_really_want_to_cancel">Вы действительно хотите отменить запрос на имя пользователя\?</string>
-    <string name="if_you_tap_cancel_request">Если вы нажмёте \"Отменить Запрос\", то у вас останется возможность запросить другое имя пользователя без взноса</string>
+    <string name="if_you_tap_cancel_request">Если вы нажмёте \"Отменить запрос\", то у вас останется возможность запросить другое имя пользователя без повторной оплаты</string>
     <string name="cant_open">Не могу открыть</string>
     <string name="invalid_link">Недействительная ссылка</string>
-    <string name="welcome_request_username_min_balance_disclaimer_all">У вас есть %s Dash. Некоторые Имена пользователя могут стоит до %s Dash.</string>
+    <string name="welcome_request_username_min_balance_disclaimer_all">У вас есть %s Dash. Некоторые имена пользователя могут стоит до %s Dash.</string>
     <string name="welcome_request_username_min_balance_disclaimer_noncontested">Чтобы создать имя пользователя, у вас должно быть больше чем %s Dash</string>
     <string name="request_username_min_balance_disclaimer">Чтобы запросить имя пользователя в  Dash Network, вам нужно больше чем %s Dash</string>
 
@@ -387,15 +428,25 @@ Dash</b></string>
     <string name="credit_balance_low_warning_title">Баланс кредитов полностью исчерпан</string>
     <string name="credit_balance_empty_warning_message">Вы можете и дальше пользоваться DashPay для платежей, но вам недоступно обновление профиля или добавление новых контактов до тех пор, пока вы не пополните баланс кредитов</string>
     <string name="credit_balance_low_warning_message">Пополните баланс кредитов, чтобы вносить изменения в профиль и добавлять контакты</string>
-    <string name="credit_balance_button_maybe_later">Может, чуть позже</string>
+    <string name="credit_balance_button_maybe_later">Может позже</string>
     <string name="credit_balance_button_buy">Купить кредиты</string>
     <string name="credit_balance_insufficient_error_message">Недостаточно средств для покупки кредитов</string>
     <string name="buy_credits_estimated_items">%s - %d контактов / %d обновлений профиля</string>
 
-    <string name="request_username_username_voting_message">+ что такое голосование за Имя пользователя\?</string>
+    <string name="request_username_username_voting_message">+ что такое голосование за имя пользователя\?</string>
     <string name="request_username_character_requirement">Только буквы, цифры и дефисы</string>
-    <string name="request_username_balance_requirement">Чтобы создать это Имя пользователя, необходимо 0.25 DASH</string>
+    <string name="request_username_balance_requirement">Чтобы создать это имя пользователя, у вас должно быть 0.25 DASH</string>
     <string name="request_username_length_requirement">От 3 до 23 символов</string>
     <string name="request_username_confirm">Принимаю</string>
-
-</resources>
+    <string name="username_vote_one_left_message">Вы уже проголосовали за это имя пользователя %d раз(а). За него можно проголосовать ещё один раз. </string>
+    <string name="username_vote_one_left">Остался один голос</string>
+    <string name="username_vote_none_left_message">Вы уже проголосовали за это имя пользователя %d раз(а). Вы больше не можете за него голосовать.</string>
+    <string name="username_vote_none_left">Голосов больше нет</string>
+    <string name="request_username_blocked">Запрошенное имя пользователя было заблокировано</string>
+    <string name="request_username_lost_vote">Запрошенное имя пользователя было отдано кому-то другому</string>
+    <string name="request_username_blocked_message">Имя пользователя %s было заблокировано Dash Network. Пожалуйста, попробуйте запросить другое имя пользователя.</string>
+    <string name="request_username_lost_vote_message">Во время процесса голосования Dash Network решила дать имя пользователя %s кому-то другому. Пожалуйста, запросите другое имя пользователя.</string>
+    <string name="mix_dash_mix">Перемешать баланс</string>
+    <string name="mix_dash_title">Перемешайте свои Dash</string>
+    <string name="mix_dash_message">Чтобы никто не смог узнать, кому вы отправляете платежи, рекомендуется перемешать баланс до создания имени пользователя.</string>
+    </resources>
diff --git a/wallet/res/values-ru/strings-extra.xml b/wallet/res/values-ru/strings-extra.xml
index 8ada92df5b..7cdc50418a 100644
--- a/wallet/res/values-ru/strings-extra.xml
+++ b/wallet/res/values-ru/strings-extra.xml
@@ -25,6 +25,8 @@
     <string name="dialog_confirm_secured_by">Защищено</string>
     <string name="dialog_confirm_fee">Комиссия сети</string>
     <string name="dialog_confirm_total">Итого</string>
+    <string name="dialog_confirm_accept_contact_request">Принять запрос на добавление в контакты</string>
+
     <string name="shortcut_action_join_dashpay">Войти в DashPay</string>
     <!-- Home Screen: Shortcut Button: 2 lines, 9 characters across -->
     <string name="shortcut_secure_now">Сохранить</string>
@@ -194,6 +196,9 @@
     <string name="notification_settings_title">Уведомления</string>
     <string name="notification_explainer_title">Dash Wallet хочет отправлять вам уведомления</string>
     <string name="notification_explainer_message">В уведомлениях могут быть оповещения, звуки или иконки. Их можно настроить в Настройках телефона.</string>
+    <string name="notification_dashpay_channel_name">DashPay</string>
+    <string name="notification_dashpay_channel_description">Статус текущих операций DashPay.</string>
+
     <string name="net_type_indicator" />
 
     <string name="unlock_with_fingerprint">Используйте свой отпечаток пальца, чтобы разблокировать.</string>
@@ -246,6 +251,7 @@
     <string name="transaction_close">Закрыть</string>
     <string name="transaction_details_amount_received">Полученная сумма</string>
     <string name="transaction_details_amount_sent">Отправленная сумма</string>
+    <string name="transaction_details_amount_sent_successfully">Успешно отправлено</string>
     <string name="transaction_details_sent_from">Отправлено с</string>
     <string name="transaction_details_sent_to">Отправлено</string>
     <string name="transaction_details_received_at">Получено на</string>
@@ -264,6 +270,7 @@
     <string name="authenticate_switch_to_pin">Используйте PIN-код</string>
 
     <string name="menu_invite_title">Пригласить</string>
+    <string name="menu_invite_subtitle">Помогите друзьям и семье присоединиться к Dash</string>
     <string name="menu_buy_and_sell_title">Купить &amp; Продать Dash</string>
     <string name="menu_buy_and_sell_subtitle">Подключиться к сторонним биржам</string>
     <string name="liquid_unavailable">Интеграция Liquid с Dash Wallet больше не доступна</string>
@@ -375,16 +382,28 @@
     <string name="import_image_invalid_private">Неверный приватный ключ</string>
     <string name="okay">Да</string>
 
+    <string name="onboard_from_invite_title">Давайте начнём</string>
     <string name="onboard_from_invite_subtitle">Добро пожаловать в DashPay</string>
+    <string name="onboard_from_invite_step1">Шаг 1</string>
+    <string name="onboard_from_invite_step2">Шаг 2</string>
+    <string name="onboard_from_invite_step3">Шаг 3</string>
     <string name="onboard_from_invite_step1_title">Выберите имя пользователя</string>
     <string name="onboard_from_invite_step2_title">Установите PIN</string>
     <string name="onboard_from_invite_step3_title">Сохранить кошелёк</string>
 
     <string name="restore_wallet_please_wait">Пожалуйста, подождите</string>
+    <string name="restore_wallet_restoring">Ваш кошелёк был восстановлен</string>
+
+
+
     <string name="network_unavailable">Сеть недоступна</string>
     <string name="network_error_contact_details">Не удалось получить контактные данные</string>
     <string name="network_error_user_search">Не удалось найти пользователя</string>
     <string name="network_error_contact_suggestions">Не удалось представить рекомендации</string>
+    <string name="network_error_unable_to_update_profile">Невозможно обновить профиль</string>
+
+
+
     <string name="today">Сегодня</string>
     <string name="yesterday">Вчера</string>
 
@@ -394,6 +413,8 @@
     <string name="all_transactions">Все</string>
     <string name="received_transactions">Получено</string>
     <string name="sent_transactions">Отправлено</string>
+    <string name="serious_error_title">Серьёзная ошибка</string>
+    <string name="serious_error_unknown">Пожалуйста, свяжитесь с поддержкой.</string>
     <string name="set_pin_error_missing_wallet_title">Ошибка: отсутствует кошелёк</string>
     <string name="set_pin_error_missing_wallet_message">Кошелёк отсутствует. Пожалуйста, обратитесь в Службу поддержки.</string>
     <string name="wallet_encryption_error_title">Ошибка при создании кошелька</string>
@@ -443,6 +464,9 @@
     <string name="masternode_key_not_used">не использован</string>
     <string name="masternode_key_revoked">Аннулирован</string>
     <string name="masternode_key_private_public_base64">Приватные / Публичные ключи (base64)</string>
+    <string name="timeskew_ahead">спешит</string>
+    <string name="timeskew_behind">отстаёт</string>
+
     <!-- stale rates messages -->
     <string name="stale_exchange_rates_error">Данные о курсе не были получены. Курс валют может быть неточным.</string>
     <string name="stale_exchange_rates_stale">Данные о курсе были получены не менее 30 минут назад. Курс валют может быть неточным.</string>
diff --git a/wallet/res/values-ru/strings.xml b/wallet/res/values-ru/strings.xml
index 7b7b0dea74..d6f72afd9d 100644
--- a/wallet/res/values-ru/strings.xml
+++ b/wallet/res/values-ru/strings.xml
@@ -9,9 +9,11 @@
     <string name="blockchain_state_progress_days">%1$s, %2$d дней отставания</string>
     <string name="blockchain_state_progress_weeks">%1$s, %2$d недель отставания</string>
     <string name="blockchain_state_progress_months">%1$s, %2$d месяцев отставания</string>
+    <string name="blockchain_state_progress_downloading">Синхронизация с сетью (%1$s%%)</string>
     <string name="blockchain_state_progress_stalled">Синхронизация зависла</string>
     <string name="blockchain_state_progress_problem_storage">Синхронизация: проблема со свободным местом</string>
     <string name="blockchain_state_progress_problem_network">Синхронизация: проблема с сетью</string>
+    <string name="mixing_state_progress_mixing">Перемешивание средств (%1$s %%)</string>
     <string name="wallet_address_fragment_clipboard_msg">Адрес скопирован в буфер обмена</string>
     <string name="wallet_address_dialog_fragment_hint">Для защиты Вашей конфиденциальности Ваш адрес будет меняться каждый раз при получении средств.</string>
     <string name="wallet_balance_fragment_too_much">Сумма монет довольно существенная для карманного бумажника. Пожалуйста, перенесите её часть в более безопасное место.</string>
@@ -41,6 +43,8 @@
     <string name="wallet_low_storage_dialog_button_apps">Управлять приложениями</string>
     <string name="wallet_timeskew_dialog_title">Проверьте настройки даты и времени</string>
     <string name="wallet_timeskew_dialog_msg">Время на Вашем устройстве отличается на %d минут. По этой причине Вы, возможно, не сможете отправлять или получать средства.\\n\\nПроверьте настройки и при необходимости скорректируйте дату, время и часовой пояс.</string>
+    <string name="wallet_coinjoin_timeskew_dialog_msg">Время на вашем устройстве %s на %d секунды. Поэтому вы не можете использовать CoinJoin.\n\nЧтобы воспользоваться CoinJoin, выставьте в настройках своего устройства \"Задать время автоматически\". </string>
+    <string name="settings_coinjoin_timeskew_dialog_msg">Время на вашем устройстве отличается более чем на 5 секунд. Поэтому вы не можете использовать CoinJoin.\n\nЧтобы воспользоваться CoinJoin, выставьте в настройках своего устройства \"Задать время автоматически\". </string>
     <string name="send_coins_activity_title">Отправить Dash</string>
     <string name="send_coins_fragment_request_payment_request_progress">Получение подписи %s…</string>
     <string name="send_coins_fragment_request_payment_request_failed_title">Ошибка при получении подписи</string>
@@ -170,6 +174,10 @@
     <string name="transaction_row_status_masternode_revoke">Отключение мастерноды</string>
     <string name="transaction_row_status_masternode_reward">Вознаграждение мастерноды</string>
     <string name="transaction_row_status_mining_reward">Вознаграждение за майнинг</string>
+    <string name="transaction_row_status_coinjoin_mixing_fee">Комиссия за перемешивание CoinJoin</string>
+    <string name="transaction_row_status_coinjoin_make_collateral">Залоговое обеспечение CoinJoin</string>
+    <string name="transaction_row_status_coinjoin_mixing">Перемешивание CoinJoin</string>
+    <string name="transaction_row_status_coinjoin_create_denominations">Создать деноминации CoinJoin</string>
     <string name="network_monitor_activity_title">Сетевой монитор</string>
     <string name="network_monitor_peer_list_title">Узлы</string>
     <string name="network_monitor_block_list_title">Блоки</string>
@@ -328,6 +336,7 @@
     <string name="notification_inactivity_message">На этом устройстве всё ещё установлен кошелёк Dash! Пожалуйста, убедитесь, что Вы переписали Вашу фразу восстановления, прежде чем удалите кошелёк Dash, иначе Вы потеряете все Ваши средства в размере %s.</string>
     <string name="notification_inactivity_action_dismiss">Напомнить мне позже</string>
     <string name="notification_inactivity_action_dismiss_forever">Не напоминать мне</string>
+    <string name="notification_bluetooth_service_listening">Готов к получению платежей через Bluetooth</string>
     <string name="appwidget_wallet_balance_title">Баланс</string>
 
     <!-- generic buttons -->
diff --git a/wallet/res/values-sk/strings-dashpay.xml b/wallet/res/values-sk/strings-dashpay.xml
index 4e0fe49350..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>
@@ -262,14 +261,15 @@ používateľské meno</b></string>
     <string name="keep_your_passphrase_safe">Udržujte svoju prístupovú frázu v bezpečí</string>
     <string name="pay_now">Zaplaťte teraz a v prípade neschválenia si môžete vytvoriť iné meno bez toho, aby ste museli platiť znova</string>
     <string name="case_your_request_is_not_approved">V prípade, že vaša žiadosť nebude schválená</string>
-    <string name="voting_requirement_subtitle">Každé používateľské meno, ktoré má číslo 2 až 9 alebo je dlhšie ako 20 znakov, bude automaticky schválené</string>
+    <string name="voting_requirement_subtitle">Každé používateľské meno, ktoré má číslo 2–9, prípadne 20 alebo viac znakov, bude automaticky schválené</string>
     <string name="voting_requirement_title">Hlasovanie je potrebné len v niektorých prípadoch</string>
     <string name="dash_network_must_vote_to_approve">Sieť Dash musí hlasovať, aby schválila vaše používateľské meno pred jeho vytvorením.</string>
     <string name="what_is_username_voting">Čo je to hlasovanie o používateľské mená\?</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 hlasovať za schválenie požadovaných používateľských mien predtým, ako ich používatelia budú môcť vytvoriť.</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>
     <string name="n_usernames">%d používateľských mien</string>
     <string name="n_requests">%d žiadostí</string>
@@ -292,8 +292,9 @@ používateľské meno</b></string>
         <item>Všetko</item>
         <item>Schválil som</item>
         <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>
     <string name="request_username">Požiadať o používateľské meno</string>
@@ -301,8 +302,12 @@ používateľské meno</b></string>
     <string name="request_username_available">Používateľské meno je k dispozícii</string>
     <string name="request_username_unavailable">Používateľské meno je nedostupné alebo zablokované</string>
     <string name="request_username_taken">Používateľské meno sa už používa</string>
+    <string name="request_username_taken_results">Používateľské meno prevzal iný používateľ</string>
     <string name="requesting_your_username_title">Vytvorenie vášho používateľského mena</string>
+    <string name="requesting_your_username_message">O vaše používateľské meno %s je požiadané v sieti Dash. Môže to chvíľu trvať.</string>
+    <string name="creating_your_username_message">Vaše používateľské meno %s sa vytvára v sieti Dash. Môže to chvíľu trvať.</string>
     <string name="requesting_your_username_error_title">Žiadosť o používateľské meno zlyhala</string>
+    <string name="requesting_your_username_error_message">Z nejakého dôvodu zlyhala žiadosť o používateľské meno %s.</string>
     <string name="voting">Hlasovanie:</string>
     <string name="this_username_has_already_been_requested">Toto používateľské meno už bolo vyžiadané, ale môžete si ho vyžiadať aj vy a nechať hlasovanie siete, aby rozhodla, či ho môžete mať</string>
     <string name="request_details">Vyžiadať podrobnosti</string>
@@ -323,15 +328,14 @@ používateľské meno</b></string>
     <string name="make_a_post_with_the_text">Uverejnite príspevok s vyššie uvedeným textom na dobre známej sociálnej sieti alebo platforme na odosielanie správ,  pre overenie, že ste pôvodným vlastníkom požadovaného používateľského mena, a pridajte odkaz nižšie</string>
     <string name="paste_the_link">Vložte odkaz</string>
     <string name="voting_key_title">Zadajte svoj hlasovací kľúč</string>
-    <string name="voting_key_hint">Hlasovacie kľúče Masternode</string>
+    <string name="voting_key_hint">Súkromný kľúč hlasovania Masternode</string>
     <string name="voting_key_input_error">Zadali ste neplatný kľúč</string>
+    <string name="voting_key_input_not_active_error">Zadali ste kľúč, ktorý nie je priradený k aktívnemu Masternode</string>
     <string name="voting_key_add">Pridajte svoje hlasovacie kľúče</string>
     <string name="voting_key_add_subtitle">IP adresa(y) nižšie sú spojené s touto peňaženkou</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>
@@ -397,4 +401,15 @@ používateľské meno</b></string>
     <string name="request_username_balance_requirement">Na vytvorenie tohto používateľského mena potrebujete mať 0,25 DASH</string>
     <string name="request_username_length_requirement">Medzi 3 a 23 znakmi</string>
     <string name="request_username_confirm">Prijímam</string>
+    <string name="username_vote_one_left_message">Za toto používateľské meno ste už hlasovali %d krát. Pre toto používateľské meno môžete odovzdať už len jeden hlas.</string>
+    <string name="username_vote_one_left">Zostáva jeden hlas</string>
+    <string name="username_vote_none_left_message">Za toto používateľské meno ste už hlasovali %d krát. Pre toto používateľské meno už nemôžete hlasovať.</string>
+    <string name="username_vote_none_left">Nezostávajú žiadne hlasy</string>
+    <string name="request_username_blocked">Požadované používateľské meno bolo zablokované</string>
+    <string name="request_username_lost_vote">Požadované používateľské meno bolo pridelené niekomu inému</string>
+    <string name="request_username_blocked_message">Používateľské meno %s bolo zablokované sieťou Dash Network. Skúste to znova a požiadajte o iné používateľské meno.</string>
+    <string name="request_username_lost_vote_message">Kvôli procesu hlasovania sa Dash Network rozhodla prideliť používateľské meno %s niekomu inému. Skúste to znova a požiadajte o iné používateľské meno.</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>
diff --git a/wallet/res/values-sk/strings-extra.xml b/wallet/res/values-sk/strings-extra.xml
index c9ffa39ee5..47a6847c06 100644
--- a/wallet/res/values-sk/strings-extra.xml
+++ b/wallet/res/values-sk/strings-extra.xml
@@ -25,6 +25,8 @@
     <string name="dialog_confirm_secured_by">Zabezpečené s</string>
     <string name="dialog_confirm_fee">Sieťový poplatok </string>
     <string name="dialog_confirm_total">Celkovo</string>
+    <string name="dialog_confirm_accept_contact_request">Prijať žiadosť o kontakt</string>
+
     <string name="shortcut_action_join_dashpay">Pridať sa k DashPay</string>
     <!-- Home Screen: Shortcut Button: 2 lines, 9 characters across -->
     <string name="shortcut_secure_now">Záloha</string>
@@ -194,6 +196,9 @@
     <string name="notification_settings_title">Oznámenia</string>
     <string name="notification_explainer_title">Dash Wallet vám chce posielať upozornenia</string>
     <string name="notification_explainer_message">Upozornenia môžu zahŕňať upozornenia, zvuky a odznaky ikon. Môžete ich nakonfigurovať v nastaveniach telefónu.</string>
+    <string name="notification_dashpay_channel_name">DashPay</string>
+    <string name="notification_dashpay_channel_description">Stav prebiehajúcich operácií DashPay.</string>
+
     <string name="net_type_indicator" />
 
     <string name="unlock_with_fingerprint">Pre odomknutie použite otlačok prsta.</string>
@@ -246,6 +251,7 @@
     <string name="transaction_close">Zatvoriť</string>
     <string name="transaction_details_amount_received">Prijatá suma</string>
     <string name="transaction_details_amount_sent">Odoslaná suma</string>
+    <string name="transaction_details_amount_sent_successfully">Úspešne poslané</string>
     <string name="transaction_details_sent_from">Poslané z</string>
     <string name="transaction_details_sent_to">Poslané na</string>
     <string name="transaction_details_received_at">Prijaté z</string>
@@ -264,6 +270,7 @@
     <string name="authenticate_switch_to_pin">Použiť PIN</string>
 
     <string name="menu_invite_title">Pozvať</string>
+    <string name="menu_invite_subtitle">Pomôžte svojim priateľom a rodine sa pripojiť k Dashu</string>
     <string name="menu_buy_and_sell_title">Kúpiť a predať Dash</string>
     <string name="menu_buy_and_sell_subtitle">Spojiť s burzami tretích strán</string>
     <string name="liquid_unavailable">Liquid integrácia s Dash peňaženkou už nie je k dispozícii</string>
@@ -375,16 +382,28 @@
     <string name="import_image_invalid_private">Neplatný privátny kľúč</string>
     <string name="okay">Dobre</string>
 
+    <string name="onboard_from_invite_title">Poďme začať</string>
     <string name="onboard_from_invite_subtitle">Vitajte v DashPay</string>
+    <string name="onboard_from_invite_step1">Krok 1</string>
+    <string name="onboard_from_invite_step2">Krok 2</string>
+    <string name="onboard_from_invite_step3">Krok 3</string>
     <string name="onboard_from_invite_step1_title">Zvoľte si používateľské meno</string>
     <string name="onboard_from_invite_step2_title">Nastavte si PIN</string>
     <string name="onboard_from_invite_step3_title">Zabezpečte svoju peňaženku</string>
 
     <string name="restore_wallet_please_wait">Prosím čakajte</string>
+    <string name="restore_wallet_restoring">Vaša peňaženka sa obnovuje</string>
+
+
+
     <string name="network_unavailable">Sieť nedostupná</string>
     <string name="network_error_contact_details">Nepodarilo sa načítať kontaktné údaje</string>
     <string name="network_error_user_search">Používateľa sa nepodarilo vyhľadať</string>
     <string name="network_error_contact_suggestions">Nie je možné poskytnúť návrhy</string>
+    <string name="network_error_unable_to_update_profile">Váš profil nie je možné aktualizovať</string>
+
+
+
     <string name="today">Dnes</string>
     <string name="yesterday">Včera</string>
 
@@ -394,6 +413,8 @@
     <string name="all_transactions">Všetko</string>
     <string name="received_transactions">Prijaté</string>
     <string name="sent_transactions">Poslané</string>
+    <string name="serious_error_title">Závažná chyba</string>
+    <string name="serious_error_unknown">Kontaktujte podporu.</string>
     <string name="set_pin_error_missing_wallet_title">Chýbajúca peňaženka</string>
     <string name="set_pin_error_missing_wallet_message">Chýbajúca peňaženka. Nahláste to prosím oddeleniu podpory.</string>
     <string name="wallet_encryption_error_title">Chyba pri vytváraní peňaženky</string>
@@ -443,6 +464,9 @@
     <string name="masternode_key_not_used">Nepoužité</string>
     <string name="masternode_key_revoked">Zrušený</string>
     <string name="masternode_key_private_public_base64">Súkromné / Verejné kľúče (base64)</string>
+    <string name="timeskew_ahead">popredu</string>
+    <string name="timeskew_behind">pozadu</string>
+
     <!-- stale rates messages -->
     <string name="stale_exchange_rates_error">Nepodarilo sa získať ceny. Hotovostné ceny môžu byť nesprávne.</string>
     <string name="stale_exchange_rates_stale">Ceny sú staré minimálne 30 minút. Hotovostné ceny môžu byť nesprávne.</string>
diff --git a/wallet/res/values-sk/strings.xml b/wallet/res/values-sk/strings.xml
index a7ea294511..d18032b709 100644
--- a/wallet/res/values-sk/strings.xml
+++ b/wallet/res/values-sk/strings.xml
@@ -9,9 +9,11 @@
     <string name="blockchain_state_progress_days">%1$s, pozadu %2$d dní</string>
     <string name="blockchain_state_progress_weeks">%1$s, pozadu %2$d týždňov</string>
     <string name="blockchain_state_progress_months">%1$s, pozadu %2$d mesiacov</string>
+    <string name="blockchain_state_progress_downloading">Synchronizácia so sieťou (%1$s%%)</string>
     <string name="blockchain_state_progress_stalled">Synchronizácia pozastavená</string>
     <string name="blockchain_state_progress_problem_storage">Synchronizácia: Problém s dátovým úložiskom</string>
     <string name="blockchain_state_progress_problem_network">Synchronizácia: Problém so sieťou</string>
+    <string name="mixing_state_progress_mixing">Miešanie mincí (%1$s%%)</string>
     <string name="wallet_address_fragment_clipboard_msg">Dash adresa skopírovaná do schránky</string>
     <string name="wallet_address_dialog_fragment_hint">Pre ochranu súkromia sa vaša adresa zmení vždy po prijatí platby.</string>
     <string name="wallet_balance_fragment_too_much">Tato čiastka je pomerne vysoká na nosenie vo vrecku. Presuňte nejakú čiastku na bezpečnejšie miesto.</string>
@@ -41,6 +43,8 @@
     <string name="wallet_low_storage_dialog_button_apps">Spravovať aplikácie</string>
     <string name="wallet_timeskew_dialog_title">Kontrola nastavenia času a dátumu</string>
     <string name="wallet_timeskew_dialog_msg">Čas na vašom zariadené je posunutý o %d minút. Kvôli tomuto problému pravdepodobne nemôžete odosielať alebo prijímať Dash.\n\nMali by ste skontrolovať a v prípade potreby opraviť dátum, čas a časové pásmo.</string>
+    <string name="wallet_coinjoin_timeskew_dialog_msg">Čas vášho zariadenia je %s po %d sekundách. Kvôli tomuto rozdielu nemôžete používať CoinJoin.\n\nAby ste mohli používať CoinJoin, nastavenia času na vašom zariadení je potrebné zmeniť na „Nastaviť čas automaticky“.</string>
+    <string name="settings_coinjoin_timeskew_dialog_msg">Čas vášho zariadenia je posunutý o viac ako 5 sekúnd. Kvôli tomuto rozdielu nemôžete používať CoinJoin.\n\nPred použitím CoinJoin je potrebné zmeniť nastavenia času na vašom zariadení na „Nastaviť čas automaticky“.</string>
     <string name="send_coins_activity_title">Poslať Dash</string>
     <string name="send_coins_fragment_request_payment_request_progress">Získavanie podpisu z %s...</string>
     <string name="send_coins_fragment_request_payment_request_failed_title">Získavanie podpisu zlyhalo</string>
@@ -170,6 +174,10 @@
     <string name="transaction_row_status_masternode_revoke">Masternód odvolaný</string>
     <string name="transaction_row_status_masternode_reward">Masternód odmena</string>
     <string name="transaction_row_status_mining_reward">Odmena za ťažbu</string>
+    <string name="transaction_row_status_coinjoin_mixing_fee">Poplatok za miešanie CoinJoin</string>
+    <string name="transaction_row_status_coinjoin_make_collateral">Kolaterálne vstupy Coinjoin</string>
+    <string name="transaction_row_status_coinjoin_mixing">Miešanie CoinJoin</string>
+    <string name="transaction_row_status_coinjoin_create_denominations">Vytvorené denominácie CoinJoin</string>
     <string name="network_monitor_activity_title">Stav siete</string>
     <string name="network_monitor_peer_list_title">Uzly</string>
     <string name="network_monitor_block_list_title">Bloky</string>
@@ -328,6 +336,7 @@
     <string name="notification_inactivity_message">Na tomto zariadení máte stále Dashe! Nezabudnite si pred odinštalovaním Dash peňaženky zapísať svoju frázu pre obnovenie, inak stratíte svoj zostatok %s.</string>
     <string name="notification_inactivity_action_dismiss">Pripomenúť neskôr </string>
     <string name="notification_inactivity_action_dismiss_forever">Nepripomínať</string>
+    <string name="notification_bluetooth_service_listening">Pripravené na prijímanie platieb cez Bluetooth</string>
     <string name="appwidget_wallet_balance_title">Bilancia Dash</string>
 
     <!-- generic buttons -->
diff --git a/wallet/res/values-sl/strings.xml b/wallet/res/values-sl/strings.xml
index 30355a13fe..55dfd59435 100644
--- a/wallet/res/values-sl/strings.xml
+++ b/wallet/res/values-sl/strings.xml
@@ -8,7 +8,6 @@
     <string name="blockchain_state_progress_days">%1$s, %2$d dni zadaj</string>
     <string name="blockchain_state_progress_weeks">%1$s, %2$d tednov zadaj</string>
     <string name="blockchain_state_progress_months">%1$s, %2$d mesecev zadaj</string>
-    <string name="blockchain_state_progress_downloading">Usklajevanje z omrežjem</string>
     <string name="blockchain_state_progress_stalled">Usklajevanje zaustavljeno</string>
     <string name="blockchain_state_progress_problem_storage">Usklajevanje: težava s hrambo podatkov</string>
     <string name="blockchain_state_progress_problem_network">Usklajevanje: težava z omrežjem</string>
diff --git a/wallet/res/values-tr/strings-dashpay.xml b/wallet/res/values-tr/strings-dashpay.xml
index 314c993d83..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>
@@ -261,14 +260,12 @@
     <string name="keep_your_passphrase_safe">Parolanızı güvende tutun</string>
     <string name="pay_now">Şimdi ödeyin ve onaylanmazsa tekrar ödeme yapmadan farklı bir isim oluşturabilirsiniz.</string>
     <string name="case_your_request_is_not_approved">Talebinizin onaylanmaması durumunda</string>
-    <string name="voting_requirement_subtitle">2-9 arasında bir sayıya sahip olan veya 20 karakterden uzun olan herhangi bir kullanıcı adı otomatik olarak onaylanacaktır</string>
     <string name="voting_requirement_title">Oylama sadece bazı durumlarda gereklidir</string>
     <string name="dash_network_must_vote_to_approve">Dash ağı, kullanıcı adınızı oluşturmadan önce bu işlemi onaylamak için oy kullanmalıdır.</string>
     <string name="what_is_username_voting">Kullanıcı adı oylaması nedir\?</string>
     <string name="usernames_blocked_title">Bazı kullanıcı adları engellenebilir</string>
     <string name="usernames_blocked_subtitle">Ağın yeterli bir kısmı bir kullanıcı adının uygunsuz olduğuna karar verirse, onu engelleyebilirler</string>
     <string name="username_voting">Kullanıcı adı Oylama</string>
-    <string name="username_voting_subtitle">Bir ana düğüm sahibi olarak, diğer kullanıcılar kullanıcı adı oluşturmadan önce istenen kullanıcı adlarını onaylamak için oy kullanabilirsiniz.</string>
     <string name="all">Hepsi</string>
     <string name="n_usernames">%d kullanıcı adları</string>
     <string name="n_requests">%d istekler</string>
@@ -292,9 +289,7 @@
         <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_your_hint">Lütfen gelecekte bunu değiştiremeyeceğinizi unutmayın</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>
     <string name="request_username_available">Kullanıcı adı mevcut</string>
@@ -322,15 +317,12 @@
     <string name="make_a_post_with_the_text">İstenen kullanıcı adının orijinal sahibi olduğunuzu doğrulamak için yukarıdaki metni bilinen bir sosyal medya platformunda paylaşın ve aşağıdaki bağlantıyı yapıştırın</string>
     <string name="paste_the_link">Bağlantıyı yapıştırın</string>
     <string name="voting_key_title">Oylama anahtarınızı girin</string>
-    <string name="voting_key_hint">Ana düğüm Oylama Anahtarı</string>
     <string name="voting_key_input_error">Geçersiz bir anahtar girdiniz</string>
     <string name="voting_key_add">Oylama anahtarlarınızı ekleyin</string>
     <string name="voting_key_add_subtitle">Aşağıdaki IP adresi(leri) bu cüzdanla ilişkilidir</string>
     <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 24329fe433..f7f3962449 100644
--- a/wallet/res/values-uk/strings-dashpay.xml
+++ b/wallet/res/values-uk/strings-dashpay.xml
@@ -135,7 +135,7 @@
     <string name="scan_to_pay_username_dialog_message">Недійсне ім’я користувача чи ідентифікатор Dash\n\n%s</string>
     <string name="send_coins_to_username">Відправка</string>
     <string name="contact_history_disclaimer">Додайте % до свого списку контактів, щоб <b>переказувати платежі за Ім\'ям користувача</b> та <b>зберігати історію взаємних транзакцій</b></string>
-    <string name="contact_history_disclaimer_pending">Щойно % прийме ваш запит, ви зможете здійснити <b>оплату безпосередньо на ім\’я користувача</b></string>
+    <string name="contact_history_disclaimer_pending">Щойно % прийме ваш запит, ви зможете здійснити <b>оплату безпосередньо на ім’я користувача</b></string>
     <string name="stranger_activity_disclaimer_text">Платежі, здійснені безпосередньо на адреси, не будуть збережені.</string>
     <string name="error_loading_identity">Помилка завантаження ідентифікатора</string>
 
@@ -261,14 +261,12 @@
     <string name="keep_your_passphrase_safe">Зберігайте свою парольну фразу в безпеці</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="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">Якщо значна частина мережі визначить, що ім’я користувача є невідповідним, вони можуть заблокувати його</string>
     <string name="username_voting">Голосування за імʼя користува</string>
-    <string name="username_voting_subtitle">Як власник майстерноди, ви можете голосувати за схвалення запитуваних імен користувачів, перш ніж користувачі зможуть їх створити.</string>
     <string name="all">Все</string>
     <string name="n_usernames">%d імена користувачів</string>
     <string name="n_requests">%d запитів</string>
@@ -294,7 +292,6 @@
     </string-array>
 
     <string name="request_your_username">Створити ім\'я користувача</string>
-    <string name="request_your_hint">Зверніть увагу, що ви не зможете змінити це в майбутньому</string>
     <string name="request_username">Запит імені користувача</string>
     <string name="request_voting_range">Мережа Dash голосуватиме за це ім’я користувача. Ми повідомимо вас про результати в %s.</string>
     <string name="request_username_available">Доступне ім\'я користувача</string>
@@ -322,15 +319,12 @@
     <string name="make_a_post_with_the_text">Опублікуйте публікацію з наведеним вище текстом у відомих соціальних мережах або на платформі обміну повідомленнями, щоб підтвердити, що ви є оригінальним власником потрібного імені користувача, і вставте посилання нижче</string>
     <string name="paste_the_link">Вставте посилання</string>
     <string name="voting_key_title">Введіть свій ключ голосування</string>
-    <string name="voting_key_hint">Ключі голосування Мастернод</string>
     <string name="voting_key_input_error">Ви ввели недійсний ключ</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="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 0d684aaf3a..615aea58ec 100644
--- a/wallet/res/values-zh-rTW/strings-dashpay.xml
+++ b/wallet/res/values-zh-rTW/strings-dashpay.xml
@@ -262,14 +262,15 @@
     <string name="keep_your_passphrase_safe">確保您的密語安全</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_subtitle">任何包含數字 2-9 或 20 個或更多字元的使用者名稱將自動獲得批准</string>
     <string name="voting_requirement_title">僅在某些情況下才需要投票</string>
     <string name="dash_network_must_vote_to_approve">在創建用戶名之前，達世幣網路必須投票批准您的用戶名。</string>
     <string name="what_is_username_voting">什麼是用戶名投票？</string>
     <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>
     <string name="n_usernames">%d 使用者名稱</string>
     <string name="n_requests">%d 請求</string>
@@ -292,17 +293,22 @@
         <item>所有</item>
         <item>我已批准的</item>
         <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>
+    <string name="request_your_hint">請注意，您未來將無法更改它</string>
     <string name="request_username">申请用戶名</string>
     <string name="request_voting_range">達世幣網路將對該用戶名進行投票。我們將在 %s通知您結果。</string>
     <string name="request_username_available">使用者名稱可用</string>
     <string name="request_username_unavailable">使用者名稱不可用或被阻止</string>
     <string name="request_username_taken">使用者名稱已被佔用</string>
+    <string name="request_username_taken_results">使用者名稱已被其他使用者佔用</string>
     <string name="requesting_your_username_title">建立您的用戶名</string>
+    <string name="requesting_your_username_message">達世幣網路正在請求您的用戶名 %s 。這可能需要花一些時間。</string>
+    <string name="creating_your_username_message">您的用戶名 %s 正在達世幣網路上創建。這可能需要花一些時間。</string>
     <string name="requesting_your_username_error_title">您的使用者名稱請求失敗</string>
+    <string name="requesting_your_username_error_message">由於某種原因，對用戶名 %s 的請求失敗。</string>
     <string name="voting">表決中：</string>
     <string name="this_username_has_already_been_requested">該用戶名已被要求，但您也可以要求它，並讓網路投票決定您是否可以擁有它</string>
     <string name="request_details">索取詳情</string>
@@ -323,15 +329,14 @@
     <string name="make_a_post_with_the_text">在知名社交媒體或訊息平台上發布包含上述文字的帖子，以驗證您是所請求用戶名的原始所有者，並貼上下面的鏈接</string>
     <string name="paste_the_link">貼上連結</string>
     <string name="voting_key_title">輸入您的投票密鑰</string>
-    <string name="voting_key_hint">主節點投票金鑰</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_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="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>
@@ -397,4 +402,15 @@
     <string name="request_username_balance_requirement">您需要 0.25 DASH 才能建立此使用這個用戶名</string>
     <string name="request_username_length_requirement">名稱介乎3 到 23 個字元之間</string>
     <string name="request_username_confirm">我接受</string>
-    </resources>
+    <string name="username_vote_one_left_message">您已為此用戶名投票 %d 次。您只能對該用戶名再投一票。</string>
+    <string name="username_vote_one_left">還剩一票</string>
+    <string name="username_vote_none_left_message">您已為此用戶名投票 %d 次。您不能再為此用戶名投票。</string>
+    <string name="username_vote_none_left">沒有剩餘選票</string>
+    <string name="request_username_blocked">請求的使用者名稱已被阻止</string>
+    <string name="request_username_lost_vote">請求的用戶名已提供給其他人</string>
+    <string name="request_username_blocked_message">用戶名 %s 被達世幣網路阻止。請請求另一個用戶名重試。</string>
+    <string name="request_username_lost_vote_message">根據投票過程，達世幣網路決定將用戶名 %s 分配給其他人。請請求另一個用戶名重試。</string>
+    <string name="mix_dash_mix">混合資金結餘</string>
+    <string name="mix_dash_title">混合你的達世幣</string>
+    <string name="mix_dash_message">為了防止其他人看到您的付款對象，建議您在建立使用者名稱之前混合您的餘額。</string>
+</resources>
diff --git a/wallet/res/values-zh-rTW/strings-extra.xml b/wallet/res/values-zh-rTW/strings-extra.xml
index d42d904013..29a9567445 100644
--- a/wallet/res/values-zh-rTW/strings-extra.xml
+++ b/wallet/res/values-zh-rTW/strings-extra.xml
@@ -25,6 +25,8 @@
     <string name="dialog_confirm_secured_by">由擔保</string>
     <string name="dialog_confirm_fee">網絡費用</string>
     <string name="dialog_confirm_total">總共</string>
+    <string name="dialog_confirm_accept_contact_request">接受聯繫請求</string>
+
     <string name="shortcut_action_join_dashpay">加入 DashPay</string>
     <!-- Home Screen: Shortcut Button: 2 lines, 9 characters across -->
     <string name="shortcut_secure_now">備份</string>
@@ -185,6 +187,9 @@
     <string name="notification_settings_title">通知</string>
     <string name="notification_explainer_title">達世幣錢包想向您發送通知</string>
     <string name="notification_explainer_message">通知可能包括警報、聲音和圖標標記。這些可以在電話設置中進行設置。</string>
+    <string name="notification_dashpay_channel_name">DashPay</string>
+    <string name="notification_dashpay_channel_description">正在進行的 DashPay 的狀態。</string>
+
     <string name="net_type_indicator" />
 
     <string name="unlock_with_fingerprint">使用指紋解鎖。</string>
@@ -237,6 +242,7 @@
     <string name="transaction_close">關閉</string>
     <string name="transaction_details_amount_received">收到的金額</string>
     <string name="transaction_details_amount_sent">發送金額</string>
+    <string name="transaction_details_amount_sent_successfully">發送成功</string>
     <string name="transaction_details_sent_from">來自</string>
     <string name="transaction_details_sent_to">發給</string>
     <string name="transaction_details_received_at">在......收到</string>
@@ -255,6 +261,7 @@
     <string name="authenticate_switch_to_pin">使用密碼</string>
 
     <string name="menu_invite_title">邀請</string>
+    <string name="menu_invite_subtitle">幫助您的朋友和家人加入達世幣</string>
     <string name="menu_buy_and_sell_title">購買 &amp; 出售達世幣</string>
     <string name="menu_buy_and_sell_subtitle">與第三方交易所連結</string>
     <string name="liquid_unavailable">Liquid 與達世幣錢包的整合功能已經不能再使用</string>
@@ -366,16 +373,28 @@
     <string name="import_image_invalid_private">無效的私鑰</string>
     <string name="okay">好的</string>
 
+    <string name="onboard_from_invite_title">讓我們開始吧</string>
     <string name="onboard_from_invite_subtitle">歡迎來到 DashPay</string>
+    <string name="onboard_from_invite_step1">步驟1</string>
+    <string name="onboard_from_invite_step2">步驟2</string>
+    <string name="onboard_from_invite_step3">步驟3</string>
     <string name="onboard_from_invite_step1_title">選擇你的用戶名</string>
     <string name="onboard_from_invite_step2_title">設置您的密碼</string>
     <string name="onboard_from_invite_step3_title">保護您的錢包</string>
 
     <string name="restore_wallet_please_wait">請稍等</string>
+    <string name="restore_wallet_restoring">您的錢包正在恢復</string>
+
+
+
     <string name="network_unavailable">網絡不可用</string>
     <string name="network_error_contact_details">無法獲取聯絡人詳細資料</string>
     <string name="network_error_user_search">無法搜索該用戶</string>
     <string name="network_error_contact_suggestions">無法提供建議</string>
+    <string name="network_error_unable_to_update_profile">無法更新您的個人資料</string>
+
+
+
     <string name="today">今天</string>
     <string name="yesterday">昨天</string>
 
@@ -385,6 +404,8 @@
     <string name="all_transactions">所有</string>
     <string name="received_transactions">己收到</string>
     <string name="sent_transactions">發送</string>
+    <string name="serious_error_title">嚴重錯誤</string>
+    <string name="serious_error_unknown">請聯絡支援人員。</string>
     <string name="set_pin_error_missing_wallet_title">缺少錢包錯誤</string>
     <string name="set_pin_error_missing_wallet_message">錢包不見了。請將此報告給支援平台。</string>
     <string name="wallet_encryption_error_title">錢包創建錯誤</string>
@@ -434,6 +455,10 @@
     <string name="masternode_key_not_used">尚未使用</string>
     <string name="masternode_key_revoked">已撤銷</string>
     <string name="masternode_key_private_public_base64">私鑰 / 公鑰 (base64)</string>
+    <string name="timeskew_ahead">前面</string>
+    <string name="timeskew_behind">在後面
+Zài hòumiàn</string>
+
     <!-- stale rates messages -->
     <string name="stale_exchange_rates_error">價格未被檢索到，所以相關的法幣的價值可能不正確。</string>
     <string name="stale_exchange_rates_stale">價格至少有 30 分鐘延遲，所以相關的法幣的價值可能不正確。</string>
diff --git a/wallet/res/values-zh-rTW/strings.xml b/wallet/res/values-zh-rTW/strings.xml
index 5d6cc89cf9..c040afaee9 100644
--- a/wallet/res/values-zh-rTW/strings.xml
+++ b/wallet/res/values-zh-rTW/strings.xml
@@ -9,9 +9,11 @@
     <string name="blockchain_state_progress_days">%1$s, %2$d 天延遲</string>
     <string name="blockchain_state_progress_weeks">%1$s, %2$d 星期延遲</string>
     <string name="blockchain_state_progress_months">%1$s, %2$d 月延遲</string>
+    <string name="blockchain_state_progress_downloading">正在與網路同步 (%1$s%%)</string>
     <string name="blockchain_state_progress_stalled">同步停滯</string>
     <string name="blockchain_state_progress_problem_storage">同步中: 出現儲存問題</string>
     <string name="blockchain_state_progress_problem_network">同步中: 出現網路問題</string>
+    <string name="mixing_state_progress_mixing">正在混合資金 (%1$s%%)</string>
     <string name="wallet_address_fragment_clipboard_msg">達世幣位址已經複製到剪貼簿</string>
     <string name="wallet_address_dialog_fragment_hint">為了保護您的私隱，每當你收到一筆交易後你的錢包地址將會改變。</string>
     <string name="wallet_balance_fragment_too_much">存放在流動錢包的餘額相當大。請將部份資金存放到一些比較安全的地方。</string>
@@ -41,6 +43,8 @@
     <string name="wallet_low_storage_dialog_button_apps">管理App</string>
     <string name="wallet_timeskew_dialog_title">檢查日期 &amp; 時間設置</string>
     <string name="wallet_timeskew_dialog_msg">你的裝置時間慢了%d分鐘。由於這個問題，您可能無法發送或接收達世幣。\n\n您應該檢查，如有必要，更正您的日期，時間和時區設置。</string>
+    <string name="wallet_coinjoin_timeskew_dialog_msg">您的設備時間為 %s %d 秒。由於此差異，您無法使用 CoinJoin。\n\n您裝置上的時間設定需要變更為「自動設定時間」才能使用 CoinJoin。</string>
+    <string name="settings_coinjoin_timeskew_dialog_msg">您的設備時間偏差超過 5 秒。由於此差異，您無法使用 CoinJoin。\n\n使用 CoinJoin 之前，需要將裝置上的時間設定變更為「自動設定時間」。</string>
     <string name="send_coins_activity_title">達世幣付款</string>
     <string name="send_coins_fragment_request_payment_request_progress">由 %s 讀取簽名…</string>
     <string name="send_coins_fragment_request_payment_request_failed_title">讀取簽名失敗</string>
@@ -170,6 +174,10 @@
     <string name="transaction_row_status_masternode_revoke">撤銷主節點</string>
     <string name="transaction_row_status_masternode_reward">主節點報酬</string>
     <string name="transaction_row_status_mining_reward">採礦獎勵</string>
+    <string name="transaction_row_status_coinjoin_mixing_fee">CoinJoin 混合費用</string>
+    <string name="transaction_row_status_coinjoin_make_collateral">CoinJoin 抵押品輸入</string>
+    <string name="transaction_row_status_coinjoin_mixing">CoinJoin 混合</string>
+    <string name="transaction_row_status_coinjoin_create_denominations">CoinJoin 建立面額</string>
     <string name="network_monitor_activity_title">網路監視器</string>
     <string name="network_monitor_peer_list_title">節點</string>
     <string name="network_monitor_block_list_title">區塊</string>
@@ -328,6 +336,7 @@
     <string name="notification_inactivity_message">你仍然有達世幣在此設備上! 在卸載達世幣錢包之前，請務必記下您的恢復詞組，否則您將失去 %s的結餘。</string>
     <string name="notification_inactivity_action_dismiss">稍後提醒我</string>
     <string name="notification_inactivity_action_dismiss_forever">不要提醒我</string>
+    <string name="notification_bluetooth_service_listening">準備透過藍牙接收付款</string>
     <string name="appwidget_wallet_balance_title">達世幣結餘</string>
 
     <!-- generic buttons -->
diff --git a/wallet/res/values-zh/strings-dashpay.xml b/wallet/res/values-zh/strings-dashpay.xml
index b9cf2c82b2..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>
@@ -262,14 +262,17 @@
     <string name="keep_your_passphrase_safe">保证您的密码安全</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_subtitle">任何包含数字 2-9 或 20个或更多字符的用户名将自动获得批准</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">如果足够的网络节点认为此用户名不合适, 他们能够屏蔽它</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>
     <string name="n_usernames">%d 用户名</string>
     <string name="n_requests">%d 请求</string>
@@ -292,22 +295,35 @@
         <item>所有</item>
         <item>我已通过的</item>
         <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>
+    <string name="request_your_hint">请注意您在之后将无法进行修改</string>
     <string name="request_username">申请用户名</string>
     <string name="request_voting_range">Dash 网络将对此用户名进行投票. 我们将通知您之后的结果 %s.</string>
     <string name="request_username_available">用户名可用</string>
     <string name="request_username_unavailable">用户名不可用或被禁止</string>
     <string name="request_username_taken">用户名已被使用</string>
+    <string name="request_username_taken_results">用户名已经被其他用户使用</string>
     <string name="requesting_your_username_title">正在创建您的用户名</string>
+    <string name="requesting_your_username_message">您的用户名 %s 正在 Dash 网络中被请求. 这将会花一些时间.</string>
+    <string name="creating_your_username_message">您的用户名 %s 正在 Dash 网络中被创建. 这将会花一些时间.</string>
     <string name="requesting_your_username_error_title">您的用户名请求失败</string>
+    <string name="requesting_your_username_error_message">由于某种原因, 对用户名 %s 的请求失败.</string>
     <string name="voting">投票:</string>
     <string name="this_username_has_already_been_requested">这个用户名已经被申请, 但您仍可以申请并让网络投票决定您是否可以获得它</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">身份</string>
     <string name="results">结果</string>
     <string name="link">链接</string>
@@ -323,15 +339,34 @@
     <string name="make_a_post_with_the_text">在知名社交媒体或信息平台使用上述文本发布一个帖子以证明您是所申请用户名的原始持有者, 并将链接粘贴在下方</string>
     <string name="paste_the_link">粘贴链接</string>
     <string name="voting_key_title">输入您的投票私钥</string>
-    <string name="voting_key_hint">主节点投票密钥</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">您输入的密钥是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="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>
@@ -397,4 +432,15 @@
     <string name="request_username_balance_requirement">您需要拥有 0.25 DASH 来创建此用户名</string>
     <string name="request_username_length_requirement">3-23个字符之间</string>
     <string name="request_username_confirm">我同意</string>
+    <string name="username_vote_one_left_message">您已为此用户名投票 %d次. 您只能对该用户名再投一票.</string>
+    <string name="username_vote_one_left">还剩一票</string>
+    <string name="username_vote_none_left_message">您已为此用户名投票 %d 次. 您无法再为此用户名投票.</string>
+    <string name="username_vote_none_left">没有剩余投票</string>
+    <string name="request_username_blocked">请求的用户名已经被屏蔽</string>
+    <string name="request_username_lost_vote">请求的用户名已给与其他人</string>
+    <string name="request_username_blocked_message">用户名 %s 被 Dash网络屏蔽. 请尝试申请其它用户名.</string>
+    <string name="request_username_lost_vote_message">根据投票过程, Dash 网络决定将用户名 %s 分配给其他人. 请尝试申请其它用户名.</string>
+    <string name="mix_dash_mix">混币余额</string>
+    <string name="mix_dash_title">混币您的 Dash</string>
+    <string name="mix_dash_message">为了防止其他人看到您的付款对象, 建议您在创建用户名之前对您的 Dash 进行混币.</string>
     </resources>
diff --git a/wallet/res/values-zh/strings-extra.xml b/wallet/res/values-zh/strings-extra.xml
index 799334267e..c79b3fe243 100644
--- a/wallet/res/values-zh/strings-extra.xml
+++ b/wallet/res/values-zh/strings-extra.xml
@@ -25,6 +25,8 @@
     <string name="dialog_confirm_secured_by">受保护</string>
     <string name="dialog_confirm_fee">网络手续费</string>
     <string name="dialog_confirm_total">总计</string>
+    <string name="dialog_confirm_accept_contact_request">接受好友请求</string>
+
     <string name="shortcut_action_join_dashpay">加入 DashPay</string>
     <!-- Home Screen: Shortcut Button: 2 lines, 9 characters across -->
     <string name="shortcut_secure_now">备份</string>
@@ -185,6 +187,9 @@
     <string name="notification_settings_title">通知</string>
     <string name="notification_explainer_title">Dash钱包想向您发送通知</string>
     <string name="notification_explainer_message">通知可能包括警报, 声音和图标标记. 这些可以在手机设置中进行配置.</string>
+    <string name="notification_dashpay_channel_name">DashPay</string>
+    <string name="notification_dashpay_channel_description">正在进行的 DashPay 状态.</string>
+
     <string name="net_type_indicator" />
 
     <string name="unlock_with_fingerprint">使用您的指纹解锁.</string>
@@ -237,6 +242,7 @@
     <string name="transaction_close">关闭</string>
     <string name="transaction_details_amount_received">接收数额</string>
     <string name="transaction_details_amount_sent">发送数额</string>
+    <string name="transaction_details_amount_sent_successfully">发送成功</string>
     <string name="transaction_details_sent_from">来自</string>
     <string name="transaction_details_sent_to">发送至</string>
     <string name="transaction_details_received_at">接收于</string>
@@ -255,6 +261,7 @@
     <string name="authenticate_switch_to_pin">使用PIN</string>
 
     <string name="menu_invite_title">邀请</string>
+    <string name="menu_invite_subtitle">帮助您的朋友和家人加入 Dash</string>
     <string name="menu_buy_and_sell_title">买 &amp; 卖 Dash</string>
     <string name="menu_buy_and_sell_subtitle">与第三方交易所连接</string>
     <string name="liquid_unavailable">Liquid 与 Dash钱包的整合功能已经不能再使用</string>
@@ -366,16 +373,28 @@
     <string name="import_image_invalid_private">无效的私钥</string>
     <string name="okay">好的</string>
 
+    <string name="onboard_from_invite_title">让我们开始吧</string>
     <string name="onboard_from_invite_subtitle">欢迎来到 DashPay</string>
+    <string name="onboard_from_invite_step1">步骤 1</string>
+    <string name="onboard_from_invite_step2">步骤 2</string>
+    <string name="onboard_from_invite_step3">步骤 3</string>
     <string name="onboard_from_invite_step1_title">选择您的用户名</string>
     <string name="onboard_from_invite_step2_title">设置您的密码</string>
     <string name="onboard_from_invite_step3_title">保护您的钱包</string>
 
     <string name="restore_wallet_please_wait">请稍等</string>
+    <string name="restore_wallet_restoring">您的钱包正在被恢复</string>
+
+
+
     <string name="network_unavailable">网络不可用</string>
     <string name="network_error_contact_details">无法获取联系人详细资料</string>
     <string name="network_error_user_search">无法搜索到该用户</string>
     <string name="network_error_contact_suggestions">无法提供建议</string>
+    <string name="network_error_unable_to_update_profile">无法更新您的个人资料</string>
+
+
+
     <string name="today">今天</string>
     <string name="yesterday">昨天</string>
 
@@ -385,6 +404,8 @@
     <string name="all_transactions">所有</string>
     <string name="received_transactions">已接收</string>
     <string name="sent_transactions">已发送</string>
+    <string name="serious_error_title">严重错误</string>
+    <string name="serious_error_unknown">请联系支持.</string>
     <string name="set_pin_error_missing_wallet_title">缺少钱包错误</string>
     <string name="set_pin_error_missing_wallet_message">钱包丢失. 请将此报告提交给服务与支持平台.</string>
     <string name="wallet_encryption_error_title">钱包创建错误</string>
@@ -434,6 +455,9 @@
     <string name="masternode_key_not_used">未使用</string>
     <string name="masternode_key_revoked">已撤销</string>
     <string name="masternode_key_private_public_base64">私钥 / 公钥 (base64)</string>
+    <string name="timeskew_ahead">前面</string>
+    <string name="timeskew_behind">后面</string>
+
     <!-- stale rates messages -->
     <string name="stale_exchange_rates_error">价格未被检索到. 法币价值或许错误.</string>
     <string name="stale_exchange_rates_stale">价格至少有30分钟的延迟. 法币显示价值或许错误.</string>
diff --git a/wallet/res/values-zh/strings.xml b/wallet/res/values-zh/strings.xml
index 4e081bdcff..5dc8232e8e 100644
--- a/wallet/res/values-zh/strings.xml
+++ b/wallet/res/values-zh/strings.xml
@@ -9,9 +9,11 @@
     <string name="blockchain_state_progress_days">%1$s, %2$d 天延迟</string>
     <string name="blockchain_state_progress_weeks">%1$s, %2$d 星期延迟</string>
     <string name="blockchain_state_progress_months">%1$s, %2$d 月延迟</string>
+    <string name="blockchain_state_progress_downloading">正在与网络同步 (%1$s%%)</string>
     <string name="blockchain_state_progress_stalled">同步已停滞</string>
     <string name="blockchain_state_progress_problem_storage">同步: 存储出现了问题</string>
     <string name="blockchain_state_progress_problem_network">同步: 网络出现了问题</string>
+    <string name="mixing_state_progress_mixing">正在混币 (%1$s%%)</string>
     <string name="wallet_address_fragment_clipboard_msg">Dash地址已复制到剪切板</string>
     <string name="wallet_address_dialog_fragment_hint">为了保护您的隐私, 当您收到一笔交易后您的钱包地址将改变.</string>
     <string name="wallet_balance_fragment_too_much">该金额太庞大了, 随身携带存在安全风险. 请将一部分资金转移到一个安全的地方.</string>
@@ -41,6 +43,8 @@
     <string name="wallet_low_storage_dialog_button_apps">管理应用程序</string>
     <string name="wallet_timeskew_dialog_title">检查日期 &amp; 时间设置</string>
     <string name="wallet_timeskew_dialog_msg">您的设备停止了 %d 分钟. 由于此原因, 您可能无法发送或接收Dash.\\n\\n您应当检查, 并修正您的日期, 时区设置.</string>
+    <string name="wallet_coinjoin_timeskew_dialog_msg">您的设备时间为 %s %d 秒. 由于此差异, 您无法使用 CoinJoin. \n\n您设备上的时间设置需要变更为“自动设定时间”才能使用CoinJoin.</string>
+    <string name="settings_coinjoin_timeskew_dialog_msg">的设备时间偏差超过 5 秒. 由于此差异, 您无法使用CoinJoin. \n\n使用 CoinJoin 之前, 需要将设备上的时间设定更改为“自动设定时间”.</string>
     <string name="send_coins_activity_title">发送Dash</string>
     <string name="send_coins_fragment_request_payment_request_progress">正在从 %s 读取签名…</string>
     <string name="send_coins_fragment_request_payment_request_failed_title">获取签名失败</string>
@@ -170,6 +174,10 @@
     <string name="transaction_row_status_masternode_revoke">主节点撤销</string>
     <string name="transaction_row_status_masternode_reward">主节点奖励</string>
     <string name="transaction_row_status_mining_reward">挖矿奖励</string>
+    <string name="transaction_row_status_coinjoin_mixing_fee">CoinJoin 混币费用</string>
+    <string name="transaction_row_status_coinjoin_make_collateral">CoinJoin 抵押输入</string>
+    <string name="transaction_row_status_coinjoin_mixing">CoinJoin 混币</string>
+    <string name="transaction_row_status_coinjoin_create_denominations">CoinJoin 创建面额</string>
     <string name="network_monitor_activity_title">网络监视器</string>
     <string name="network_monitor_peer_list_title">网络节点</string>
     <string name="network_monitor_block_list_title">区块</string>
@@ -328,6 +336,7 @@
     <string name="notification_inactivity_message">您的设备上还存有Dash! 在卸载Dash钱包前, 请确保您已经记下了助记词, 否则您将丢失%s.</string>
     <string name="notification_inactivity_action_dismiss">以后提醒我</string>
     <string name="notification_inactivity_action_dismiss_forever">不需要提醒</string>
+    <string name="notification_bluetooth_service_listening">准备通过蓝牙接收付款</string>
     <string name="appwidget_wallet_balance_title">Dash余额</string>
 
     <!-- generic buttons -->
diff --git a/wallet/res/values/strings-dashpay.xml b/wallet/res/values/strings-dashpay.xml
index 33de39f14d..bdce7d94cd 100644
--- a/wallet/res/values/strings-dashpay.xml
+++ b/wallet/res/values/strings-dashpay.xml
@@ -87,7 +87,7 @@
     <string name="dashpay_topup_fee">Topup Fee</string>
     <string name="search_user_find_a_user">Find a user on the Dash Network</string>
     <string name="search_for_a_user">Search for a User on the Dash Network</string>
-    <string name="search_user_input_placeholder">enter the username to search here</string>
+    <string name="search_user_input_placeholder">Search username</string>
     <string name="add_new_contact">Add a New Contact</string>
     <string name="send_contact_request">Send Contact Request</string>
     <string name="sending_contact_request">Sending Contact Request</string>
@@ -95,7 +95,7 @@
     <string name="accepting_contact_request">Accepting Contact Request</string>
     <string name="accepting_contact_request_short">Accepting</string>
     <string name="search_user_no_results">There are no users that match</string>
-    <string name="search_user_loading">Searching for username <b>"%"</b> on the Dash Network</string>
+    <string name="search_user_loading">Searching for username <b>\"%\"</b> on the Dash Network</string>
     <string name="contact_request_pending">Contact Request Pending</string>
     <string name="pay">Pay</string>
     <string name="contact_request_received_title">%s has requested to be a friend</string>
@@ -130,6 +130,7 @@
     <string name="notifications_you_received">%s has sent you a contact request</string>
 
     <string name="identity_complete_message">Your username %s has been successfully created on the Dash Network</string>
+    <string name="request_complete_message">Your username %s has been successfully requested on the Dash Network</string>
 
     <string name="scan_to_pay_username_dialog_message">Not a valid Dash Username or Identity\n\n%s</string>
     <string name="send_coins_to_username">Sending to</string>
@@ -252,24 +253,25 @@
     <string name="welcome_to_dash_pay">Welcome to Dash Pay</string>
     <string name="pay_to_usernames">Pay to usernames. No more alphanumeric addresses.</string>
     <string name="create_a_username">Create a username</string>
-    <string name="add_your_friends_family">"Add your friends &amp; family"</string>
+    <string name="add_your_friends_family">Add your friends &amp; family</string>
     <string name="invite_your_family">Invite your family, find your friends by searching their usernames.</string>
     <string name="personalise_profile">Personalise profile</string>
     <string name="upload_your_picture">Upload your picture, personalize your identity.</string>
     <string name="in_case_lose_your_passphrase">In case you lose your passphrase you will lose your right to your requested username.</string>
     <string name="keep_your_passphrase_safe">Keep your passphrase safe</string>
-    <string name="pay_now">Pay now and if not approved, you can create a different name without paying again [check if true]</string>
+    <string name="pay_now">Pay now and if not approved, you can create a different name without paying again</string>
     <string name="case_your_request_is_not_approved">In case your request is not approved</string>
-    <string name="voting_requirement_subtitle">Any username that has a number 2–9 or is longer than 20 characters will be automatically approved</string>
+    <string name="voting_requirement_subtitle">Any username that has a number 2–9 or 20 or more characters will be automatically approved</string>
     <string name="voting_requirement_title">Voting is only required in some cases</string>
     <string name="dash_network_must_vote_to_approve">The Dash network must vote to approve your username before it is created.</string>
     <string name="what_is_username_voting">What is username voting?</string>
     <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 users will be able to create it.</string>
-    <string name="voting_duplicates_only_title">Vote only on duplicates</string>
-    <string name="voting_duplicates_only_message">You can review all requests but you only need to vote on duplicates</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>
     <string name="n_usernames">%d usernames</string>
     <string name="n_requests">%d requests</string>
@@ -292,21 +294,37 @@
         <item>All</item>
         <item>I have approved</item>
         <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 not that you will not be able to change it in the future</string>
+    <string name="request_your_hint">Please note that you will not be able to change it in the future</string>
     <string name="request_username">Request Username</string>
     <string name="request_voting_range">The Dash network will vote on this username. We will notify you of the results on %s.</string>
     <string name="request_username_available">Username is available</string>
     <string name="request_username_unavailable">Username is unavailable or blocked</string>
     <string name="request_username_taken">Username is taken</string>
-
+    <string name="request_username_taken_results">Username was taken by another user</string>
+    <string name="requesting_your_username_title">Creating your username</string>
+    <string name="requesting_your_username_message">Your username %s is being requested on the Dash network. It may take some time.</string>
+    <string name="creating_your_username_message">Your username %s is being created on the Dash network. It may take some time.</string>
+    <string name="requesting_your_username_error_title">Your username request failed</string>
+    <string name="requesting_your_username_error_message">For some reason, the request for the username %s has failed.</string>
     <string name="voting">Voting:</string>
     <string name="this_username_has_already_been_requested">This username has already been requested, but you can request it too and let the network vote to decide if you can have it</string>
     <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>
@@ -322,17 +340,36 @@
     <string name="make_a_post_with_the_text">Make a post with the text above on a well known social media or messaging platform to verify that you are the original owner of the requested username and paste the link bellow</string>
     <string name="paste_the_link">Paste the link</string>
     <string name="voting_key_title">Enter your voting key</string>
-    <string name="voting_key_hint">Masternode Voting Key</string>
+    <string name="voting_key_hint">Masternode Voting Private Key</string>
     <string name="voting_key_input_error">You have entered an invalid key</string>
+    <string name="voting_key_input_not_active_error">You have entered a key that is not associated to an active Masternode</string>
+    <string name="voting_key_input_already_present">You have already entered this masternode key</string>
+    <string name="voting_key_input_invalid_private_key_wrong_network_testnet">You have entered a key that is for testnet, but this is mainnet. It should look like this: %s</string>
+    <string name="voting_key_input_invalid_private_key_wrong_network_mainnet">You have entered a key that is for mainnet, but this is testnet. It should look like this: %s</string>
+    <string name="voting_key_input_invalid_private_key_address">You have entered an address key instead of a masternode voting private key. It should be in WIF format (%s)</string>
+    <string name="voting_key_input_invalid_private_key_private_key_hex">You have entered a key in hex format, but it should be in WIF format (%s)</string>
+    <string name="voting_key_input_invalid_private_key_public_key_hex">You have entered a key in hex format, but it should be in WIF format (%s)</string>
+    <string name="voting_key_input_invalid_private_key_too_short">You have entered a private key that is too short.  Here is an example (%s)</string>
+    <string name="voting_key_input_invalid_private_key_incorrect">You have entered a private key that with some incorrect characters.  Here is an example (%s)</string>
+    <string name="voting_key_input_invalid_private_key_invalid_char">You have entered a private key has an invalid character.  Here is an example (%s)</string>
+
     <string name="voting_key_add">Add your voting keys</string>
     <string name="voting_key_add_subtitle">The IP address(es) below are associated with this wallet</string>
     <string name="masternode_ip">Masternode IP address</string>
     <string name="multiple_votes_cast">%d votes will be cast as you have multiple voting keys stored in the wallet</string>
     <string name="add_masternode_key">Add Masternode Voting Key</string>
-    <string name="vote_submitted">Your vote was submitted</string>
-    <string name="vote_cancelled">Your vote was cancelled</string>
+    <string name="dont_ask_again">Don\'t ask me again</string>
+    <string name="vote_submitting">Submitting your vote for %s username</string>
+    <string name="vote_submitted">Voted for %s username</string>
+    <string name="cancel_submitting">Canceling your vote for %s username</string>
+    <string name="cancel_submitted">Canceled vote for %s username</string>
+    <string name="block_submitting">Blocking for %s username</string>
+    <string name="block_submitted">You blocked %s username</string>
+    <string name="vote_submitted_error">Error voting for %s username</string>
+    <string name="cancel_submitted_error">Error canceling vote for %s username</string>
+    <string name="block_submitted_error">Error blocking %s username</string>
     <string name="quick_vote">Quick Voting</string>
-    <string name="quick_vote_subtitle">By tapping the "Vote for All" button, you will automatically vote for all of the filtered usernames (%d) that were submitted first</string>
+    <string name="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="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>
@@ -384,7 +421,7 @@
     <!-- credit balance messages / buttons -->
     <string name="credit_balance_empty_warning_title">Your credit balance is low</string>
     <string name="credit_balance_low_warning_title">Your credit balance is fully depleted</string>
-    <string name="credit_balance_empty_warning_message">"You can continue to use DashPay for payments but you cannot update your profile or add more contacts until you top up your credit balance</string>
+    <string name="credit_balance_empty_warning_message">You can continue to use DashPay for payments but you cannot update your profile or add more contacts until you top up your credit balance</string>
     <string name="credit_balance_low_warning_message">Top-up your credits to continue making changes to your profile and adding contacts</string>
     <string name="credit_balance_button_maybe_later">Maybe later</string>
     <string name="credit_balance_button_buy">Buy Credits</string>
@@ -396,5 +433,17 @@
     <string name="request_username_balance_requirement">You need to have 0.25 DASH to create this username</string>
     <string name="request_username_length_requirement">Between 3 and 23 characters</string>
     <string name="request_username_confirm">I accept</string>
-
+    <string name="username_vote_one_left_message">You have already voted for this username %d times. You can only cast one more vote for this username.</string>
+    <string name="username_vote_one_left">One vote left</string>
+    <string name="username_vote_none_left_message">You have already voted for this username %d times. You cannot cast any more votes for this username.</string>
+    <string name="username_vote_none_left">No votes left</string>
+    <string name="request_username_blocked">Requested username has been blocked</string>
+    <string name="request_username_lost_vote">Requested username has been given to someone else</string>
+    <string name="request_username_blocked_message">The username %s was blocked by the Dash Network. Please try again by requesting another username.</string>
+    <string name="request_username_lost_vote_message">Due to the voting process, the Dash Network has decided to assign the username %s to someone else. Please try again by requesting another username.</string>
+    <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/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/res/values/values.xml b/wallet/res/values/values.xml
index 9aff0d871d..1919a723a6 100644
--- a/wallet/res/values/values.xml
+++ b/wallet/res/values/values.xml
@@ -4,8 +4,8 @@
 	<string name="symbol_to">→</string>
 	<string name="symbol_from">←</string>
 	<string name="symbol_internal">⇄</string>
-	<string name="app_name">Dash Wallet</string>
-	<string name="app_name_short">Dash</string>
+	<string name="app_name">DashPay Wallet</string>
+	<string name="app_name_short">DashPay</string>
 	<string name="app_name_dashpay_short">DashPay</string>
 	<string name="app_name_dashpay">DashPay</string>
 
diff --git a/wallet/schemas/de.schildbach.wallet.database.AppDatabase/14.json b/wallet/schemas/de.schildbach.wallet.database.AppDatabase/14.json
new file mode 100644
index 0000000000..5aa6fbed49
--- /dev/null
+++ b/wallet/schemas/de.schildbach.wallet.database.AppDatabase/14.json
@@ -0,0 +1,954 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 14,
+    "identityHash": "06dd6c49ce5771cea6de494c891c1876",
+    "entities": [
+      {
+        "tableName": "exchange_rates",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`currencyCode` TEXT NOT NULL, `rate` TEXT, PRIMARY KEY(`currencyCode`))",
+        "fields": [
+          {
+            "fieldPath": "currencyCode",
+            "columnName": "currencyCode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "rate",
+            "columnName": "rate",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "currencyCode"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "blockchain_state",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`bestChainDate` INTEGER, `bestChainHeight` INTEGER NOT NULL, `replaying` INTEGER NOT NULL, `impediments` TEXT NOT NULL, `chainlockHeight` INTEGER NOT NULL, `mnlistHeight` INTEGER NOT NULL, `percentageSync` INTEGER NOT NULL, `id` INTEGER NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "bestChainDate",
+            "columnName": "bestChainDate",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "bestChainHeight",
+            "columnName": "bestChainHeight",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "replaying",
+            "columnName": "replaying",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "impediments",
+            "columnName": "impediments",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "chainlockHeight",
+            "columnName": "chainlockHeight",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mnlistHeight",
+            "columnName": "mnlistHeight",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "percentageSync",
+            "columnName": "percentageSync",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "transaction_metadata",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`txId` BLOB NOT NULL, `timestamp` INTEGER NOT NULL, `value` INTEGER NOT NULL, `type` TEXT NOT NULL, `taxCategory` TEXT, `currencyCode` TEXT, `rate` TEXT, `memo` TEXT NOT NULL, `service` TEXT, `customIconId` BLOB, PRIMARY KEY(`txId`))",
+        "fields": [
+          {
+            "fieldPath": "txId",
+            "columnName": "txId",
+            "affinity": "BLOB",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "taxCategory",
+            "columnName": "taxCategory",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "currencyCode",
+            "columnName": "currencyCode",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "rate",
+            "columnName": "rate",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "memo",
+            "columnName": "memo",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "service",
+            "columnName": "service",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "customIconId",
+            "columnName": "customIconId",
+            "affinity": "BLOB",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "txId"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "address_metadata",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`address` TEXT NOT NULL, `isInput` INTEGER NOT NULL, `taxCategory` TEXT NOT NULL, `service` TEXT NOT NULL, PRIMARY KEY(`address`, `isInput`))",
+        "fields": [
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isInput",
+            "columnName": "isInput",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "taxCategory",
+            "columnName": "taxCategory",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "service",
+            "columnName": "service",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "address",
+            "isInput"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "icon_bitmaps",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` BLOB NOT NULL, `imageData` BLOB NOT NULL, `originalUrl` TEXT NOT NULL, `height` INTEGER NOT NULL, `width` INTEGER NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "BLOB",
+            "notNull": true
+          },
+          {
+            "fieldPath": "imageData",
+            "columnName": "imageData",
+            "affinity": "BLOB",
+            "notNull": true
+          },
+          {
+            "fieldPath": "originalUrl",
+            "columnName": "originalUrl",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "height",
+            "columnName": "height",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "width",
+            "columnName": "width",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "gift_cards",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`txId` BLOB NOT NULL, `merchantName` TEXT NOT NULL, `price` REAL NOT NULL, `number` TEXT, `pin` TEXT, `barcodeValue` TEXT, `barcodeFormat` TEXT, `merchantUrl` TEXT, `note` TEXT, PRIMARY KEY(`txId`))",
+        "fields": [
+          {
+            "fieldPath": "txId",
+            "columnName": "txId",
+            "affinity": "BLOB",
+            "notNull": true
+          },
+          {
+            "fieldPath": "merchantName",
+            "columnName": "merchantName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "price",
+            "columnName": "price",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "pin",
+            "columnName": "pin",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "barcodeValue",
+            "columnName": "barcodeValue",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "barcodeFormat",
+            "columnName": "barcodeFormat",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "merchantUrl",
+            "columnName": "merchantUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "note",
+            "columnName": "note",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "txId"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "dashpay_profile",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `username` TEXT NOT NULL, `displayName` TEXT NOT NULL, `publicMessage` TEXT NOT NULL, `avatarUrl` TEXT NOT NULL, `avatarHash` BLOB, `avatarFingerprint` BLOB, `createdAt` INTEGER NOT NULL, `updatedAt` INTEGER NOT NULL, PRIMARY KEY(`userId`))",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "username",
+            "columnName": "username",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "displayName",
+            "columnName": "displayName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "publicMessage",
+            "columnName": "publicMessage",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "avatarUrl",
+            "columnName": "avatarUrl",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "avatarHash",
+            "columnName": "avatarHash",
+            "affinity": "BLOB",
+            "notNull": false
+          },
+          {
+            "fieldPath": "avatarFingerprint",
+            "columnName": "avatarFingerprint",
+            "affinity": "BLOB",
+            "notNull": false
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "createdAt",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "updatedAt",
+            "columnName": "updatedAt",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "dashpay_contact_request",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `toUserId` TEXT NOT NULL, `accountReference` INTEGER NOT NULL, `encryptedPublicKey` BLOB NOT NULL, `senderKeyIndex` INTEGER NOT NULL, `recipientKeyIndex` INTEGER NOT NULL, `timestamp` INTEGER NOT NULL, `encryptedAccountLabel` BLOB, `autoAcceptProof` BLOB, PRIMARY KEY(`userId`, `toUserId`, `accountReference`))",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "toUserId",
+            "columnName": "toUserId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "accountReference",
+            "columnName": "accountReference",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "encryptedPublicKey",
+            "columnName": "encryptedPublicKey",
+            "affinity": "BLOB",
+            "notNull": true
+          },
+          {
+            "fieldPath": "senderKeyIndex",
+            "columnName": "senderKeyIndex",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "recipientKeyIndex",
+            "columnName": "recipientKeyIndex",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "encryptedAccountLabel",
+            "columnName": "encryptedAccountLabel",
+            "affinity": "BLOB",
+            "notNull": false
+          },
+          {
+            "fieldPath": "autoAcceptProof",
+            "columnName": "autoAcceptProof",
+            "affinity": "BLOB",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId",
+            "toUserId",
+            "accountReference"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "user_alerts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`stringResId` INTEGER NOT NULL, `iconResId` INTEGER NOT NULL, `dismissed` INTEGER NOT NULL, `createdAt` INTEGER NOT NULL, PRIMARY KEY(`stringResId`))",
+        "fields": [
+          {
+            "fieldPath": "stringResId",
+            "columnName": "stringResId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "iconResId",
+            "columnName": "iconResId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dismissed",
+            "columnName": "dismissed",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "createdAt",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "stringResId"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "invitation_table",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `txid` BLOB NOT NULL, `createdAt` INTEGER NOT NULL, `memo` TEXT NOT NULL, `sentAt` INTEGER NOT NULL, `acceptedAt` INTEGER NOT NULL, `shortDynamicLink` TEXT, `dynamicLink` TEXT, PRIMARY KEY(`userId`))",
+        "fields": [
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "txid",
+            "columnName": "txid",
+            "affinity": "BLOB",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "createdAt",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "memo",
+            "columnName": "memo",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sentAt",
+            "columnName": "sentAt",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "acceptedAt",
+            "columnName": "acceptedAt",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shortDynamicLink",
+            "columnName": "shortDynamicLink",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dynamicLink",
+            "columnName": "dynamicLink",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userId"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "transaction_metadata_cache",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`cacheTimestamp` INTEGER NOT NULL, `txId` BLOB NOT NULL, `sentTimestamp` INTEGER, `taxCategory` TEXT, `currencyCode` TEXT, `rate` TEXT, `memo` TEXT, `service` TEXT, `customIconUrl` TEXT, `giftCardNumber` TEXT, `giftCardPin` TEXT, `merchantName` TEXT, `originalPrice` REAL, `barcodeValue` TEXT, `barcodeFormat` TEXT, `merchantUrl` TEXT, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "cacheTimestamp",
+            "columnName": "cacheTimestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "txId",
+            "columnName": "txId",
+            "affinity": "BLOB",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sentTimestamp",
+            "columnName": "sentTimestamp",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "taxCategory",
+            "columnName": "taxCategory",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "currencyCode",
+            "columnName": "currencyCode",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "rate",
+            "columnName": "rate",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "memo",
+            "columnName": "memo",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "service",
+            "columnName": "service",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "customIconUrl",
+            "columnName": "customIconUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "giftCardNumber",
+            "columnName": "giftCardNumber",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "giftCardPin",
+            "columnName": "giftCardPin",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "merchantName",
+            "columnName": "merchantName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "originalPrice",
+            "columnName": "originalPrice",
+            "affinity": "REAL",
+            "notNull": false
+          },
+          {
+            "fieldPath": "barcodeValue",
+            "columnName": "barcodeValue",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "barcodeFormat",
+            "columnName": "barcodeFormat",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "merchantUrl",
+            "columnName": "merchantUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "transaction_metadata_platform",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, `txId` BLOB NOT NULL, `sentTimestamp` INTEGER, `taxCategory` TEXT, `currencyCode` TEXT, `rate` REAL, `memo` TEXT, `service` TEXT, `customIconUrl` TEXT, `giftCardNumber` TEXT, `giftCardPin` TEXT, `merchantName` TEXT, `originalPrice` REAL, `barcodeValue` TEXT, `barcodeFormat` TEXT, `merchantUrl` TEXT, PRIMARY KEY(`id`, `txId`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "txId",
+            "columnName": "txId",
+            "affinity": "BLOB",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sentTimestamp",
+            "columnName": "sentTimestamp",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "taxCategory",
+            "columnName": "taxCategory",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "currencyCode",
+            "columnName": "currencyCode",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "rate",
+            "columnName": "rate",
+            "affinity": "REAL",
+            "notNull": false
+          },
+          {
+            "fieldPath": "memo",
+            "columnName": "memo",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "service",
+            "columnName": "service",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "customIconUrl",
+            "columnName": "customIconUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "giftCardNumber",
+            "columnName": "giftCardNumber",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "giftCardPin",
+            "columnName": "giftCardPin",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "merchantName",
+            "columnName": "merchantName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "originalPrice",
+            "columnName": "originalPrice",
+            "affinity": "REAL",
+            "notNull": false
+          },
+          {
+            "fieldPath": "barcodeValue",
+            "columnName": "barcodeValue",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "barcodeFormat",
+            "columnName": "barcodeFormat",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "merchantUrl",
+            "columnName": "merchantUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id",
+            "txId"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "username_requests",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`requestId` TEXT NOT NULL, `username` TEXT NOT NULL, `normalizedLabel` TEXT NOT NULL, `createdAt` INTEGER NOT NULL, `identity` TEXT NOT NULL, `link` TEXT, `votes` INTEGER NOT NULL, `lockVotes` INTEGER NOT NULL, `isApproved` INTEGER NOT NULL, PRIMARY KEY(`requestId`))",
+        "fields": [
+          {
+            "fieldPath": "requestId",
+            "columnName": "requestId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "username",
+            "columnName": "username",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "normalizedLabel",
+            "columnName": "normalizedLabel",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "createdAt",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "identity",
+            "columnName": "identity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "link",
+            "columnName": "link",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "votes",
+            "columnName": "votes",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lockVotes",
+            "columnName": "lockVotes",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isApproved",
+            "columnName": "isApproved",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "requestId"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "username_votes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `username` TEXT NOT NULL, `identity` TEXT NOT NULL, `type` TEXT NOT NULL, `timestamp` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "username",
+            "columnName": "username",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "identity",
+            "columnName": "identity",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "imported_masternode_keys",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`proTxHash` BLOB NOT NULL, `address` TEXT NOT NULL, `votingPrivateKey` BLOB NOT NULL, `votingPublicKey` BLOB NOT NULL, `votingPubKeyHash` BLOB NOT NULL, PRIMARY KEY(`proTxHash`))",
+        "fields": [
+          {
+            "fieldPath": "proTxHash",
+            "columnName": "proTxHash",
+            "affinity": "BLOB",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "votingPrivateKey",
+            "columnName": "votingPrivateKey",
+            "affinity": "BLOB",
+            "notNull": true
+          },
+          {
+            "fieldPath": "votingPublicKey",
+            "columnName": "votingPublicKey",
+            "affinity": "BLOB",
+            "notNull": true
+          },
+          {
+            "fieldPath": "votingPubKeyHash",
+            "columnName": "votingPubKeyHash",
+            "affinity": "BLOB",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "proTxHash"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '06dd6c49ce5771cea6de494c891c1876')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/wallet/src/de/schildbach/wallet/Constants.java b/wallet/src/de/schildbach/wallet/Constants.java
index b27e5d4f99..9e77f55082 100644
--- a/wallet/src/de/schildbach/wallet/Constants.java
+++ b/wallet/src/de/schildbach/wallet/Constants.java
@@ -61,12 +61,28 @@ public final class Constants {
     public static final boolean IS_PROD_BUILD;
 
     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;
     public static final EnumSet<MasternodeSync.FEATURE_FLAGS> FEATURE_FLAGS = MasternodeSync.FEATURES_SPV;
 
     static {
+        // TODO: remove when 32-bit bugs are fixed
+        String[] supportedAbis = Build.SUPPORTED_ABIS;
+        boolean is32Bit = true;
+
+        for (String abi : supportedAbis) {
+            if (abi.equals("arm64-v8a") || abi.equals("x86_64")) {
+                is32Bit = false;
+                break;
+            }
+        }
+
         switch (BuildConfig.FLAVOR) {
             case "prod": {
                 DNS_SEED = new String[]{"dnsseed.dash.org", "dnsseed.dashdot.io"};
@@ -77,7 +93,8 @@ public final class Constants {
                 FEE_NETWORK_SUFFIX = FILENAME_NETWORK_SUFFIX;
                 WALLET_NAME_CURRENCY_CODE = "dash";
                 org.dash.wallet.common.util.Constants.INSTANCE.setEXPLORE_GC_FILE_PATH("explore/explore.db");
-                SUPPORTS_PLATFORM = false;
+                SUPPORTS_PLATFORM = !is32Bit;
+                SUPPORTS_INVITES = false;
                 SYNC_FLAGS.add(MasternodeSync.SYNC_FLAGS.SYNC_HEADERS_MN_LIST_FIRST);
                 if (SUPPORTS_PLATFORM) {
                     SYNC_FLAGS.add(MasternodeSync.SYNC_FLAGS.SYNC_BLOCKS_AFTER_PREPROCESSING);
@@ -94,7 +111,8 @@ public final class Constants {
                 FILENAME_NETWORK_SUFFIX = "-testnet";
                 FEE_NETWORK_SUFFIX = FILENAME_NETWORK_SUFFIX;
                 WALLET_NAME_CURRENCY_CODE = "tdash";
-                SUPPORTS_PLATFORM = false;
+                SUPPORTS_PLATFORM = !is32Bit;
+                SUPPORTS_INVITES = false;
                 SYNC_FLAGS.add(MasternodeSync.SYNC_FLAGS.SYNC_HEADERS_MN_LIST_FIRST);
                 if (SUPPORTS_PLATFORM) {
                     SYNC_FLAGS.add(MasternodeSync.SYNC_FLAGS.SYNC_BLOCKS_AFTER_PREPROCESSING);
@@ -132,6 +150,7 @@ public final class Constants {
 
     /** Bitcoinj global context. */
     public static final Context CONTEXT = new Context(NETWORK_PARAMETERS);
+
     public final static class Files {
 
         /** Filename of the wallet. */
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() {
diff --git a/wallet/src/de/schildbach/wallet/database/AppDatabase.kt b/wallet/src/de/schildbach/wallet/database/AppDatabase.kt
index 3ea1fb06b4..28dddb825a 100644
--- a/wallet/src/de/schildbach/wallet/database/AppDatabase.kt
+++ b/wallet/src/de/schildbach/wallet/database/AppDatabase.kt
@@ -21,13 +21,14 @@ import androidx.room.Database
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
 import de.schildbach.wallet.database.dao.*
-import de.schildbach.wallet.database.entity.BlockchainIdentityData
 import de.schildbach.wallet.database.entity.DashPayContactRequest
 import de.schildbach.wallet.database.entity.DashPayProfile
+import de.schildbach.wallet.database.entity.ImportedMasternodeKey
 import de.schildbach.wallet.database.entity.Invitation
 import de.schildbach.wallet.database.entity.TransactionMetadataCacheItem
 import de.schildbach.wallet.database.entity.TransactionMetadataDocument
 import de.schildbach.wallet.database.entity.UsernameRequest
+import de.schildbach.wallet.database.entity.UsernameVote
 import de.schildbach.wallet.ui.dashpay.UserAlert
 import org.dash.wallet.common.data.entity.AddressMetadata
 import org.dash.wallet.common.data.entity.BlockchainState
@@ -53,9 +54,11 @@ import org.dash.wallet.features.exploredash.utils.RoomConverters
         Invitation::class,
         TransactionMetadataCacheItem::class,
         TransactionMetadataDocument::class,
-        UsernameRequest::class
+        UsernameRequest::class,
+        UsernameVote::class,
+        ImportedMasternodeKey::class
     ],
-    version = 13, // if increasing version, we need migrations to preserve tx/addr metadata,
+    version = 14, // if increasing version, we need migrations to preserve tx/addr metadata,
     exportSchema = true
 )
 @TypeConverters(RoomConverters::class, BlockchainStateRoomConverters::class)
@@ -73,4 +76,6 @@ abstract class AppDatabase : RoomDatabase() {
     abstract fun transactionMetadataDocumentDao(): TransactionMetadataDocumentDao
     abstract fun userAlertDao(): UserAlertDao
     abstract fun usernameRequestDao(): UsernameRequestDao
+    abstract fun usernameVoteDao(): UsernameVoteDao
+    abstract fun importedMasternodeKeyDao(): ImportedMasternodeKeyDao
 }
diff --git a/wallet/src/de/schildbach/wallet/database/AppDatabaseMigrations.kt b/wallet/src/de/schildbach/wallet/database/AppDatabaseMigrations.kt
index 25a64639a3..3bbaf04f8c 100644
--- a/wallet/src/de/schildbach/wallet/database/AppDatabaseMigrations.kt
+++ b/wallet/src/de/schildbach/wallet/database/AppDatabaseMigrations.kt
@@ -79,5 +79,34 @@ class AppDatabaseMigrations {
                 )
             }
         }
+
+        val migration13to14 = object : Migration(13, 14) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL(
+                    """
+                    CREATE TABLE IF NOT EXISTS `imported_masternode_keys` (
+                        `proTxHash` BLOB NOT NULL, 
+                        `address` TEXT NOT NULL, 
+                        `votingPrivateKey` BLOB NOT NULL, 
+                        `votingPublicKey` BLOB NOT NULL, 
+                        `votingPubKeyHash` BLOB NOT NULL, 
+                        PRIMARY KEY(`proTxHash`)
+                    );
+                    """
+                )
+                database.execSQL(
+                    """
+                    CREATE TABLE IF NOT EXISTS `username_votes` (
+                        `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, 
+                        `username` TEXT NOT NULL, 
+                        `identity` TEXT NOT NULL, 
+                        `type` TEXT NOT NULL, 
+                        `timestamp` INTEGER NOT NULL
+                    )
+                    """
+                )
+            }
+
+        }
     }
 }
diff --git a/wallet/src/de/schildbach/wallet/database/dao/DashPayContactRequestDao.kt b/wallet/src/de/schildbach/wallet/database/dao/DashPayContactRequestDao.kt
index 23f622ae8e..ee1d16a1ef 100644
--- a/wallet/src/de/schildbach/wallet/database/dao/DashPayContactRequestDao.kt
+++ b/wallet/src/de/schildbach/wallet/database/dao/DashPayContactRequestDao.kt
@@ -49,7 +49,8 @@ interface DashPayContactRequestDao {
 
     @Query("SELECT COUNT(*) FROM dashpay_contact_request")
     suspend fun countAllRequests(): Int
-
+    @Query("SELECT COUNT(*) FROM dashpay_contact_request WHERE toUserId = :userId")
+    fun observeReceivedRequestsCount(userId: String): Flow<Int>
     @Query("DELETE FROM dashpay_contact_request")
     suspend fun clear()
 }
\ 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
new file mode 100644
index 0000000000..ee219c5adf
--- /dev/null
+++ b/wallet/src/de/schildbach/wallet/database/dao/ImportedMasternodeKeyDao.kt
@@ -0,0 +1,51 @@
+/*
+ * 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.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
+// kept in this table
+
+@Dao
+interface ImportedMasternodeKeyDao {
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insert(importedMasternodeKey: ImportedMasternodeKey)
+
+    @Update
+    suspend fun update(importedMasternodeKey: ImportedMasternodeKey)
+
+    @Query("SELECT * FROM imported_masternode_keys")
+    suspend fun getAll(): List<ImportedMasternodeKey>
+
+    @Query("SELECT * FROM imported_masternode_keys")
+    fun observeAll(): Flow<List<ImportedMasternodeKey>>
+
+    @Query("DELETE FROM imported_masternode_keys")
+    suspend fun clear()
+
+    @Query("DELETE FROM imported_masternode_keys WHERE proTxHash = :proTxHash")
+    suspend fun remove(proTxHash: Sha256Hash)
+
+    @Query("SELECT COUNT(*) > 0 FROM imported_masternode_keys WHERE proTxHash = :proTxHash")
+    suspend fun contains(proTxHash: Sha256Hash?): Boolean
+}
diff --git a/wallet/src/de/schildbach/wallet/database/dao/UsernameRequestDao.kt b/wallet/src/de/schildbach/wallet/database/dao/UsernameRequestDao.kt
index 470e82eff3..b42a0c7092 100644
--- a/wallet/src/de/schildbach/wallet/database/dao/UsernameRequestDao.kt
+++ b/wallet/src/de/schildbach/wallet/database/dao/UsernameRequestDao.kt
@@ -42,7 +42,7 @@ interface UsernameRequestDao {
         """
         SELECT * FROM username_requests 
             WHERE (:onlyWithLinks = 0) OR (:onlyWithLinks = 1 AND link IS NOT NULL)
-        ORDER BY username COLLATE NOCASE ASC
+        ORDER BY normalizedLabel COLLATE NOCASE ASC
          """
     )
     fun observeAll(onlyWithLinks: Boolean): Flow<List<UsernameRequest>>
@@ -50,13 +50,37 @@ interface UsernameRequestDao {
     @Query(
         """
         SELECT * FROM username_requests 
-            WHERE username IN (SELECT username FROM username_requests GROUP BY username HAVING COUNT(username) > 1)
+            WHERE normalizedLabel IN (SELECT normalizedLabel FROM username_requests GROUP BY normalizedLabel HAVING COUNT(normalizedLabel) > 1)
             AND (:onlyWithLinks = 0) OR (:onlyWithLinks = 1 AND link IS NOT NULL) 
-        ORDER BY username COLLATE NOCASE ASC
+        ORDER BY normalizedLabel COLLATE NOCASE ASC
         """
     )
     fun observeDuplicates(onlyWithLinks: Boolean): Flow<List<UsernameRequest>>
 
     @Query("DELETE FROM username_requests")
     suspend fun clear()
+
+    @Query(
+        """
+        DELETE FROM username_requests
+            WHERE requestId = :requestId;
+        """
+    )
+    suspend fun remove(requestId: String)
+
+    @Query(
+        """
+        UPDATE username_requests
+            SET isApproved = false
+            WHERE normalizedLabel = :normalizedLabel;
+        """
+    )
+    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
new file mode 100644
index 0000000000..db38599522
--- /dev/null
+++ b/wallet/src/de/schildbach/wallet/database/dao/UsernameVoteDao.kt
@@ -0,0 +1,46 @@
+/*
+ * 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.database.dao
+
+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 ORDER BY timestamp")
+    suspend fun getVotes(username: String): List<UsernameVote>
+
+    @Query("SELECT * FROM username_votes WHERE username = :username ORDER BY timestamp")
+    fun observeVotes(username: String): Flow<List<UsernameVote>>
+
+    @Query("DELETE FROM username_votes")
+    suspend fun clear()
+
+    @Query("DELETE FROM username_votes WHERE username == :username")
+    suspend fun remove(username: String)
+
+    @Query("SELECT * FROM username_votes")
+    suspend fun getAllVotes(): List<UsernameVote>
+}
diff --git a/wallet/src/de/schildbach/wallet/database/entity/BlockchainIdentityData.kt b/wallet/src/de/schildbach/wallet/database/entity/BlockchainIdentityData.kt
index 2b95dc621e..2121a4e8a6 100644
--- a/wallet/src/de/schildbach/wallet/database/entity/BlockchainIdentityData.kt
+++ b/wallet/src/de/schildbach/wallet/database/entity/BlockchainIdentityData.kt
@@ -162,7 +162,6 @@ open class BlockchainIdentityConfig @Inject constructor(
         val PRIVACY_MODE = stringPreferencesKey("privacy_mode")
         val BALANCE = longPreferencesKey("identity_balance")
 
-        // val REQUESTED_USERNAME = stringPreferencesKey("requested_username")
         val REQUESTED_USERNAME_LINK = stringPreferencesKey("requested_username_link")
         val CANCELED_REQUESTED_USERNAME_LINK = booleanPreferencesKey("cancelled_requested_username_link")
         val USERNAME_REQUESTED = stringPreferencesKey("username_requested")
@@ -244,6 +243,10 @@ open class BlockchainIdentityConfig @Inject constructor(
             blockchainIdentityData.usernameStatus?.let { prefs[USERNAME_REGISTRATION_STATUS] = it.name }
             blockchainIdentityData.privacyMode?.let { prefs[PRIVACY_MODE] = it.name }
             blockchainIdentityData.creditBalance?.let { prefs[BALANCE] = it.value }
+            blockchainIdentityData.usernameRequested?.let { prefs[USERNAME_REQUESTED] = it.name}
+            blockchainIdentityData.verificationLink?.let { prefs[REQUESTED_USERNAME_LINK] = it }
+            blockchainIdentityData.votingPeriodStart?.let { prefs[VOTING_PERIOD_START] = it }
+            blockchainIdentityData.cancelledVerificationLink?.let { prefs[CANCELED_REQUESTED_USERNAME_LINK] = it }
         }
     }
 
@@ -256,6 +259,10 @@ open class BlockchainIdentityConfig @Inject constructor(
             blockchainIdentityBaseData.creditFundingTxId?.let { prefs[ASSET_LOCK_TXID] = it.toString() }
             prefs[USING_INVITE] = blockchainIdentityBaseData.usingInvite
             blockchainIdentityBaseData.invite?.let { prefs[INVITE_LINK] = it.link.toString() }
+            blockchainIdentityBaseData.usernameRequested?.let { prefs[USERNAME_REQUESTED] = it.name}
+            blockchainIdentityBaseData.verificationLink?.let { prefs[REQUESTED_USERNAME_LINK] = it }
+            blockchainIdentityBaseData.votingPeriodStart?.let { prefs[VOTING_PERIOD_START] = it }
+            blockchainIdentityBaseData.cancelledVerificationLink?.let { prefs[CANCELED_REQUESTED_USERNAME_LINK] = it }
         }
     }
 
diff --git a/wallet/src/de/schildbach/wallet/database/entity/MasternodeKey.kt b/wallet/src/de/schildbach/wallet/database/entity/MasternodeKey.kt
new file mode 100644
index 0000000000..1090004dab
--- /dev/null
+++ b/wallet/src/de/schildbach/wallet/database/entity/MasternodeKey.kt
@@ -0,0 +1,35 @@
+/*
+ * 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.database.entity
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import org.bitcoinj.core.ECKey
+import org.bitcoinj.core.Sha256Hash
+
+@Entity(tableName = "imported_masternode_keys")
+data class ImportedMasternodeKey(
+    @PrimaryKey
+    val proTxHash: Sha256Hash,
+    val address: String,
+    val votingPrivateKey: ByteArray,
+    val votingPublicKey: ByteArray,
+    val votingPubKeyHash: ByteArray
+) {
+    fun toECKey(): ECKey = ECKey.fromPrivateAndPrecalculatedPublic(votingPrivateKey, votingPrivateKey)
+}
diff --git a/wallet/src/de/schildbach/wallet/database/entity/UsernameRequest.kt b/wallet/src/de/schildbach/wallet/database/entity/UsernameRequest.kt
index 9b68dfa83a..36f5ba1bd7 100644
--- a/wallet/src/de/schildbach/wallet/database/entity/UsernameRequest.kt
+++ b/wallet/src/de/schildbach/wallet/database/entity/UsernameRequest.kt
@@ -19,6 +19,12 @@ package de.schildbach.wallet.database.entity
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import de.schildbach.wallet.Constants
+import org.bitcoinj.core.NetworkParameters
+import java.util.concurrent.TimeUnit
+import org.bitcoinj.core.Base58
+import org.bitcoinj.core.Sha256Hash
+import org.dashj.platform.sdk.platform.Names
 
 @Entity(tableName = "username_requests")
 data class UsernameRequest(
@@ -34,8 +40,29 @@ data class UsernameRequest(
     val isApproved: Boolean
 ) {
     companion object {
+        val VOTING_PERIOD_MILLIS = if (Constants.NETWORK_PARAMETERS.id == NetworkParameters.ID_MAINNET) TimeUnit.DAYS.toMillis(14) else TimeUnit.MINUTES.toMillis(90)
+        val SUBMIT_PERIOD_MILLIS = VOTING_PERIOD_MILLIS / 2
         fun getRequestId(identity: String, username: String): String {
-            return String.format("%s %s", identity, username)
+            return String.format("%s-%s", identity, Names.normalizeString(username))
         }
+        fun block(username: String, normalizedLabel: String) = UsernameRequest(
+            "",
+            username,
+            normalizedLabel,
+            0L,
+            Base58.encode(Sha256Hash.ZERO_HASH.bytes),
+            null,
+            0,
+            0,
+            false
+        )
+    }
+
+    override fun equals(other: Any?): Boolean {
+        return other is UsernameRequest && requestId == other.requestId
+    }
+
+    override fun hashCode(): Int {
+        return requestId.hashCode()
     }
 }
diff --git a/wallet/src/de/schildbach/wallet/database/entity/UsernameVote.kt b/wallet/src/de/schildbach/wallet/database/entity/UsernameVote.kt
new file mode 100644
index 0000000000..21d10da73f
--- /dev/null
+++ b/wallet/src/de/schildbach/wallet/database/entity/UsernameVote.kt
@@ -0,0 +1,53 @@
+/*
+ * 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.database.entity
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import org.dashj.platform.dpp.voting.ResourceVoteChoice
+
+@Entity(tableName = "username_votes")
+data class UsernameVote(
+    @PrimaryKey(autoGenerate = true)
+    val id: Int,
+    val username: String,
+    val identity: String,
+    val type: String, // approve, abstain, lock
+    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/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/di/DatabaseModule.kt b/wallet/src/de/schildbach/wallet/di/DatabaseModule.kt
index d23abf80a0..ee6372a85a 100644
--- a/wallet/src/de/schildbach/wallet/di/DatabaseModule.kt
+++ b/wallet/src/de/schildbach/wallet/di/DatabaseModule.kt
@@ -39,7 +39,8 @@ object DatabaseModule {
         return Room.databaseBuilder(context, AppDatabase::class.java, "dash-wallet-database")
             .addMigrations(
                 AppDatabaseMigrations.migration11To12,
-                AppDatabaseMigrations.migration12To13
+                AppDatabaseMigrations.migration12To13,
+                AppDatabaseMigrations.migration13to14
             )
             // destructive migrations are used from versions 1 to 11
             .fallbackToDestructiveMigration()
@@ -111,4 +112,14 @@ object DatabaseModule {
     fun provideUsernameRequestDao(appDatabase: AppDatabase): UsernameRequestDao {
         return appDatabase.usernameRequestDao()
     }
+
+    @Provides
+    fun provideUsernameVotesDao(appDatabase: AppDatabase): UsernameVoteDao {
+        return appDatabase.usernameVoteDao()
+    }
+
+    @Provides
+    fun provideImportedMasternodeKeyDao(appDatabase: AppDatabase): ImportedMasternodeKeyDao {
+        return appDatabase.importedMasternodeKeyDao()
+    }
 }
diff --git a/wallet/src/de/schildbach/wallet/payments/SendCoinsTaskRunner.kt b/wallet/src/de/schildbach/wallet/payments/SendCoinsTaskRunner.kt
index 894e56ca7d..16e18d02e1 100644
--- a/wallet/src/de/schildbach/wallet/payments/SendCoinsTaskRunner.kt
+++ b/wallet/src/de/schildbach/wallet/payments/SendCoinsTaskRunner.kt
@@ -17,17 +17,18 @@
 package de.schildbach.wallet.payments
 
 import androidx.annotation.VisibleForTesting
-import androidx.lifecycle.viewModelScope
 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 +53,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 +67,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 +78,6 @@ class SendCoinsTaskRunner @Inject constructor(
     }
     private var coinJoinSend = false
     private val coroutineScope = CoroutineScope(Dispatchers.IO)
-
     init {
         coinJoinConfig
             .observeMode()
@@ -319,7 +324,6 @@ class SendCoinsTaskRunner @Inject constructor(
         if (checkBalanceConditions) {
             checkBalanceConditions(wallet, sendRequest.tx)
         }
-
         signSendRequest(sendRequest)
 
         try {
@@ -334,6 +338,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 +354,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/service/BlockchainServiceImpl.java b/wallet/src/de/schildbach/wallet/service/BlockchainServiceImpl.java
index 2ad50136c4..23856e6725 100644
--- a/wallet/src/de/schildbach/wallet/service/BlockchainServiceImpl.java
+++ b/wallet/src/de/schildbach/wallet/service/BlockchainServiceImpl.java
@@ -18,6 +18,7 @@
 package de.schildbach.wallet.service;
 
 import android.annotation.SuppressLint;
+import android.app.ForegroundServiceStartNotAllowedException;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ -41,6 +42,7 @@
 import android.os.PowerManager.WakeLock;
 import android.text.format.DateUtils;
 
+import androidx.annotation.RequiresApi;
 import androidx.core.app.NotificationCompat;
 import androidx.core.content.ContextCompat;
 import androidx.lifecycle.LifecycleService;
@@ -686,6 +688,10 @@ private void check() {
 
                 log.info("starting peergroup");
                 peerGroup = new PeerGroup(Constants.NETWORK_PARAMETERS, blockChain, headerChain);
+                if (Constants.SUPPORTS_PLATFORM) {
+                    platformRepo.getPlatform().setMasternodeListManager(application.getWallet().getContext().masternodeListManager);
+                    platformSyncService.resume();
+                }
                 if (resetMNListsOnPeerGroupStart) {
                     resetMNListsOnPeerGroupStart = false;
                     application.getWallet().getContext().masternodeListManager.setBootstrap(mnlistinfoBootStrapStream, qrinfoBootStrapStream, SimplifiedMasternodeListManager.SMLE_VERSION_FORMAT_VERSION);
@@ -959,7 +965,7 @@ public void onCreate() {
         wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, lockName);
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            startForeground();
+            startForegroundAndCatch();
         }
 
         final Wallet wallet = application.getWallet();
@@ -1041,11 +1047,6 @@ public void onCreate() {
 
         peerDiscoveryList.add(dnsDiscovery);
 
-        if (Constants.SUPPORTS_PLATFORM) {
-            platformRepo.getPlatform().setMasternodeListManager(application.getWallet().getContext().masternodeListManager);
-            platformSyncService.resume();
-        }
-
         updateAppWidget();
         FlowExtKt.observe(blockchainStateDao.observeState(), this, (blockchainState, continuation) -> {
             handleBlockchainStateNotification(blockchainState, mixingStatus, mixingProgress);
@@ -1120,7 +1121,7 @@ public int onStartCommand(final Intent intent, final int flags, final int startI
             //Restart service as a Foreground Service if it's synchronizing the blockchain
             Bundle extras = intent.getExtras();
             if (extras != null && extras.containsKey(START_AS_FOREGROUND_EXTRA)) {
-                startForeground();
+                startForegroundAndCatch();
             }
 
             log.info("service start command: " + intent + (intent.hasExtra(Intent.EXTRA_ALARM_COUNT)
@@ -1182,11 +1183,12 @@ private void startForeground() {
         //Shows ongoing notification promoting service to foreground service and
         //preventing it from being killed in Android 26 or later
         Notification notification = createNetworkSyncNotification(null);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             startForeground(Constants.NOTIFICATION_ID_BLOCKCHAIN_SYNC, notification,
                     ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC);
-        else
+        } else {
             startForeground(Constants.NOTIFICATION_ID_BLOCKCHAIN_SYNC, notification);
+        }
         foregroundService = ForegroundService.BLOCKCHAIN_SYNC;
     }
 
@@ -1198,6 +1200,30 @@ private void startForegroundCoinJoin() {
         foregroundService = ForegroundService.COINJOIN_MIXING;
     }
 
+    private void startForegroundAndCatch() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            try {
+                startForeground();
+            } catch (ForegroundServiceStartNotAllowedException e) {
+                log.info("failed to start in foreground", e);
+            }
+        } else {
+            startForeground();
+        }
+    }
+
+    private void startForegroundCoinJoinAndCatch() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            try {
+                startForegroundCoinJoin();
+            } catch (ForegroundServiceStartNotAllowedException e) {
+                log.info("failed to start in foreground", e);
+            }
+        } else {
+            startForegroundCoinJoin();
+        }
+    }
+
     @Override
     public void onDestroy() {
         log.info(".onDestroy()");
@@ -1374,14 +1400,11 @@ private void handleBlockchainStateNotification(BlockchainState blockchainState,
                 log.info("foreground service: {}", foregroundService);
                 if (foregroundService == ForegroundService.NONE) {
                     log.info("foreground service not active, create notification");
-                    startForegroundCoinJoin();
-                    //Notification notification = createCoinJoinNotification();
-                    //nm.notify(Constants.NOTIFICATION_ID_BLOCKCHAIN_SYNC, notification);
+                    startForegroundCoinJoinAndCatch();
                     foregroundService = ForegroundService.COINJOIN_MIXING;
                 } else {
                     log.info("foreground service active, update notification");
                     Notification notification = createCoinJoinNotification();
-                    //nm.cancel(Constants.NOTIFICATION_ID_BLOCKCHAIN_SYNC);
                     nm.notify(Constants.NOTIFICATION_ID_BLOCKCHAIN_SYNC, notification);
                 }
             }
@@ -1404,7 +1427,7 @@ public void forceForeground() {
             Intent intent = new Intent(this, BlockchainServiceImpl.class);
             ContextCompat.startForegroundService(this, intent);
             // call startForeground just after startForegroundService.
-            startForeground();
+            startForegroundAndCatch();
         }
     }
 
diff --git a/wallet/src/de/schildbach/wallet/service/platform/PlatformBroadcastService.kt b/wallet/src/de/schildbach/wallet/service/platform/PlatformBroadcastService.kt
index 489f5c63e2..02961d5c87 100644
--- a/wallet/src/de/schildbach/wallet/service/platform/PlatformBroadcastService.kt
+++ b/wallet/src/de/schildbach/wallet/service/platform/PlatformBroadcastService.kt
@@ -17,21 +17,31 @@
 
 package de.schildbach.wallet.service.platform
 
+import com.google.common.base.Preconditions
 import de.schildbach.wallet.database.entity.DashPayContactRequest
 import de.schildbach.wallet.database.entity.DashPayProfile
 import de.schildbach.wallet.security.SecurityGuard
 import de.schildbach.wallet.ui.dashpay.PlatformRepo
 import org.bitcoinj.core.Context
+import org.bitcoinj.core.ECKey
+import org.bitcoinj.core.KeyId
+import org.bitcoinj.core.Sha256Hash
 import org.bitcoinj.evolution.EvolutionContact
 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.dash.wallet.common.services.analytics.AnalyticsTimer
+import org.dashj.platform.dashpay.callback.SimpleSignerCallback
 import org.dashj.platform.dashpay.callback.WalletSignerCallback
+import org.dashj.platform.dpp.identifier.Identifier
+import org.dashj.platform.dpp.voting.ResourceVoteChoice
+import org.dashj.platform.dpp.voting.Vote
+import org.dashj.platform.sdk.Purpose
 import org.dashj.platform.wallet.IdentityVerifyDocument
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
+import java.io.ByteArrayOutputStream
 import javax.inject.Inject
 
 interface PlatformBroadcastService {
@@ -39,6 +49,12 @@ interface PlatformBroadcastService {
     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<Triple<ResourceVoteChoice, Vote?, Exception?>>
 }
 
 class PlatformDocumentBroadcastService @Inject constructor(
@@ -46,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) {
@@ -115,6 +131,54 @@ class PlatformDocumentBroadcastService @Inject constructor(
         return identityVerifyDocument
     }
 
+    override suspend fun broadcastUsernameVotes(
+        usernames: List<String>,
+        resourceVoteChoices: List<ResourceVoteChoice>,
+        masternodeKeys: List<ByteArray>,
+        encryptionKey: KeyParameter?
+    ): List<Triple<ResourceVoteChoice, Vote?, Exception?>> {
+        Preconditions.checkArgument(usernames.size == resourceVoteChoices.size)
+        val votes = arrayListOf<Triple<ResourceVoteChoice, Vote?, Exception?>>()
+        masternodeKeys.forEach { masternodeKeyBytes ->
+            // determine identity
+            val masternodeKey = ECKey.fromPrivate(masternodeKeyBytes)
+            val votingKeyId = KeyId.fromBytes(masternodeKey.pubKeyHash)
+            val boas = ByteArrayOutputStream(32 + 20)
+            val masternodes = walletDataProvider.wallet!!.context.masternodeListManager.masternodeList.getMasternodesByVotingKey(votingKeyId)
+            masternodes.forEach { masternode ->
+                try {
+                    boas.write(masternode.proTxHash.bytes)
+                    boas.write(masternodeKey.pubKeyHash)
+                    val idBytes = Sha256Hash.of(boas.toByteArray())
+                    val identity = platform.identities.get(Identifier.from(idBytes.bytes))
+                    val votingIdentityPublicKey = identity!!.publicKeys.first { it.purpose == Purpose.VOTING }
+
+                    usernames.forEachIndexed { index, username ->
+                        val resourceVoteChoice = resourceVoteChoices[index]
+                        try {
+                            val vote = platform.names.broadcastVote(
+                                resourceVoteChoice,
+                                username,
+                                masternode.proTxHash,
+                                votingIdentityPublicKey,
+                                SimpleSignerCallback(
+                                    mapOf(votingIdentityPublicKey to masternodeKey),
+                                    encryptionKey
+                                )
+                            )
+                            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)
+                }
+            }
+        }
+        return votes
+    }
+
     @Throws(Exception::class)
     override suspend fun broadcastUpdatedProfile(dashPayProfile: DashPayProfile, encryptionKey: KeyParameter): DashPayProfile {
         log.info("broadcast profile")
diff --git a/wallet/src/de/schildbach/wallet/service/platform/PlatformService.kt b/wallet/src/de/schildbach/wallet/service/platform/PlatformService.kt
index f39f8d0bd1..9920cf3ddf 100644
--- a/wallet/src/de/schildbach/wallet/service/platform/PlatformService.kt
+++ b/wallet/src/de/schildbach/wallet/service/platform/PlatformService.kt
@@ -136,7 +136,7 @@ class PlatformServiceImplementation @Inject constructor(
             for (check in checks) {
                 success += if (check.await()) 1 else 0
             }
-
+            log.info("platform available $success of 3: ${ success > 2}")
             return@withContext success >= 2
         }
     }
diff --git a/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt b/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt
index 1cb3f84bbb..68e5e6a5dc 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
@@ -42,6 +43,7 @@ import de.schildbach.wallet.database.entity.TransactionMetadataCacheItem
 import de.schildbach.wallet.database.entity.TransactionMetadataDocument
 import de.schildbach.wallet.database.entity.UsernameRequest
 import de.schildbach.wallet.livedata.SeriousError
+import de.schildbach.wallet.livedata.Status
 import de.schildbach.wallet.security.SecurityGuard
 import de.schildbach.wallet.service.BlockchainService
 import de.schildbach.wallet.service.BlockchainServiceImpl
@@ -57,6 +59,7 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import org.bitcoinj.core.Coin
 import org.bitcoinj.core.Context
+import org.bitcoinj.core.NetworkParameters
 import org.bitcoinj.core.Sha256Hash
 import org.bitcoinj.crypto.KeyCrypterException
 import org.bitcoinj.evolution.EvolutionContact
@@ -70,13 +73,14 @@ import org.dash.wallet.common.transactions.TransactionCategory
 import org.dash.wallet.common.util.TickerFlow
 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
 import org.slf4j.LoggerFactory
-import java.util.HashMap
-import java.util.HashSet
 import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicBoolean
@@ -98,6 +102,8 @@ interface PlatformSyncService {
     suspend fun updateContactRequests()
     fun postUpdateBloomFilters()
     suspend fun updateUsernameRequestsWithVotes()
+    suspend fun updateUsernameRequestWithVotes(username: String)
+    suspend fun checkUsernameVotingStatus()
 
     fun addContactsUpdatedListener(listener: OnContactsUpdated)
     fun removeContactsUpdatedListener(listener: OnContactsUpdated?)
@@ -124,7 +130,9 @@ class PlatformSynchronizationService @Inject constructor(
     private val dashPayProfileDao: DashPayProfileDao,
     private val dashPayContactRequestDao: DashPayContactRequestDao,
     private val invitationsDao: InvitationsDao,
-    private val usernameRequestDao: UsernameRequestDao
+    private val usernameRequestDao: UsernameRequestDao,
+    private val usernameVoteDao: UsernameVoteDao,
+    private val identityConfig: BlockchainIdentityConfig
 ) : PlatformSyncService {
 
     companion object {
@@ -220,7 +228,26 @@ class PlatformSynchronizationService @Inject constructor(
         try {
             val blockchainIdentityData = blockchainIdentityDataDao.load() ?: return
             if (blockchainIdentityData.creationState < BlockchainIdentityData.CreationState.DONE) {
+                // Is the Voting Period complete?
+                if (blockchainIdentityData.creationState == BlockchainIdentityData.CreationState.VOTING) {
+                    val timeWindow = UsernameRequest.VOTING_PERIOD_MILLIS
+                    if (System.currentTimeMillis() - blockchainIdentityData.votingPeriodStart!! >= timeWindow) {
+                        val resource = platformRepo.getUsername(blockchainIdentityData.username!!)
+                        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
+                                platformRepo.updateBlockchainIdentityData(blockchainIdentityData)
+                            }
+                        }
+                    }
+                }
                 log.info("update contacts not completed username registration/recovery is not complete")
+                // if username creation or request is not complete, then allow the sync process to finish
+                if (preDownloadBlocks.get()) {
+                    finishPreBlockDownload()
+                }
                 return
             }
 
@@ -278,7 +305,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}")
                 }
             }
@@ -306,7 +333,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}")
                 }
             }
@@ -352,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
@@ -360,6 +386,7 @@ class PlatformSynchronizationService @Inject constructor(
             }
         }
         // This needs to be here to ensure that the pre-block download stage always completes
+        // This block used to be the above finally block, but was moved here to fix some issues
         if (preDownloadBlocks.get()) {
             finishPreBlockDownload()
         }
@@ -454,9 +481,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
@@ -1024,31 +1051,219 @@ 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() {
-        val contestedNames = platform.platform.names.getContestedNames()
-        for (name in contestedNames) {
-            val voteContender = platform.platform.names.getVoteContenders(name)
-            voteContender.map.forEach { (identifier, contender) ->
+        checkUsernameVotingStatus()
+        log.info("updateUsernameRequestsWithVotes starting")
+        try {
+            log.info("updateUsernameRequestsWithVotes: getCurrentVotePolls start")
+            val votePolls = platform.platform.names.getCurrentVotePolls()
+            log.info("updateUsernameRequestsWithVotes: getCurrentVotePolls end")
+            // usernameRequestDao.clear()
+            // val myIdentifier = platformRepo.blockchainIdentity.uniqueIdentifier
+            val currentRequestList = usernameRequestDao.getAll().toMutableList()
+            val currentUsernames = arrayListOf<String>()
+            for (votePoll in votePolls) {
+                try {
+                    val name :String? = when (votePoll) {
+                        is ContestedDocumentResourceVotePoll -> {
+                            when (votePoll.indexValues[1]) {
+                                is String -> votePoll.indexValues[1] as String
+                                is PlatformValue -> {
+                                    val value = votePoll.indexValues[1] as PlatformValue
+                                    when (value.tag) {
+                                        PlatformValue.Tag.Text -> value.text
+                                        else -> null
+                                    }
+                                }
+                                else -> null
+                            }
+                        }
+                        else -> null
+                    }
 
-                val contestedDocument = DomainDocument(
-                    platform.platform.names.deserialize(contender.seralizedDocument!!)
-                )
+                    name?.let { normalizedLabel ->
+                        val voteContender = platformRepo.getVoteContenders(normalizedLabel)
 
-                val identityVerifyDocument = IdentityVerify(platform.platform).get(identifier, name)
-
-                val usernameRequest = UsernameRequest(
-                    UsernameRequest.getRequestId(identifier.toString(), name),
-                    contestedDocument.label,
-                    name,
-                    contestedDocument.createdAt?.div(1000) ?: -1L,
-                    identifier.toString(),
-                    identityVerifyDocument?.url,
-                    contender.votes,
-                    voteContender.lockVoteTally,
-                    false
-                )
-                usernameRequestDao.insert(usernameRequest)
+                        voteContender.map.forEach { (identifier, contender) ->
+
+                            if (voteContender.winner.isEmpty) {
+                                val contestedDocument = contender.seralizedDocument?.let { serialized ->
+                                    DomainDocument(
+                                        platform.platform.names.deserialize(serialized)
+                                    )
+                                }
+
+                                if (contestedDocument != null) {
+                                    val identityVerifyDocument = IdentityVerify(platform.platform).get(identifier, name)
+
+                                    val requestId = UsernameRequest.getRequestId(identifier.toString(), normalizedLabel)
+                                    val previousUsernameRequest = usernameRequestDao.getRequest(requestId)
+
+                                    val usernameRequest = UsernameRequest(
+                                        requestId = requestId,
+                                        username = contestedDocument.label,
+                                        normalizedLabel = name,
+                                        createdAt = contestedDocument.createdAt ?: -1L,
+                                        identity = identifier.toString(),
+                                        link = identityVerifyDocument?.url,
+                                        votes = contender.votes,
+                                        lockVotes = voteContender.lockVoteTally,
+                                        isApproved = previousUsernameRequest?.isApproved ?: false
+                                    )
+                                    usernameRequestDao.insert(usernameRequest)
+                                    currentRequestList.remove(usernameRequest)
+                                    currentUsernames.add(usernameRequest.normalizedLabel)
+                                } else {
+                                    // voting is complete
+                                    usernameRequestDao.remove(
+                                        UsernameRequest.getRequestId(identifier.toString(), name)
+                                    )
+                                    // remove related votes
+                                    usernameVoteDao.remove(name)
+                                }
+                            } else {
+                                // there is a winner
+                                usernameRequestDao.remove(
+                                    UsernameRequest.getRequestId(identifier.toString(), name)
+                                )
+                                // remove related votes
+                                usernameVoteDao.remove(name)
+                            }
+                        }
+                    }
+                } catch (e: Exception) {
+                    log.warn("problem getting vote polls", e)
+                }
+            }
+
+            // check the remaining items to ensure voting has ended
+            currentRequestList.forEach { request ->
+                val voteContender = platformRepo.getVoteContenders(request.normalizedLabel)
+                if (voteContender.winner.isPresent) {
+                    // remove request
+                    usernameRequestDao.remove(request.requestId)
+                    // remove related votes
+                    usernameVoteDao.remove(request.normalizedLabel)
+                }
+            }
+            // check votes and remove those from previous vote polls
+            usernameVoteDao.getAllVotes().forEach { vote ->
+                if (!currentUsernames.contains(vote.username)) {
+                    usernameVoteDao.remove(vote.username)
+                }
+            }
+        } catch (e: Exception) {
+            log.info("problem obtaining votes:", e)
+        } finally {
+            log.info("updateUsernameRequestsWithVotes complete")
+        }
+    }
+
+    /*override*/ suspend fun updateUsernameRequestsWithVotes_old() {
+        checkUsernameVotingStatus()
+        try {
+            val contestedNames = platform.platform.names.getContestedNames()
+            // 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)
+     */
+    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)
         }
     }
 
@@ -1113,6 +1328,11 @@ class PlatformSynchronizationService @Inject constructor(
                 return@launch
             }
 
+            // TODO: ideally we shoud do this, but there is not a good way
+            // to determine if an EvoNode has Evolution
+            // platform.setMasternodeListManager(walletApplication.wallet!!.context.masternodeListManager)
+
+
             // first check to see if there is a blockchain identity
             // or if the previous restore is incomplete
             val identityData = blockchainIdentityDataDao.load()
@@ -1138,15 +1358,64 @@ class PlatformSynchronizationService @Inject constructor(
                     finishPreBlockDownload()
                 }
             }
-
             // update contacts, profiles and other platform data
-            else if (!updatingContacts.get()) {
-                updateContactRequests()
+            else {
+                checkVotingStatus(identityData)
+
+                if (!updatingContacts.get()) {
+                    updateContactRequests()
+                }
             }
             initSync()
         }
     }
 
+    override suspend fun checkUsernameVotingStatus() {
+        identityConfig.load()?.let {
+            checkVotingStatus(it)
+        }
+    }
+
+    suspend fun checkVotingStatus(identityData: BlockchainIdentityData) {
+        if (identityData.username != null && identityData.creationState == BlockchainIdentityData.CreationState.VOTING) {
+            // query username first to load the data contract cache
+            val resource = platformRepo.getUsername(identityData.username!!)
+            val voteResults = platformRepo.getVoteContenders(identityData.username!!)
+            if (voteResults.winner.isPresent) {
+                val winner = voteResults.winner.get().first
+                when {
+                    winner.isLocked -> {
+                        identityData.usernameRequested = UsernameRequestStatus.LOCKED
+                        syncScope.launch { platformRepo.updateBlockchainIdentityData(identityData) }
+                    }
+
+                    winner.isWinner(Identifier.from(identityData.userId)) -> {
+                        identityData.usernameRequested = UsernameRequestStatus.APPROVED
+                        syncScope.launch { platformRepo.updateBlockchainIdentityData(identityData) }
+                    }
+
+                    winner.noWinner -> {
+                        // ?
+                    }
+
+                    else -> {
+                        identityData.usernameRequested = UsernameRequestStatus.LOST_VOTE
+                        syncScope.launch { platformRepo.updateBlockchainIdentityData(identityData) }
+                    }
+                }
+                if (resource.status == Status.SUCCESS && resource.data != null) {
+                    val domainDocument = DomainDocument(resource.data)
+                    if (domainDocument.dashUniqueIdentityId == identityData.identity?.id) {
+                        identityData.creationState = BlockchainIdentityData.CreationState.DONE_AND_DISMISS
+                        platformRepo.updateBlockchainIdentityData(identityData)
+                    }
+                } else {
+
+                }
+            }
+        }
+    }
+
     override fun addContactsUpdatedListener(listener: OnContactsUpdated) {
         onContactsUpdatedListeners.add(listener)
     }
diff --git a/wallet/src/de/schildbach/wallet/ui/CreateUsernameActivity.kt b/wallet/src/de/schildbach/wallet/ui/CreateUsernameActivity.kt
index 9f015014dc..dbd3f91879 100644
--- a/wallet/src/de/schildbach/wallet/ui/CreateUsernameActivity.kt
+++ b/wallet/src/de/schildbach/wallet/ui/CreateUsernameActivity.kt
@@ -26,6 +26,7 @@ import androidx.navigation.fragment.NavHostFragment
 import dagger.hilt.android.AndroidEntryPoint
 import de.schildbach.wallet.data.InvitationLinkData
 import de.schildbach.wallet.database.entity.BlockchainIdentityBaseData
+import de.schildbach.wallet.database.entity.BlockchainIdentityData
 import de.schildbach.wallet.ui.dashpay.DashPayViewModel
 import de.schildbach.wallet.ui.dashpay.PlatformPaymentConfirmDialog
 import de.schildbach.wallet.ui.username.CreateUsernameActions
@@ -126,7 +127,12 @@ class CreateUsernameActivity : LockScreenActivity() {
                 fromOnboardng = fromOnboardng
             )
 
-            if (requestUserNameViewModel.isUserNameRequested()) {
+            if (requestUserNameViewModel.isUserNameRequested() &&
+                !requestUserNameViewModel.isUsernameLocked() &&
+                !requestUserNameViewModel.isUsernameLostAfterVoting() &&
+                (requestUserNameViewModel.identity?.creationState
+                    ?: BlockchainIdentityData.CreationState.NONE) >= BlockchainIdentityData.CreationState.VOTING
+            ) {
                 navGraph.setStartDestination(R.id.votingRequestDetailsFragment)
             } else {
                 if (!dashPayViewModel.isDashPayInfoShown()) {
@@ -136,7 +142,6 @@ class CreateUsernameActivity : LockScreenActivity() {
                 }
             }
 
-
             navController.graph = navGraph
             navController.setGraph(navController.graph, bundle)
         }
diff --git a/wallet/src/de/schildbach/wallet/ui/EditProfileActivity.kt b/wallet/src/de/schildbach/wallet/ui/EditProfileActivity.kt
index 5f1076a9db..5fe979fa32 100644
--- a/wallet/src/de/schildbach/wallet/ui/EditProfileActivity.kt
+++ b/wallet/src/de/schildbach/wallet/ui/EditProfileActivity.kt
@@ -37,6 +37,7 @@ import android.view.WindowManager
 import android.widget.Toast
 import androidx.activity.result.ActivityResult
 import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.PickVisualMediaRequest
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.core.content.ContextCompat
@@ -72,6 +73,7 @@ import org.bitcoinj.script.ScriptBuilder
 import org.bitcoinj.wallet.AuthenticationKeyChain
 import org.bitcoinj.wallet.AuthenticationKeyChainGroup
 import org.bitcoinj.wallet.authentication.AuthenticationGroupExtension
+import org.dash.wallet.common.services.analytics.AnalyticsConstants
 import org.dash.wallet.common.ui.avatar.ProfilePictureDisplay
 import org.dash.wallet.common.ui.avatar.ProfilePictureHelper
 import org.dash.wallet.common.ui.avatar.ProfilePictureTransformation
@@ -103,8 +105,7 @@ class EditProfileActivity : LockScreenActivity() {
     private var uploadProfilePictureStateDialog: UploadProfilePictureStateDialog? = null
     private lateinit var takePicturePermissionLauncher: ActivityResultLauncher<String>
     private lateinit var takePictureLauncher: ActivityResultLauncher<Uri>
-    private lateinit var choosePicturePermissionLauncher: ActivityResultLauncher<String>
-    private lateinit var chooseImageLauncher: ActivityResultLauncher<String>
+    private lateinit var chooseImageLauncher: ActivityResultLauncher<PickVisualMediaRequest>
     private lateinit var cropImageLauncher: ActivityResultLauncher<Intent>
     private lateinit var googleDriveSignInLauncher: ActivityResultLauncher<Intent>
 
@@ -211,7 +212,7 @@ class EditProfileActivity : LockScreenActivity() {
         selectProfilePictureSharedViewModel.onChoosePictureCallback.observe(this) {
             imitateUserInteraction()
             editProfileViewModel.pictureSource = "gallery"
-            choosePictureWithPermission()
+            choosePicture()
         }
 
         editProfileViewModel.onTmpPictureReadyForEditEvent.observe(this) {
@@ -234,15 +235,8 @@ class EditProfileActivity : LockScreenActivity() {
             turnOnAutoLogout()
         }
 
-        choosePicturePermissionLauncher =  registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted: Boolean ->
-            if (isGranted) {
-                choosePicture()
-            } else {
-                // Handle the case where permission is denied
-            }
-        }
         // Initialize the launchers
-        chooseImageLauncher = registerForActivityResult(ActivityResultContracts.GetContent()) { selectedImage: Uri? ->
+        chooseImageLauncher = registerForActivityResult(ActivityResultContracts.PickVisualMedia()) { selectedImage: Uri? ->
             // Handle the picked image
             if (selectedImage != null) {
                 // your code to handle the image
@@ -464,6 +458,7 @@ class EditProfileActivity : LockScreenActivity() {
             editProfileViewModel.dashPayProfile.value!!.avatarUrl
         }
 
+        editProfileViewModel.logEvent(AnalyticsConstants.MoreMenu.UPDATE_PROFILE)
         editProfileViewModel.broadcastUpdateProfile(displayName, publicMessage, avatarUrl ?: "")
         binding.save.isEnabled = false
         finish()
@@ -493,24 +488,6 @@ class EditProfileActivity : LockScreenActivity() {
         }
     }
 
-    private fun choosePictureWithPermission() {
-        // TODO: see https://android-developers.googleblog.com/2023/08/choosing-right-storage-experience.html
-        // for android 14 changes
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU &&
-            (ContextCompat.checkSelfPermission(this, READ_MEDIA_IMAGES) == PERMISSION_GRANTED)
-        ) {
-            // Full access on Android 13+
-            choosePicture()
-        } else if (ContextCompat.checkSelfPermission(this, READ_EXTERNAL_STORAGE) == PERMISSION_GRANTED) {
-            // Full access up to Android 12
-            choosePicture()
-        } else {
-            // Access denied, so ask for permission
-            val permission = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) READ_MEDIA_IMAGES else READ_EXTERNAL_STORAGE
-            choosePicturePermissionLauncher.launch(permission)
-        }
-    }
-
     private fun selectImage() {
         SelectProfilePictureDialog.createDialog()
             .show(supportFragmentManager, "selectPictureDialog")
@@ -519,7 +496,7 @@ class EditProfileActivity : LockScreenActivity() {
     private fun choosePicture() {
         if (editProfileViewModel.createTmpPictureFile()) {
             turnOffAutoLogout()
-            chooseImageLauncher.launch("image/*")
+            chooseImageLauncher.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly))
         } else {
             Toast.makeText(this, "Unable to create temporary file", Toast.LENGTH_LONG).show()
         }
diff --git a/wallet/src/de/schildbach/wallet/ui/InviteHandlerViewModel.kt b/wallet/src/de/schildbach/wallet/ui/InviteHandlerViewModel.kt
index dbdd8339be..0f05295c10 100644
--- a/wallet/src/de/schildbach/wallet/ui/InviteHandlerViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/InviteHandlerViewModel.kt
@@ -21,6 +21,7 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
 import com.google.firebase.dynamiclinks.FirebaseDynamicLinks
 import dagger.hilt.android.lifecycle.HiltViewModel
+import de.schildbach.wallet.Constants
 import de.schildbach.wallet.database.dao.DashPayProfileDao
 import de.schildbach.wallet.data.InvitationLinkData
 import de.schildbach.wallet.database.entity.BlockchainIdentityConfig
@@ -60,6 +61,11 @@ class InviteHandlerViewModel @Inject constructor(
     }
 
     fun handleInvite(invite: InvitationLinkData) {
+        // TODO: remove this if block when Invite functionality is restored
+        if (!Constants.SUPPORTS_INVITES) {
+            log.info("invite ignored since they are currently disabled with Constants.SUPPORTS_INVITES = false")
+            return
+        }
         inviteData.value = Resource.loading()
         viewModelScope.launch(Dispatchers.IO) {
             try {
diff --git a/wallet/src/de/schildbach/wallet/ui/SearchUserActivity.kt b/wallet/src/de/schildbach/wallet/ui/SearchUserActivity.kt
index 778c931526..3f3e731c83 100644
--- a/wallet/src/de/schildbach/wallet/ui/SearchUserActivity.kt
+++ b/wallet/src/de/schildbach/wallet/ui/SearchUserActivity.kt
@@ -33,6 +33,7 @@ import androidx.activity.viewModels
 import androidx.constraintlayout.widget.ConstraintSet
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.text.HtmlCompat
+import androidx.core.view.isVisible
 import androidx.core.widget.doAfterTextChanged
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -40,6 +41,7 @@ import androidx.transition.ChangeBounds
 import androidx.transition.Transition
 import androidx.transition.TransitionManager
 import dagger.hilt.android.AndroidEntryPoint
+import de.schildbach.wallet.Constants
 import de.schildbach.wallet.Constants.USERNAME_MIN_LENGTH
 import org.dash.wallet.common.data.entity.BlockchainState
 import de.schildbach.wallet.data.UsernameSearchResult
@@ -53,6 +55,7 @@ import de.schildbach.wallet_test.databinding.ActivitySearchDashpayProfileRootBin
 import kotlinx.coroutines.launch
 import org.bitcoinj.wallet.AuthenticationKeyChain
 import org.bitcoinj.wallet.authentication.AuthenticationGroupExtension
+import org.dash.wallet.common.services.analytics.AnalyticsConstants
 import org.dash.wallet.common.ui.dialogs.AdaptiveDialog
 import org.dash.wallet.common.util.observe
 
@@ -162,9 +165,13 @@ class SearchUserActivity : LockScreenActivity(), OnItemClickListener, OnContactR
             inviteFriendHintViewDashpayProfile1.root.setOnClickListener {
                 startInviteFlow()
             }
+            //TODO: remove this line when INVITES are supported
+            inviteFriendHintViewDashpayProfile1.root.isVisible = Constants.SUPPORTS_INVITES
             userSearchEmptyResult.inviteFriendHintViewEmptyResult.root.setOnClickListener {
                 startInviteFlow()
             }
+            //TODO: remove this line when INVITES are supported
+            userSearchEmptyResult.inviteFriendHintViewEmptyResult.root.isVisible = Constants.SUPPORTS_INVITES
         }
 
         binding.networkUnavailable.networkErrorSubtitle.setText(R.string.network_error_user_search)
@@ -305,6 +312,7 @@ class SearchUserActivity : LockScreenActivity(), OnItemClickListener, OnContactR
     }
 
     override fun onAcceptRequest(usernameSearchResult: UsernameSearchResult, position: Int) {
+        dashPayViewModel.logEvent(AnalyticsConstants.UsersContacts.ACCEPT_REQUEST)
         // need to check balance
         dashPayViewModel.sendContactRequest(usernameSearchResult.fromContactRequest!!.userId)
 
diff --git a/wallet/src/de/schildbach/wallet/ui/SettingsActivity.kt b/wallet/src/de/schildbach/wallet/ui/SettingsActivity.kt
index 80fcb64a78..3889838393 100644
--- a/wallet/src/de/schildbach/wallet/ui/SettingsActivity.kt
+++ b/wallet/src/de/schildbach/wallet/ui/SettingsActivity.kt
@@ -28,7 +28,6 @@ import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import dagger.hilt.android.AndroidEntryPoint
-import de.schildbach.wallet.Constants
 import de.schildbach.wallet.WalletBalanceWidgetProvider
 import de.schildbach.wallet.service.CoinJoinMode
 import de.schildbach.wallet.service.MixingStatus
@@ -45,7 +44,6 @@ import kotlinx.coroutines.launch
 import org.dash.wallet.common.data.WalletUIConfig
 import org.dash.wallet.common.services.SystemActionsService
 import org.dash.wallet.common.services.analytics.AnalyticsConstants
-import org.dash.wallet.common.services.analytics.AnalyticsService
 import org.dash.wallet.common.ui.dialogs.AdaptiveDialog
 import org.dash.wallet.common.ui.exchange_rates.ExchangeRatesDialog
 import org.dash.wallet.common.util.observe
@@ -58,8 +56,6 @@ class SettingsActivity : LockScreenActivity() {
     private lateinit var binding: ActivitySettingsBinding
     private val viewModel: SettingsViewModel by viewModels()
     @Inject
-    lateinit var analytics: AnalyticsService
-    @Inject
     lateinit var systemActions: SystemActionsService
     @Inject
     lateinit var walletUIConfig: WalletUIConfig
@@ -73,12 +69,12 @@ class SettingsActivity : LockScreenActivity() {
         binding.appBar.toolbar.setNavigationOnClickListener { finish() }
 
         binding.about.setOnClickListener {
-            analytics.logEvent(AnalyticsConstants.Settings.ABOUT, mapOf())
+            viewModel.logEvent(AnalyticsConstants.Settings.ABOUT)
             startActivity(Intent(this, AboutActivity::class.java))
         }
         binding.localCurrency.setOnClickListener {
             lifecycleScope.launch {
-                analytics.logEvent(AnalyticsConstants.Settings.LOCAL_CURRENCY, mapOf())
+                viewModel.logEvent(AnalyticsConstants.Settings.LOCAL_CURRENCY)
                 val currentOption = walletUIConfig.getExchangeCurrencyCode()
                 ExchangeRatesDialog(currentOption) { rate, _, dialog ->
                     setSelectedCurrency(rate.currencyCode)
@@ -141,6 +137,7 @@ class SettingsActivity : LockScreenActivity() {
 
                 val intent = Intent(this@SettingsActivity, CoinJoinActivity::class.java)
                 intent.putExtra(CoinJoinActivity.FIRST_TIME_EXTRA, shouldShowFirstTimeInfo)
+                viewModel.logEvent(AnalyticsConstants.Settings.COINJOIN)
                 startActivity(intent)
             }
         }
@@ -209,13 +206,13 @@ class SettingsActivity : LockScreenActivity() {
         ).show(this) {
             if (it == true) {
                 log.info("manually initiated blockchain reset")
-                analytics.logEvent(AnalyticsConstants.Settings.RESCAN_BLOCKCHAIN_RESET, mapOf())
+                viewModel.logEvent(AnalyticsConstants.Settings.RESCAN_BLOCKCHAIN_RESET)
 
                 walletApplication.resetBlockchain()
                 configuration.updateLastBlockchainResetTime()
                 startActivity(MainActivity.createIntent(this@SettingsActivity))
             } else {
-                analytics.logEvent(AnalyticsConstants.Settings.RESCAN_BLOCKCHAIN_DISMISS, mapOf())
+                viewModel.logEvent(AnalyticsConstants.Settings.RESCAN_BLOCKCHAIN_DISMISS)
             }
         }
     }
diff --git a/wallet/src/de/schildbach/wallet/ui/coinjoin/CoinJoinLevelFragment.kt b/wallet/src/de/schildbach/wallet/ui/coinjoin/CoinJoinLevelFragment.kt
index e4b4e51e44..9caa149593 100644
--- a/wallet/src/de/schildbach/wallet/ui/coinjoin/CoinJoinLevelFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/coinjoin/CoinJoinLevelFragment.kt
@@ -57,9 +57,11 @@ class CoinJoinLevelFragment : Fragment(R.layout.fragment_coinjoin_level) {
                 if (viewModel.isMixing) {
                     if (confirmStopMixing()) {
                         viewModel.setMode(CoinJoinMode.NONE)
+                        viewModel.logEvent(AnalyticsConstants.CoinJoinPrivacy.COINJOIN_STOP_MIXING)
                         requireActivity().finish()
                     }
                 } else {
+                    viewModel.logEvent(AnalyticsConstants.CoinJoinPrivacy.COINJOIN_START_MIXING)
                     viewModel.setMode(selectedCoinJoinMode)
                     requireActivity().finish()
                 }
diff --git a/wallet/src/de/schildbach/wallet/ui/dashpay/BaseContactsViewModel.kt b/wallet/src/de/schildbach/wallet/ui/dashpay/BaseContactsViewModel.kt
new file mode 100644
index 0000000000..b4464a2168
--- /dev/null
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/BaseContactsViewModel.kt
@@ -0,0 +1,51 @@
+/*
+ * 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.dashpay
+
+import androidx.lifecycle.*
+import de.schildbach.wallet.database.dao.DashPayContactRequestDao
+import de.schildbach.wallet.database.dao.DashPayProfileDao
+import de.schildbach.wallet.database.entity.BlockchainIdentityConfig
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.*
+
+// base view model that keeps track of contact requests
+@OptIn(ExperimentalCoroutinesApi::class)
+open class BaseContactsViewModel(
+    blockchainIdentityDataDao: BlockchainIdentityConfig,
+    dashPayProfileDao: DashPayProfileDao,
+    protected val contactRequestDao: DashPayContactRequestDao
+) : BaseProfileViewModel(blockchainIdentityDataDao, dashPayProfileDao) {
+
+    private val _hasContacts = MutableStateFlow(false)
+    val hasContacts: StateFlow<Boolean>
+        get() = _hasContacts
+
+    init {
+        blockchainIdentityDataDao.observe(BlockchainIdentityConfig.IDENTITY_ID)
+            .filterNotNull()
+            .flatMapLatest {
+                val size = contactRequestDao.loadFromOthers(it).size
+                println(size)
+                contactRequestDao.observeReceivedRequestsCount(it)
+            }
+            .onEach {
+                _hasContacts.value = it != 0
+            }
+            .launchIn(viewModelScope)
+    }
+}
diff --git a/wallet/src/de/schildbach/wallet/ui/dashpay/BaseProfileViewModel.kt b/wallet/src/de/schildbach/wallet/ui/dashpay/BaseProfileViewModel.kt
index eb19d8467f..9b7dfa1107 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/BaseProfileViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/BaseProfileViewModel.kt
@@ -24,6 +24,7 @@ import de.schildbach.wallet.database.entity.DashPayProfile
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.*
 
+// base view model that keeps track of the identity and profile information
 @OptIn(ExperimentalCoroutinesApi::class)
 open class BaseProfileViewModel(
     val blockchainIdentityDataDao: BlockchainIdentityConfig,
diff --git a/wallet/src/de/schildbach/wallet/ui/dashpay/ContactsFragment.kt b/wallet/src/de/schildbach/wallet/ui/dashpay/ContactsFragment.kt
index 2a0d1b6f07..548e77286d 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/ContactsFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/ContactsFragment.kt
@@ -57,6 +57,7 @@ import org.dash.wallet.common.services.analytics.AnalyticsConstants
 import org.dash.wallet.common.ui.dialogs.AdaptiveDialog
 import org.dash.wallet.common.ui.observeOnDestroy
 import org.dash.wallet.common.ui.viewBinding
+import org.dash.wallet.common.util.Constants
 import org.dash.wallet.common.util.KeyboardUtil
 import org.dash.wallet.common.util.observe
 import org.dash.wallet.common.util.safeNavigate
@@ -161,6 +162,7 @@ class ContactsFragment : Fragment(),
 
             // Developer Mode Feature
             // Hide the invite UI
+            emptyStatePane.inviteHintLayout.root.isVisible = de.schildbach.wallet.Constants.SUPPORTS_INVITES
             emptyStatePane.inviteHintLayout.inviteFriendHint.setOnClickListener {
                 lifecycleScope.launch {
                     val inviteHistory = dashPayViewModel.getInviteHistory()
diff --git a/wallet/src/de/schildbach/wallet/ui/dashpay/CreateIdentityService.kt b/wallet/src/de/schildbach/wallet/ui/dashpay/CreateIdentityService.kt
index b4eb672549..6e28c8b780 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/CreateIdentityService.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/CreateIdentityService.kt
@@ -23,6 +23,7 @@ import de.schildbach.wallet.service.CoinJoinMode
 import de.schildbach.wallet.service.platform.PlatformSyncService
 import de.schildbach.wallet.ui.dashpay.UserAlert.Companion.INVITATION_NOTIFICATION_ICON
 import de.schildbach.wallet.ui.dashpay.UserAlert.Companion.INVITATION_NOTIFICATION_TEXT
+import de.schildbach.wallet.ui.dashpay.work.GetUsernameVotingResultOperation
 import de.schildbach.wallet.ui.dashpay.work.SendContactRequestOperation
 import io.grpc.Status
 import io.grpc.StatusRuntimeException
@@ -32,6 +33,7 @@ import org.bitcoinj.core.RejectedTransactionException
 import org.bitcoinj.core.TransactionConfidence
 import org.bitcoinj.evolution.AssetLockTransaction
 import org.bitcoinj.wallet.authentication.AuthenticationGroupExtension
+import org.bouncycastle.crypto.params.Blake3Parameters.context
 import org.bouncycastle.crypto.params.KeyParameter
 import org.dash.wallet.common.Configuration
 import org.dash.wallet.common.services.analytics.AnalyticsConstants
@@ -174,6 +176,7 @@ class CreateIdentityService : LifecycleService() {
     private val createIdentityExceptionHandler = CoroutineExceptionHandler { _, exception ->
         log.error(exception.message, exception)
         analytics.logError(exception, "Failed to create Identity")
+        analytics.logEvent(AnalyticsConstants.UsersContacts.CREATE_USERNAME_ERROR, mapOf())
 
         GlobalScope.launch {
             var isInvite = false
@@ -329,6 +332,19 @@ class CreateIdentityService : LifecycleService() {
             } else if (blockchainIdentityData.creationState >= CreationState.IDENTITY_REGISTERED) {
                 isRetry = true
             }
+
+            if (blockchainIdentityData.creationState == CreationState.USERNAME_REGISTERING) {
+                if (blockchainIdentityData.creationStateErrorMessage?.contains("preorderDocument was not found with a salted domain hash") == true) {
+                    blockchainIdentityData.creationState = CreationState.PREORDER_REGISTERING
+                    platformRepo.updateBlockchainIdentityData(blockchainIdentityData)
+                } else if (retryWithNewUserName) {
+                    // lets rewind the state to allow for a new username registration or request
+                    // it may have failed later in the process
+                    if (blockchainIdentityData.creationState > CreationState.USERNAME_REGISTERING) {
+                        blockchainIdentityData.creationState = CreationState.USERNAME_REGISTERING
+                    }
+                }
+            }
         }
 
         platformRepo.resetIdentityCreationStateError(blockchainIdentityData)
@@ -386,6 +402,15 @@ class CreateIdentityService : LifecycleService() {
             // If the tx is in a block, seen by a peer, InstantSend lock, then it is considered confirmed
             platformRepo.updateBlockchainIdentityData(blockchainIdentityData, blockchainIdentity)
         }
+
+        // did we fail in the previous attempt - lost the vote
+        val retryAfterLostUsernameRequest = blockchainIdentityData.creationState == CreationState.VOTING &&
+                blockchainIdentityData.usernameRequested == UsernameRequestStatus.LOST_VOTE ||
+                blockchainIdentityData.usernameRequested == UsernameRequestStatus.LOCKED
+        if (retryAfterLostUsernameRequest) {
+            platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.CREDIT_FUNDING_TX_CONFIRMED)
+        }
+
         timerStep1.logTiming()
         val timerStep2 = AnalyticsTimer(analytics, log, AnalyticsConstants.Process.PROCESS_USERNAME_CREATE_STEP_2)
 
@@ -396,7 +421,6 @@ class CreateIdentityService : LifecycleService() {
             //
             val existingIdentity = platformRepo.getIdentityFromPublicKeyId()
             if (existingIdentity != null) {
-                //val encryptionKey = platformRepo.getWalletEncryptionKey()
                 val firstIdentityKey = platformRepo.getBlockchainIdentityKey(0, encryptionKey)!!
                 platformRepo.recoverIdentityAsync(blockchainIdentity, firstIdentityKey.pubKeyHash)
             } else {
@@ -630,7 +654,7 @@ class CreateIdentityService : LifecycleService() {
                 platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.REQUESTED_NAME_CHECKING)
 
 
-                val contenders = platformRepo.platform.names.getVoteContenders(blockchainIdentityData.username!!)
+                val contenders = platformRepo.getVoteContenders(blockchainIdentityData.username!!)
 
                 blockchainIdentity.currentVotingPeriodStarts = System.currentTimeMillis()
                 blockchainIdentity.currentUsernameRequested = true
@@ -645,23 +669,13 @@ class CreateIdentityService : LifecycleService() {
                 val document = DomainDocument(
                     platformRepo.platform.names.deserialize(documentWithVotes.seralizedDocument!!)
                 )
-                blockchainIdentityData.verificationLink?.let { verificationLink ->
-                    if (verificationLink.startsWith("https://") || verificationLink.startsWith("http://")) {
-                        IdentityVerify(platformRepo.platform.platform).createForDashDomain(
-                            blockchainIdentityData.username!!,
-                            verificationLink,
-                            blockchainIdentity.identity!!,
-                            WalletSignerCallback(walletApplication.wallet!!, encryptionKey)
-                        )
-                    }
-                }
 
                 usernameRequestDao.insert(
                     UsernameRequest(
-                        blockchainIdentity.uniqueIdString + " " + blockchainIdentityData.username!!,
+                        UsernameRequest.getRequestId(blockchainIdentity.uniqueIdString, blockchainIdentityData.username!!),
                         blockchainIdentityData.username!!,
                         Names.normalizeString(blockchainIdentityData.username!!),
-                        document.createdAt!! / 1000,
+                        document.createdAt!!,
                         blockchainIdentity.uniqueIdString,
                         blockchainIdentityData.verificationLink,
                         documentWithVotes.votes,
@@ -671,16 +685,43 @@ class CreateIdentityService : LifecycleService() {
                 )
 
                 val usernameInfo = blockchainIdentity.usernameStatuses[blockchainIdentity.currentUsername!!]!!
-                usernameInfo.votingStartedAt = document.createdAt
+
+                // determine when voting started by finding the minimum timestamp
+                val earliestCreatedAt = contenders.map.values.minOf {
+                    val document = platformRepo.platform.names.deserialize(documentWithVotes.seralizedDocument!!)
+                    document.createdAt ?: 0
+                }
+
+                usernameInfo.votingStartedAt = earliestCreatedAt
                 usernameInfo.requestStatus = UsernameRequestStatus.VOTING
 
                 platformRepo.updateBlockchainIdentityData(blockchainIdentityData, blockchainIdentity)
+
+                // schedule work to check the status after voting has ended
+                GetUsernameVotingResultOperation(walletApplication)
+                    .create(
+                        usernameInfo.username!!,
+                        blockchainIdentity.uniqueIdentifier.toString(),
+                        earliestCreatedAt
+                    )
+                    .enqueue()
             }
 
 
             if (blockchainIdentityData.creationState <= CreationState.REQUESTED_NAME_CHECKED) {
                 platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.REQUESTED_NAME_CHECKED)
                 platformRepo.updateBlockchainIdentityData(blockchainIdentityData, blockchainIdentity)
+
+                blockchainIdentityData.verificationLink?.let { verificationLink ->
+                    if (verificationLink.matches(Regex("^https?:\\/\\/.+\$"))) {
+                        IdentityVerify(platformRepo.platform.platform).createForDashDomain(
+                            blockchainIdentityData.username!!,
+                            verificationLink,
+                            blockchainIdentity.identity!!,
+                            WalletSignerCallback(walletApplication.wallet!!, encryptionKey)
+                        )
+                    }
+                }
             }
 
             if (blockchainIdentityData.creationState <= CreationState.REQUESTED_NAME_LINK_SAVING) {
@@ -704,7 +745,13 @@ class CreateIdentityService : LifecycleService() {
         //         However, a default empty profile will be saved to the local database.
         val emptyProfile = DashPayProfile(blockchainIdentity.uniqueIdString, blockchainIdentity.currentUsername!!)
         platformRepo.updateDashPayProfile(emptyProfile)
-
+        analytics.logEvent(
+            if (blockchainIdentityData.usingInvite) {
+                AnalyticsConstants.UsersContacts.CREATE_USERNAME_INVITE_SUCCESS
+            } else {
+                AnalyticsConstants.UsersContacts.CREATE_USERNAME_SUCCESS
+            }, mapOf()
+        )
         platformRepo.init()
         platformSyncService.initSync()
 
@@ -819,24 +866,44 @@ class CreateIdentityService : LifecycleService() {
                 val contestedNames = platformRepo.platform.names.getContestedNames()
 
                 contestedNames.forEach { name ->
-                    val voteContenders = platformRepo.platform.names.getVoteContenders(name)
+                    val voteContenders = platformRepo.getVoteContenders(name)
+                    val winner = voteContenders.winner
                     voteContenders.map.forEach { (identifier, documentWithVotes) ->
                         if (blockchainIdentity.uniqueIdentifier == identifier) {
                             blockchainIdentity.currentUsername = name
                             // load the serialized doc to get voting period and status...
+                            val usernameRequestStatus = if (winner.isEmpty) {
+                                UsernameRequestStatus.VOTING
+                            } else {
+                                val winnerInfo = winner.get().first
+                                when {
+                                    winnerInfo.isLocked -> UsernameRequestStatus.LOCKED
+                                    winnerInfo.isWinner(blockchainIdentity.uniqueIdentifier) -> UsernameRequestStatus.APPROVED
+                                    else -> UsernameRequestStatus.LOST_VOTE
+                                }
+                            }
 
                             blockchainIdentity.usernameStatuses.apply {
                                 clear()
-                                val usernameInfo = UsernameInfo(null, UsernameStatus.CONFIRMED, blockchainIdentity.currentUsername!!,
-                                    UsernameRequestStatus.VOTING, 0)
+                                val usernameInfo = UsernameInfo(
+                                    null,
+                                    UsernameStatus.CONFIRMED,
+                                    blockchainIdentity.currentUsername!!,
+                                    usernameRequestStatus,
+                                    0
+                                )
                                 put(blockchainIdentity.currentUsername!!, usernameInfo)
                             }
-
-                            val contestedDocument = DomainDocument(
-                                platformRepo.platform.names.deserialize(documentWithVotes.seralizedDocument!!)
-                            )
-                            blockchainIdentity.currentUsername = contestedDocument.label
-
+                            var votingStartedAt = -1L
+                            var label = name
+                            if (winner.isEmpty) {
+                                val contestedDocument = DomainDocument(
+                                    platformRepo.platform.names.deserialize(documentWithVotes.seralizedDocument!!)
+                                )
+                                blockchainIdentity.currentUsername = contestedDocument.label
+                                votingStartedAt = contestedDocument.createdAt!!
+                                label = contestedDocument.label
+                            }
                             val verifyDocument = IdentityVerify(platformRepo.platform.platform).get(
                                 blockchainIdentity.uniqueIdentifier,
                                 name
@@ -844,10 +911,13 @@ class CreateIdentityService : LifecycleService() {
 
                             usernameRequestDao.insert(
                                 UsernameRequest(
-                                    UsernameRequest.getRequestId(blockchainIdentity.uniqueIdString, blockchainIdentity.currentUsername!!),
-                                    contestedDocument.label,
-                                    contestedDocument.normalizedLabel,
-                                    contestedDocument.createdAt!! / 1000,
+                                    UsernameRequest.getRequestId(
+                                        blockchainIdentity.uniqueIdString,
+                                        blockchainIdentity.currentUsername!!
+                                    ),
+                                    label,
+                                    name,
+                                    votingStartedAt,
                                     blockchainIdentity.uniqueIdString,
                                     verifyDocument?.url, // get it from the document
                                     documentWithVotes.votes,
@@ -855,22 +925,45 @@ class CreateIdentityService : LifecycleService() {
                                     false
                                 )
                             )
-                            val usernameInfo = blockchainIdentity.usernameStatuses[blockchainIdentity.currentUsername!!]!!
-                            usernameInfo.votingStartedAt = contestedDocument.createdAt
-                            usernameInfo.requestStatus = UsernameRequestStatus.VOTING
+                            // what if usernameInfo would have been null, we should create it.
+
+                            var usernameInfo = blockchainIdentity.usernameStatuses[blockchainIdentity.currentUsername!!]
+                            if (usernameInfo == null) {
+                                usernameInfo = UsernameInfo(
+                                    null,
+                                    UsernameStatus.CONFIRMED,
+                                    blockchainIdentity.currentUsername!!,
+                                    UsernameRequestStatus.VOTING
+                                )
+                                blockchainIdentity.usernameStatuses[blockchainIdentity.currentUsername!!] = usernameInfo
+                            }
+
+                            // determine when voting started by finding the minimum timestamp
+                            val earliestCreatedAt = voteContenders.map.values.minOf {
+                                val document = platformRepo.platform.names.deserialize(documentWithVotes.seralizedDocument!!)
+                                document.createdAt ?: 0
+                            }
+
+                            usernameInfo.votingStartedAt = earliestCreatedAt
+                            usernameInfo.requestStatus = usernameRequestStatus
+
+                            // schedule work to check the status after voting has ended
+                            GetUsernameVotingResultOperation(walletApplication)
+                                .create(
+                                    usernameInfo.username!!,
+                                    blockchainIdentity.uniqueIdentifier.toString(),
+                                    earliestCreatedAt
+                                )
+                                .enqueue()
                         }
                     }
                 }
 
-
-
                 platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.REQUESTED_NAME_CHECKED)
                 platformRepo.updateBlockchainIdentityData(blockchainIdentityData, blockchainIdentity)
-
-
+                
                 platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.REQUESTED_NAME_CHECKING)
-
-
+                
                 // recover the verification link
 
                 platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.REQUESTED_NAME_CHECKED)
diff --git a/wallet/src/de/schildbach/wallet/ui/dashpay/CreateIdentityViewModel.kt b/wallet/src/de/schildbach/wallet/ui/dashpay/CreateIdentityViewModel.kt
new file mode 100644
index 0000000000..c8b4d4f9e6
--- /dev/null
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/CreateIdentityViewModel.kt
@@ -0,0 +1,63 @@
+package de.schildbach.wallet.ui.dashpay
+
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import de.schildbach.wallet.WalletApplication
+import de.schildbach.wallet.database.dao.DashPayProfileDao
+import de.schildbach.wallet.database.entity.BlockchainIdentityConfig
+import de.schildbach.wallet.database.entity.BlockchainIdentityData
+import de.schildbach.wallet.ui.dashpay.utils.DashPayConfig
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
+import org.dash.wallet.common.services.analytics.AnalyticsService
+import javax.inject.Inject
+
+@HiltViewModel
+class CreateIdentityViewModel @Inject constructor(
+    private val walletApplication: WalletApplication,
+    private val analytics: AnalyticsService,
+    blockchainIdentityDataDao: BlockchainIdentityConfig,
+    dashPayProfileDao: DashPayProfileDao,
+    val dashPayConfig: DashPayConfig
+) : BaseProfileViewModel(blockchainIdentityDataDao, dashPayProfileDao) {
+
+    private val _creationState = MutableStateFlow(BlockchainIdentityData.CreationState.NONE)
+    val creationState: StateFlow<BlockchainIdentityData.CreationState>
+        get() = _creationState
+
+    private val _creationException = MutableStateFlow<String?>(null)
+    val creationException: StateFlow<String?>
+        get() = _creationException
+    init {
+        blockchainIdentityDataDao.observe(BlockchainIdentityConfig.CREATION_STATE)
+            .filterNotNull()
+            .onEach {
+                _creationState.value = BlockchainIdentityData.CreationState.valueOf(it)
+            }
+            .launchIn(viewModelScope)
+
+        blockchainIdentityDataDao.observe(BlockchainIdentityConfig.CREATION_STATE_ERROR_MESSAGE)
+            .filterNotNull()
+            .onEach {
+                _creationException.value = it
+            }
+            .launchIn(viewModelScope)
+    }
+
+    fun retryCreateIdentity() {
+        viewModelScope.launch {
+            val username = blockchainIdentityDataDao.get(BlockchainIdentityConfig.USERNAME)
+            walletApplication.startService(
+                CreateIdentityService.createIntentForRetry(
+                    walletApplication
+                )
+            )
+        }
+    }
+
+    suspend fun shouldShowMixDash(): Boolean = dashPayConfig.get(DashPayConfig.MIX_DASH_SHOWN)?.not() ?: true
+}
\ No newline at end of file
diff --git a/wallet/src/de/schildbach/wallet/ui/dashpay/DashPayViewModel.kt b/wallet/src/de/schildbach/wallet/ui/dashpay/DashPayViewModel.kt
index 86d9ec16ec..71f266f79d 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/DashPayViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/DashPayViewModel.kt
@@ -31,6 +31,7 @@ import de.schildbach.wallet.database.dao.DashPayContactRequestDao
 import de.schildbach.wallet.database.dao.DashPayProfileDao
 import de.schildbach.wallet.database.dao.InvitationsDao
 import de.schildbach.wallet.database.entity.BlockchainIdentityConfig
+import de.schildbach.wallet.database.entity.BlockchainIdentityConfig.Companion.IDENTITY_ID
 import de.schildbach.wallet.database.entity.DashPayContactRequest
 import de.schildbach.wallet.livedata.Resource
 import de.schildbach.wallet.service.platform.PlatformBroadcastService
@@ -39,8 +40,15 @@ import de.schildbach.wallet.ui.dashpay.utils.DashPayConfig
 import de.schildbach.wallet.ui.dashpay.work.SendContactRequestOperation
 import de.schildbach.wallet.ui.username.CreateUsernameArgs
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import org.bouncycastle.crypto.params.KeyParameter
 import org.dash.wallet.common.data.WalletUIConfig
@@ -50,21 +58,21 @@ import org.dash.wallet.common.services.analytics.AnalyticsTimer
 import org.slf4j.LoggerFactory
 import javax.inject.Inject
 
+@OptIn(ExperimentalCoroutinesApi::class)
 @HiltViewModel
 open class DashPayViewModel @Inject constructor(
     private val walletApplication: WalletApplication,
-    private val walletUIConfig: WalletUIConfig,
     private val analytics: AnalyticsService,
     private val platformRepo: PlatformRepo,
-    private val blockchainState: BlockchainStateDao,
+    blockchainState: BlockchainStateDao,
     dashPayProfileDao: DashPayProfileDao,
     blockchainIdentityDataDao: BlockchainIdentityConfig,
     private val invitations: InvitationsDao,
     val platformSyncService: PlatformSyncService,
     private val platformBroadcastService: PlatformBroadcastService,
-    private val dashPayContactRequestDao: DashPayContactRequestDao,
+    contactRequestDao: DashPayContactRequestDao,
     private val dashPayConfig: DashPayConfig
-) : BaseProfileViewModel(blockchainIdentityDataDao, dashPayProfileDao) {
+) : BaseContactsViewModel(blockchainIdentityDataDao, dashPayProfileDao, contactRequestDao) {
 
     companion object {
         private val log = LoggerFactory.getLogger(DashPayViewModel::class.java)
@@ -302,7 +310,7 @@ open class DashPayViewModel @Inject constructor(
     suspend fun getInviteHistory() = invitations.loadAll()
 
     fun contactRequestsTo(userId: String): LiveData<List<DashPayContactRequest>> =
-        dashPayContactRequestDao.observeToOthers(userId).distinctUntilChanged().asLiveData()
+        contactRequestDao.observeToOthers(userId).distinctUntilChanged().asLiveData()
 
     private inner class UserSearch(
         val text: String,
diff --git a/wallet/src/de/schildbach/wallet/ui/dashpay/EditProfileViewModel.kt b/wallet/src/de/schildbach/wallet/ui/dashpay/EditProfileViewModel.kt
index 2f424d1a13..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}"))
@@ -398,6 +411,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())
diff --git a/wallet/src/de/schildbach/wallet/ui/dashpay/HistoryHeaderAdapter.kt b/wallet/src/de/schildbach/wallet/ui/dashpay/HistoryHeaderAdapter.kt
index 5efb76eabc..55ccd69218 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/HistoryHeaderAdapter.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/HistoryHeaderAdapter.kt
@@ -100,7 +100,11 @@ class HistoryHeaderAdapter(
         binding.identityCreation.root.setOnClickListener { onIdentityClicked?.invoke() }
 
         if (blockchainIdentityData.creationStateErrorMessage != null) {
-            if (blockchainIdentityData.creationState == BlockchainIdentityData.CreationState.USERNAME_REGISTERING) {
+            if (blockchainIdentityData.creationState == BlockchainIdentityData.CreationState.USERNAME_REGISTERING &&
+                (blockchainIdentityData.creationStateErrorMessage.contains("Document transitions with duplicate unique properties") ||
+                    blockchainIdentityData.creationStateErrorMessage.contains("Document Contest for vote_poll ContestedDocumentResourceVotePoll")) ||
+                    blockchainIdentityData.creationStateErrorMessage.contains(Regex("does not have .* as a contender"))
+                ) {
                 binding.identityCreation.title.text = binding.root.context.getString(R.string.processing_username_unavailable_title)
                 binding.identityCreation.subtitle.visibility = View.VISIBLE
                 binding.identityCreation.icon.setImageResource(R.drawable.ic_username_unavailable)
diff --git a/wallet/src/de/schildbach/wallet/ui/dashpay/NotificationsFragment.kt b/wallet/src/de/schildbach/wallet/ui/dashpay/NotificationsFragment.kt
index f7c032ae21..febe898e90 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/NotificationsFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/NotificationsFragment.kt
@@ -256,16 +256,16 @@ class NotificationsFragment : Fragment(R.layout.fragment_notifications) {
         super.onDestroy()
     }
 
-    fun onAcceptRequest(usernameSearchResult: UsernameSearchResult, position: Int) {
-        dashPayViewModel.logEvent(AnalyticsConstants.UsersContacts.NOTIFICATIONS_ACCEPT_REQUEST)
+    private fun onAcceptRequest(usernameSearchResult: UsernameSearchResult, position: Int) {
+        dashPayViewModel.logEvent(AnalyticsConstants.UsersContacts.ACCEPT_REQUEST)
         sendContactRequest(usernameSearchResult)
     }
 
-    fun onIgnoreRequest(usernameSearchResult: UsernameSearchResult, position: Int) {
+    private fun onIgnoreRequest(usernameSearchResult: UsernameSearchResult, position: Int) {
         // this Ignmore Request function is not currently implemented
     }
 
-    fun sendContactRequest(usernameSearchResult: UsernameSearchResult) {
+    private fun sendContactRequest(usernameSearchResult: UsernameSearchResult) {
         lifecycleScope.launch {
             val enough = dashPayViewModel.hasEnoughCredits()
             val shouldWarn = enough.isBalanceWarning()
@@ -299,7 +299,7 @@ class NotificationsFragment : Fragment(R.layout.fragment_notifications) {
         }
     }
 
-    fun onUserAlertDismiss(alertId: Int) {
+    private fun onUserAlertDismiss(alertId: Int) {
         userAlertItem = null
         viewModel.dismissUserAlert(alertId)
     }
diff --git a/wallet/src/de/schildbach/wallet/ui/dashpay/NotificationsLiveData.kt b/wallet/src/de/schildbach/wallet/ui/dashpay/NotificationsLiveData.kt
index 891d1020a2..54631afa9e 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/NotificationsLiveData.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/NotificationsLiveData.kt
@@ -16,6 +16,7 @@
 
 package de.schildbach.wallet.ui.dashpay
 
+import de.schildbach.wallet.Constants
 import de.schildbach.wallet.WalletApplication
 import de.schildbach.wallet.data.*
 import de.schildbach.wallet.database.dao.UserAlertDao
@@ -43,9 +44,12 @@ open class NotificationsLiveData(
         scope.launch(Dispatchers.IO) {
             val results = arrayListOf<NotificationItem>()
 
-            val userAlert = userAlertDao.load(0L)
-            if (userAlert != null && platformRepo.shouldShowAlert()) {
-                results.add(NotificationItemUserAlert(userAlert.stringResourceId, userAlert.iconResourceId))
+            //TODO: remove the if when INVITES are supported
+            if (Constants.SUPPORTS_INVITES) {
+                val userAlert = userAlertDao.load(0L)
+                if (userAlert != null && platformRepo.shouldShowAlert()) {
+                    results.add(NotificationItemUserAlert(userAlert.stringResourceId, userAlert.iconResourceId))
+                }
             }
 
             val contactRequests = platformRepo.searchContacts(query, UsernameSortOrderBy.DATE_ADDED)
diff --git a/wallet/src/de/schildbach/wallet/ui/dashpay/PlatformRepo.kt b/wallet/src/de/schildbach/wallet/ui/dashpay/PlatformRepo.kt
index 7b729bf152..93e77e5b8f 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/PlatformRepo.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/PlatformRepo.kt
@@ -67,6 +67,7 @@ import org.dashj.platform.dpp.errors.concensus.basic.identity.InvalidInstantAsse
 import org.dashj.platform.dpp.identifier.Identifier
 import org.dashj.platform.dpp.identity.Identity
 import org.dashj.platform.dpp.toHex
+import org.dashj.platform.dpp.voting.Contenders
 import org.dashj.platform.sdk.platform.DomainDocument
 import org.dashj.platform.sdk.platform.Names
 import org.slf4j.LoggerFactory
@@ -135,7 +136,7 @@ class PlatformRepo @Inject constructor(
     suspend fun init() {
         // load the dash-sdk library
         System.loadLibrary("sdklib")
-        authenticationGroupExtension = walletApplication.wallet?.getKeyChainExtension(AuthenticationGroupExtension.EXTENSION_ID) as AuthenticationGroupExtension
+        authenticationGroupExtension = walletApplication.wallet?.getKeyChainExtension(AuthenticationGroupExtension.EXTENSION_ID) as? AuthenticationGroupExtension
         blockchainIdentityDataDao.load()?.let {
             blockchainIdentity = initBlockchainIdentity(it, walletApplication.wallet!!)
             initializeStateRepository()
@@ -227,6 +228,14 @@ class PlatformRepo @Inject constructor(
         }
     }
 
+    fun getVoteContenders(username: String): Contenders {
+        return try {
+            platform.names.getVoteContenders(Names.normalizeString(username))
+        } catch (e: Exception) {
+            Contenders(Optional.empty(), mapOf(), 0, 0)
+        }
+    }
+
     /**
      * gets all the name documents for usernames starting with text
      *
@@ -465,10 +474,12 @@ class PlatformRepo @Inject constructor(
             return 0
         }
 
-        if (shouldShowAlert()) {
-            val alert = userAlertDao.load(date)
-            if (alert != null) {
-                count++
+        if (Constants.SUPPORTS_INVITES) {
+            if (shouldShowAlert()) {
+                val alert = userAlertDao.load(date)
+                if (alert != null) {
+                    count++
+                }
             }
         }
 
@@ -1219,8 +1230,11 @@ class PlatformRepo @Inject constructor(
         return report.toString()
     }
 
-    suspend fun getIdentityBalance(): CreditBalanceInfo {
+    fun getIdentityBalance(): CreditBalanceInfo {
         return CreditBalanceInfo(platform.client.getIdentityBalance(blockchainIdentity.uniqueIdentifier))
     }
 
+    fun getIdentityBalance(identifier: Identifier): CreditBalanceInfo {
+        return CreditBalanceInfo(platform.client.getIdentityBalance(identifier))
+    }
 }
\ No newline at end of file
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 f13b915a4a..3dfadaa624 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/utils/DashPayConfig.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/utils/DashPayConfig.kt
@@ -21,7 +21,6 @@ import android.content.Context
 import androidx.datastore.preferences.SharedPreferencesMigration
 import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.datastore.preferences.core.longPreferencesKey
-import androidx.datastore.preferences.core.stringPreferencesKey
 import org.dash.wallet.common.WalletDataProvider
 import org.dash.wallet.common.data.BaseConfig
 import javax.inject.Inject
@@ -53,6 +52,9 @@ open class DashPayConfig @Inject constructor(
         val LAST_METADATA_PUSH = longPreferencesKey("last_metadata_push")
         val HAS_DASH_PAY_INFO_SCREEN_BEEN_SHOWN = booleanPreferencesKey("has_dash_pay_info_screen_been_shown")
         val VOTING_INFO_SHOWN = booleanPreferencesKey("voting_info_shown")
+        val MIX_DASH_SHOWN = booleanPreferencesKey("mix_dash_shown")
+        val KEYS_DONT_ASK_AGAIN = booleanPreferencesKey("dont_ask_again_for_keys")
+        val FIRST_TIME_VOTING = booleanPreferencesKey("first_time_voting")
     }
 
     open suspend fun areNotificationsDisabled(): Boolean {
diff --git a/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastIdentityVerifyOperation.kt b/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastIdentityVerifyOperation.kt
index abc77b1124..6991568954 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastIdentityVerifyOperation.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastIdentityVerifyOperation.kt
@@ -19,18 +19,13 @@ 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.livedata.Resource
 import de.schildbach.wallet.security.SecurityGuard
-import org.dash.wallet.common.services.analytics.AnalyticsService
 import org.slf4j.LoggerFactory
 
 class BroadcastIdentityVerifyOperation(val application: Application) {
 
-    class SendContactRequestOperationException(message: String) : java.lang.Exception(message)
+    class BroadcastIdentityVerifyOperationException(message: String) : java.lang.Exception(message)
 
     companion object {
         private val log = LoggerFactory.getLogger(BroadcastIdentityVerifyOperation::class.java)
@@ -45,13 +40,13 @@ class BroadcastIdentityVerifyOperation(val application: Application) {
     /**
      * Gets the list of all SendContactRequestWorker WorkInfo's
      */
-    val allOperationsData = workManager.getWorkInfosByTagLiveData(SendContactRequestWorker::class.qualifiedName!!)
+    val allOperationsData = workManager.getWorkInfosByTagLiveData(BroadcastIdentityVerifyWorker::class.qualifiedName!!)
 
     @SuppressLint("EnqueueWork")
     fun create(username: String, url: String): WorkContinuation {
 
         val password = SecurityGuard().retrievePassword()
-        val sendContactRequestWorker = OneTimeWorkRequestBuilder<SendContactRequestWorker>()
+        val verifyIdentityWorker = OneTimeWorkRequestBuilder<BroadcastIdentityVerifyWorker>()
                 .setInputData(workDataOf(
                         BroadcastIdentityVerifyWorker.KEY_PASSWORD to password,
                         BroadcastIdentityVerifyWorker.KEY_USERNAME to username,
@@ -63,7 +58,7 @@ class BroadcastIdentityVerifyOperation(val application: Application) {
 
         return WorkManager.getInstance(application)
                 .beginUniqueWork(uniqueWorkName(username),
-                        ExistingWorkPolicy.KEEP,
-                        sendContactRequestWorker)
+                    ExistingWorkPolicy.KEEP,
+                    verifyIdentityWorker)
     }
 }
\ No newline at end of file
diff --git a/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesOperation.kt b/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesOperation.kt
new file mode 100644
index 0000000000..120db3ed67
--- /dev/null
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesOperation.kt
@@ -0,0 +1,132 @@
+/*
+ * 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.dashpay.work
+
+import android.annotation.SuppressLint
+import android.app.Application
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.liveData
+import androidx.lifecycle.switchMap
+import androidx.work.*
+import de.schildbach.wallet.Constants
+import de.schildbach.wallet.livedata.Resource
+import de.schildbach.wallet.security.SecurityGuard
+import org.bitcoinj.core.ECKey
+import org.dashj.platform.dpp.voting.ResourceVoteChoice
+import org.slf4j.LoggerFactory
+
+class BroadcastUsernameVotesOperation(val application: Application) {
+    class BroadcastUsernameVotesOperationException(message: String) : java.lang.Exception(message)
+
+    companion object {
+        var lastTimestamp: Long = System.currentTimeMillis()
+        private val log = LoggerFactory.getLogger(BroadcastUsernameVotesOperation::class.java)
+
+        private const val WORK_NAME = "BroadcastUsernameVotes.WORK#"
+
+        fun uniqueWorkName(usernames: String) = "$WORK_NAME$usernames-${System.currentTimeMillis()}"
+
+        fun allOperationsStatus(application: Application): LiveData<MutableMap<String, Resource<WorkInfo>>> {
+            val workManager: WorkManager = WorkManager.getInstance(application)
+            return workManager.getWorkInfosByTagLiveData(BroadcastUsernameVotesWorker::class.qualifiedName!!).switchMap {
+                return@switchMap liveData {
+                    if (it.isNullOrEmpty()) {
+                        return@liveData
+                    }
+
+                    val result = mutableMapOf<String, Resource<WorkInfo>>()
+                    it.filter { workInfo ->
+                        val timestampTag = workInfo.tags.firstOrNull { it.startsWith("timestamp:") }
+                        timestampTag?.let {
+                            val timestamp = it.removePrefix("timestamp:").toLongOrNull()
+                            timestamp != null && timestamp > lastTimestamp
+                        } ?: false
+                    }.forEach { workInfo ->
+                        var toUserId = ""
+                        workInfo.tags.forEach { tag ->
+                            if (tag.startsWith("usernames:")) {
+                                toUserId = tag.replace("usernames:", "")
+                            }
+                        }
+                        result[toUserId] = convertState(workInfo)
+                    }
+                    emit(result)
+                }
+            }
+        }
+
+        private fun convertState(workInfo: WorkInfo): Resource<WorkInfo> {
+            return when (workInfo.state) {
+                WorkInfo.State.SUCCEEDED -> {
+                    Resource.success(workInfo)
+                }
+                WorkInfo.State.FAILED -> {
+                    val errorMessage = BaseWorker.extractError(workInfo.outputData)
+                    if (errorMessage != null) {
+                        Resource.error(errorMessage, workInfo)
+                    } else {
+                        Resource.error(Exception(), workInfo)
+                    }
+                }
+                WorkInfo.State.CANCELLED -> {
+                    Resource.canceled(workInfo)
+                }
+                else -> {
+                    Resource.loading(workInfo)
+                }
+            }
+        }
+    }
+
+    private val workManager: WorkManager = WorkManager.getInstance(application)
+
+//    /**
+//     * Gets the list of all BroadcastUsernameVotesOperation WorkInfo's
+//     */
+//    val allOperationsLiveData = workManager.getWorkInfosByTagLiveData(BroadcastUsernameVotesWorker::class.qualifiedName!!)
+
+    @SuppressLint("EnqueueWork")
+    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()
+                )
+            )
+            .addTag("usernames:$usernames")
+            .addTag("timestamp:${System.currentTimeMillis()}") // Add timestamp as a tag
+            .build()
+        log.info("creating BroadcastUsernameVotesOperation({}, {})", usernames, voteChoices)
+        return WorkManager.getInstance(application)
+            .beginUniqueWork(
+                uniqueWorkName(usernames.joinToString(",")),
+                ExistingWorkPolicy.KEEP,
+                verifyIdentityWorker
+            )
+    }
+}
\ 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
new file mode 100644
index 0000000000..9f6eed9025
--- /dev/null
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/work/BroadcastUsernameVotesWorker.kt
@@ -0,0 +1,261 @@
+/*
+ * 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.dashpay.work
+
+import android.content.Context
+import androidx.hilt.work.HiltWorker
+import androidx.work.WorkerParameters
+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
+import org.bitcoinj.crypto.KeyCrypterException
+import org.bouncycastle.crypto.params.KeyParameter
+import org.dash.wallet.common.WalletDataProvider
+import org.dash.wallet.common.services.analytics.AnalyticsConstants
+import org.dash.wallet.common.services.analytics.AnalyticsService
+import org.dashj.platform.dpp.identifier.Identifier
+import org.dashj.platform.dpp.voting.ContestedDocumentResourceVotePoll
+import org.dashj.platform.dpp.voting.ResourceVote
+import org.dashj.platform.dpp.voting.ResourceVoteChoice
+import org.dashj.platform.dpp.voting.TowardsIdentity
+import org.dashj.platform.dpp.voting.Vote
+import org.dashj.platform.sdk.PlatformValue
+import org.slf4j.LoggerFactory
+
+@HiltWorker
+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
+) : 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_VOTE_CHOICES = "BroadcastUsernameVotesWorker.VOTE_CHOICES"
+        const val KEY_MASTERNODE_KEYS = "BroadcastUsernameVotesWorker.MASTERNODE_KEYS"
+    }
+
+    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)
+                ?: return Result.failure(workDataOf(KEY_ERROR_MESSAGE to "missing KEY_USERNAMES parameter"))
+        val voteChoices = inputData.getStringArray(KEY_VOTE_CHOICES)
+            ?: return Result.failure(workDataOf(KEY_ERROR_MESSAGE to "missing KEY_VOTE_CHOICES parameter"))
+        val masternodeKeys = inputData.getStringArray(KEY_MASTERNODE_KEYS)
+            ?: return Result.failure(workDataOf(KEY_ERROR_MESSAGE to "missing KEY_MASTERNODE_KEYS parameter"))
+
+        // TODO: add decryption later?
+        val encryptionKey: KeyParameter
+        try {
+            encryptionKey = walletDataProvider.wallet!!.keyCrypter!!.deriveKey(password)
+        } catch (ex: KeyCrypterException) {
+            analytics.logError(ex, "Broadcast Username Vote: failed to derive encryption key")
+            val msg = formatExceptionMessage("derive encryption key", ex)
+            return Result.failure(workDataOf(KEY_ERROR_MESSAGE to msg))
+        }
+
+        return try {
+            log.info("executing BroadcastUsernameVotesWorker({}, {})", usernames, voteChoices)
+            log.info("voting BroadcastUsernameVotesWorker({}, {})", usernames, voteChoices)
+
+            // 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
+            // this is taking too long...
+            //platformSyncService.updateUsernameRequestsWithVotes()
+
+            // update local database
+            analytics.logEvent(AnalyticsConstants.UsernameVoting.VOTE_SUCCESS, mapOf())
+            val arrayOfnames: Array<String> = votingResults.map {
+                val item = ((it.second?.resourceVote?.votePoll as? ContestedDocumentResourceVotePoll)?.indexValues?.get(1) ?: "null")
+                when (item) {
+                    is PlatformValue -> {
+                        when (item.tag) {
+                            PlatformValue.Tag.Text -> item.text
+                            else -> item.toString()
+                        }
+                    }
+                    is String -> item
+                    else -> item.toString()
+                }
+            }.toSet().toTypedArray()
+            val votes = hashMapOf<String, UsernameVote>()
+            votingResults.forEach {
+                when (val votePoll = it.second?.resourceVote?.votePoll as? ContestedDocumentResourceVotePoll) {
+                    is ContestedDocumentResourceVotePoll -> {
+                        val normalizedLabel = when (val item = votePoll?.indexValues?.get(1)) {
+                            is PlatformValue -> {
+                                when (item.tag) {
+                                    PlatformValue.Tag.Text -> item.text
+                                    else -> null
+                                }
+                            }
+                            is String -> item
+                            else -> null
+                        }
+                        val identity = when (it.first) {
+                            is TowardsIdentity -> {
+                                (it.first as TowardsIdentity).identifier
+                            }
+                            else -> null
+                        }
+                        votes[normalizedLabel!!] = UsernameVote(normalizedLabel, identity.toString(), it.first)
+                    }
+                }
+            }
+            votes.forEach { (_, usernameVote) ->
+                updateUsernameVotes(usernameVote)
+            }
+            val errorCount = votingResults.count { it.third != null }
+            when (errorCount) {
+                0 -> {
+                    // all were successful
+                    log.info("all votes succeeded: total submitted {}", errorCount, votingResults.size)
+                    Result.success(
+                        workDataOf(
+                            KEY_USERNAMES to if (votingResults.isNotEmpty()) {
+                                arrayOfnames
+                            } else {
+                                listOf("").toTypedArray()
+                            },
+                            KEY_VOTE_CHOICES to votingResults.map {
+                                it.first.toString()
+                            }.toTypedArray()
+                        )
+                    )
+                }
+                votingResults.size -> {
+                    // all have failed
+                    log.error("all votes failed: errors: {} vs total submitted {}", errorCount, votingResults.size)
+                    // java.lang.Exception: Attempted to unwrap a Failure: Dapi client error: Transport(Status { code: InvalidArgument, message: "Masternode vote is already present for masternode EbitFAjpGsuf7qKPpsQMZw2ZKZ8rs2S1PdqKvYA8J2Ux voting for ContestedDocumentResourceVotePoll(ContestedDocumentResourceVotePoll { contract_id: GWRSAVFMjXx8HpQFaNJMqBV7MBgMK4br5UESsB4S31Ec, document_type_name: domain, index_name: parentNameAndLabel, index_values: [string dash, string test-1101] })", metadata: MetadataMap { headers: {"drive-error-data-bin": "oW9zZXJpYWxpemVkRXJyb3KYbwIYKxjKDQkQABgqGO0YuRh/GLMDGOkYexgdGLEVGIMYvhhiGLMY2xiLGGEYRxj/GKgYSxiYGDAYnxjOGHEAGOYYaBjGGFkYrxhmGK4Y4RjnGCwYGBhtGN4YexhbGH4KGB0YcRgqCRjEDRhXGCEY9hgiGL8YUxjFGDEYVQYYZBhvGG0YYRhpGG4SGHAYYRhyGGUYbhh0GE4YYRhtGGUYQRhuGGQYTBhhGGIYZRhsAhIEGGQYYRhzGGgSCRh0GGUYcxh0GC0YMRgxGDAYMQ==", "code": "40304", "grpc-accept-encoding": "identity", "grpc-encoding": "identity", "content-type": "application/grpc+proto", "date": "Mon, 28 Oct 2024 22:27:37 GMT", "x-envoy-upstream-service-time": "55", "server": "envoy"} }, source: None }, Address { ban_count: 0, banned_until: None, uri: https://52.89.154.48:1443/ })
+                    votingResults.forEach {
+                        it.third?.let { e ->
+                            log.error("error with vote: {}", it.first, e)
+                        }
+                    }
+                    Result.failure(
+                        workDataOf(
+                            KEY_USERNAMES to if (votingResults.isNotEmpty()) {
+                                arrayOfnames
+                            } else {
+                                listOf("").toTypedArray()
+                            },
+                            KEY_VOTE_CHOICES to votingResults.map {
+                                it.first.toString()
+                            }.toTypedArray()
+                        )
+                    )
+                }
+                else -> {
+                    // some have failed, how can we report this?
+                    log.error("not all votes succeeeded: errors: {} vs total submitted {}", errorCount, votingResults.size)
+                    votingResults.forEach {
+                        it.third?.let { e ->
+                            log.error("error with vote: {}", it.first, e)
+                        }
+                    }
+                    Result.success(
+                        workDataOf(
+                            KEY_USERNAMES to usernames,
+                            KEY_VOTE_CHOICES to voteChoices
+                        )
+                    )
+                }
+            }
+        } catch (ex: Exception) {
+            analytics.logEvent(AnalyticsConstants.UsernameVoting.VOTE_ERROR, mapOf())
+            analytics.logError(ex, "Username Voting: failed to broadcast votes")
+            Result.failure(
+                workDataOf(
+                    KEY_ERROR_MESSAGE to formatExceptionMessage("broadcast username vote", ex),
+                    KEY_USERNAMES to usernames,
+                    KEY_VOTE_CHOICES to voteChoices
+                )
+            )
+        } finally {
+            log.info("finshed BroadcastUsernameVotesWorker({}, {})", usernames, voteChoices)
+        }
+    }
+
+    private suspend fun updateUsernameVotes(
+        normalizedLabel: String,
+        identity: Identifier?,
+        keyCount: Int,
+        voteType: ResourceVoteChoice
+    ) {
+        // usernameRequestDao.removeApproval(request.username)
+        // usernameRequestDao.update(request.copy(votes = request.votes + keyCount, isApproved = true))
+        usernameVoteDao.insert(
+            UsernameVote(
+                normalizedLabel,
+                identity?.toString() ?: "",
+                voteType
+            )
+        )
+    }
+
+    private suspend fun updateUsernameVotes(
+        vote: UsernameVote
+    ) {
+        // usernameRequestDao.removeApproval(request.username)
+        // usernameRequestDao.update(request.copy(votes = request.votes + keyCount, isApproved = true))
+        usernameVoteDao.insert(vote)
+    }
+}
\ No newline at end of file
diff --git a/wallet/src/de/schildbach/wallet/ui/dashpay/work/GetUsernameVotingResultOperation.kt b/wallet/src/de/schildbach/wallet/ui/dashpay/work/GetUsernameVotingResultOperation.kt
new file mode 100644
index 0000000000..c35555f07a
--- /dev/null
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/work/GetUsernameVotingResultOperation.kt
@@ -0,0 +1,74 @@
+/*
+ * 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.dashpay.work
+
+import android.annotation.SuppressLint
+import android.app.Application
+import androidx.work.*
+import de.schildbach.wallet.Constants
+import de.schildbach.wallet.database.entity.UsernameRequest
+import org.bitcoinj.core.NetworkParameters
+import org.slf4j.LoggerFactory
+import java.text.DateFormat
+import java.util.Date
+import java.util.concurrent.TimeUnit
+
+class GetUsernameVotingResultOperation(val application: Application) {
+
+    class GetUsernameVotingResultOperationnException(message: String) : java.lang.Exception(message)
+
+    companion object {
+        private val log = LoggerFactory.getLogger(GetUsernameVotingResultOperation::class.java)
+
+        private const val WORK_NAME = "GetUsernameVotingResult.WORK#"
+
+        fun uniqueWorkName(username: String, identityId: String) = "$WORK_NAME$username:$identityId"
+    }
+
+    private val workManager: WorkManager = WorkManager.getInstance(application)
+
+    /**
+     * Gets the list of all GetUsernameVotingResultOperation WorkInfo's
+     */
+    val allOperationsData = workManager.getWorkInfosByTagLiveData(GetUsernameVotingResultsWorker::class.qualifiedName!!)
+
+    @SuppressLint("EnqueueWork")
+    fun create(username: String, identityId: String, votingStartedAt: Long): WorkContinuation {
+        log.info("scheduling work to check username voting status")
+        val delay = System.currentTimeMillis() - UsernameRequest.VOTING_PERIOD_MILLIS + votingStartedAt + TimeUnit.MINUTES.toMillis(2)
+        log.info("scheduling work to check username voting status on {}",
+            DateFormat.getDateInstance(DateFormat.FULL).format(
+                Date(System.currentTimeMillis() + delay)
+            )
+        )
+        val worker = OneTimeWorkRequestBuilder<GetUsernameVotingResultsWorker>()
+                .setInputData(workDataOf(
+                        BroadcastIdentityVerifyWorker.KEY_USERNAME to username,
+                        BroadcastIdentityVerifyWorker.KEY_URL to identityId,
+                    )
+                )
+                .addTag("identity:$username")
+                .setInitialDelay(delay, TimeUnit.MILLISECONDS)
+            .build()
+
+        return WorkManager.getInstance(application)
+                .beginUniqueWork(uniqueWorkName(username, identityId),
+                    ExistingWorkPolicy.KEEP,
+                    worker)
+    }
+}
\ No newline at end of file
diff --git a/wallet/src/de/schildbach/wallet/ui/dashpay/work/GetUsernameVotingResultsWorker.kt b/wallet/src/de/schildbach/wallet/ui/dashpay/work/GetUsernameVotingResultsWorker.kt
new file mode 100644
index 0000000000..d10fbf38d3
--- /dev/null
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/work/GetUsernameVotingResultsWorker.kt
@@ -0,0 +1,67 @@
+/*
+ * 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.dashpay.work
+
+import android.content.Context
+import androidx.hilt.work.HiltWorker
+import androidx.work.WorkerParameters
+import androidx.work.workDataOf
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import de.schildbach.wallet.service.platform.PlatformBroadcastService
+import de.schildbach.wallet.service.platform.PlatformSyncService
+import org.bitcoinj.crypto.KeyCrypterException
+import org.bouncycastle.crypto.params.KeyParameter
+import org.dash.wallet.common.WalletDataProvider
+import org.dash.wallet.common.services.analytics.AnalyticsService
+
+/**
+ * check and update identity data for username voting results
+ */
+@HiltWorker
+class GetUsernameVotingResultsWorker @AssistedInject constructor(
+    @Assisted context: Context,
+    @Assisted parameters: WorkerParameters,
+    val analytics: AnalyticsService,
+    val platformSyncService: PlatformSyncService
+) : BaseWorker(context, parameters) {
+
+    companion object {
+        const val KEY_USERNAME = "GetUsernameVotingResultsWorker.USERNAME"
+        const val KEY_IDENTITY_ID = "GetUsernameVotingResultsWorker.IDENTITY_ID"
+    }
+
+    override suspend fun doWorkWithBaseProgress(): Result {
+        val username = inputData.getString(KEY_USERNAME)
+                ?: return Result.failure(workDataOf(KEY_ERROR_MESSAGE to "missing KEY_USERNAME parameter"))
+        val identityId = inputData.getString(KEY_IDENTITY_ID)
+            ?: return Result.failure(workDataOf(KEY_ERROR_MESSAGE to "missing KEY_IDENTITY_ID parameter"))
+
+        return try {
+            platformSyncService.checkUsernameVotingStatus()
+            platformSyncService.updateUsernameRequestsWithVotes()
+            Result.success(workDataOf(
+                    KEY_USERNAME to username,
+                    KEY_IDENTITY_ID to identityId
+            ))
+        } catch (ex: Exception) {
+            analytics.logError(ex, "get username voting results: failed to broadcast identity verify document")
+            Result.failure(workDataOf(
+                    KEY_ERROR_MESSAGE to formatExceptionMessage("get username voting results error", ex)))
+        }
+    }
+}
\ No newline at end of file
diff --git a/wallet/src/de/schildbach/wallet/ui/invite/CreateInviteViewModel.kt b/wallet/src/de/schildbach/wallet/ui/invite/CreateInviteViewModel.kt
index b73bc6dabd..01d7a160bc 100644
--- a/wallet/src/de/schildbach/wallet/ui/invite/CreateInviteViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/invite/CreateInviteViewModel.kt
@@ -29,17 +29,20 @@ import de.schildbach.wallet.database.dao.InvitationsDao
 import de.schildbach.wallet.database.entity.BlockchainIdentityConfig
 import de.schildbach.wallet.database.entity.BlockchainIdentityData
 import de.schildbach.wallet.ui.dashpay.BaseProfileViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import org.dash.wallet.common.WalletDataProvider
-import org.dash.wallet.common.data.entity.BlockchainState
 import org.dash.wallet.common.services.analytics.AnalyticsService
-import org.dash.wallet.common.util.observe
 import javax.inject.Inject
 
 @HiltViewModel
 class CreateInviteViewModel @Inject constructor(
     private val walletData: WalletDataProvider,
     private val analytics: AnalyticsService,
-    blockchainStateDao: BlockchainStateDao,
+     blockchainStateDao: BlockchainStateDao,
     invitationsDao: InvitationsDao,
     blockchainIdentityDataDao: BlockchainIdentityConfig,
     dashPayProfileDao: DashPayProfileDao
diff --git a/wallet/src/de/schildbach/wallet/ui/main/MainActivity.kt b/wallet/src/de/schildbach/wallet/ui/main/MainActivity.kt
index 343487d14f..eb2f054c00 100644
--- a/wallet/src/de/schildbach/wallet/ui/main/MainActivity.kt
+++ b/wallet/src/de/schildbach/wallet/ui/main/MainActivity.kt
@@ -49,6 +49,7 @@ import de.schildbach.wallet.livedata.SeriousError
 import de.schildbach.wallet.livedata.Status
 import de.schildbach.wallet.ui.*
 import de.schildbach.wallet.ui.backup.BackupWalletDialogFragment
+import de.schildbach.wallet.ui.coinjoin.CoinJoinLevelViewModel
 import de.schildbach.wallet.ui.dashpay.*
 import de.schildbach.wallet.ui.invite.AcceptInviteActivity
 import de.schildbach.wallet.ui.invite.InviteHandler
@@ -60,13 +61,16 @@ import de.schildbach.wallet.ui.main.WalletActivityExt.requestDisableBatteryOptim
 import de.schildbach.wallet.ui.main.WalletActivityExt.setupBottomNavigation
 import de.schildbach.wallet.ui.main.WalletActivityExt.showFiatCurrencyChangeDetectedDialog
 import de.schildbach.wallet.ui.main.WalletActivityExt.showStaleRatesToast
+import de.schildbach.wallet.ui.more.MixDashFirstDialogFragment
 import de.schildbach.wallet.ui.util.InputParser
 import de.schildbach.wallet.ui.widget.UpgradeWalletDisclaimerDialog
 import de.schildbach.wallet.util.CrashReporter
 import de.schildbach.wallet.util.Nfc
 import de.schildbach.wallet_test.R
 import de.schildbach.wallet_test.databinding.ActivityMainBinding
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.bitcoinj.crypto.ChildNumber
 import org.bitcoinj.wallet.DerivationPathFactory
 import org.bitcoinj.wallet.Wallet
@@ -120,6 +124,8 @@ class MainActivity : AbstractBindServiceActivity(), ActivityCompat.OnRequestPerm
 
     private val baseAlertDialogBuilder = BaseAlertDialogBuilder(this)
     val viewModel: MainViewModel by viewModels()
+    private val createIdentityViewModel: CreateIdentityViewModel by viewModels()
+    private val coinJoinViewModel: CoinJoinLevelViewModel by viewModels()
     @Inject
     lateinit var config: Configuration
     private lateinit var binding: ActivityMainBinding
@@ -248,7 +254,14 @@ class MainActivity : AbstractBindServiceActivity(), ActivityCompat.OnRequestPerm
             }
         }
         viewModel.showCreateUsernameEvent.observe(this) {
-            startActivity(Intent(this, CreateUsernameActivity::class.java))
+            lifecycleScope.launch {
+                val shouldShowMixDashDialog = withContext(Dispatchers.IO) { createIdentityViewModel.shouldShowMixDash() }
+                if (coinJoinViewModel.isMixing || !shouldShowMixDashDialog) {
+                    startActivity(Intent(this@MainActivity, CreateUsernameActivity::class.java))
+                } else {
+                    MixDashFirstDialogFragment().show(this@MainActivity)
+                }
+            }
         }
         viewModel.sendContactRequestState.observe(this) {
             config.inviter?.also { initInvitationUserId ->
diff --git a/wallet/src/de/schildbach/wallet/ui/main/MainViewModel.kt b/wallet/src/de/schildbach/wallet/ui/main/MainViewModel.kt
index fa7d9552eb..ef2bf79609 100644
--- a/wallet/src/de/schildbach/wallet/ui/main/MainViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/main/MainViewModel.kt
@@ -31,6 +31,7 @@ import de.schildbach.wallet.Constants
 import de.schildbach.wallet.WalletApplication
 import de.schildbach.wallet.data.CoinJoinConfig
 import de.schildbach.wallet.data.UsernameSortOrderBy
+import de.schildbach.wallet.database.dao.DashPayContactRequestDao
 import de.schildbach.wallet.database.dao.DashPayProfileDao
 import de.schildbach.wallet.database.dao.InvitationsDao
 import de.schildbach.wallet.database.dao.UserAlertDao
@@ -49,7 +50,7 @@ import de.schildbach.wallet.service.platform.PlatformSyncService
 import de.schildbach.wallet.transactions.TxDirectionFilter
 import de.schildbach.wallet.transactions.TxFilterType
 import de.schildbach.wallet.transactions.coinjoin.CoinJoinTxWrapperFactory
-import de.schildbach.wallet.ui.dashpay.BaseProfileViewModel
+import de.schildbach.wallet.ui.dashpay.BaseContactsViewModel
 import de.schildbach.wallet.ui.dashpay.NotificationCountLiveData
 import de.schildbach.wallet.ui.dashpay.PlatformRepo
 import de.schildbach.wallet.ui.dashpay.utils.DashPayConfig
@@ -130,10 +131,11 @@ class MainViewModel @Inject constructor(
     private val invitationsDao: InvitationsDao,
     userAlertDao: UserAlertDao,
     dashPayProfileDao: DashPayProfileDao,
-    private val dashPayConfig: DashPayConfig,
+    dashPayConfig: DashPayConfig,
+    dashPayContactRequestDao: DashPayContactRequestDao,
     private val coinJoinConfig: CoinJoinConfig,
     private val coinJoinService: CoinJoinService
-) : BaseProfileViewModel(blockchainIdentityDataDao, dashPayProfileDao) {
+) : BaseContactsViewModel(blockchainIdentityDataDao, dashPayProfileDao, dashPayContactRequestDao) {
     companion object {
         private const val THROTTLE_DURATION = 500L
         private const val DIRECTION_KEY = "tx_direction"
@@ -141,7 +143,6 @@ class MainViewModel @Inject constructor(
 
         private val log = LoggerFactory.getLogger(MainViewModel::class.java)
     }
-
     private val workerJob = SupervisorJob()
 
     @VisibleForTesting
@@ -703,12 +704,19 @@ class MainViewModel @Inject constructor(
 
     private fun combineLatestData(): Boolean {
         return if (!Constants.SUPPORTS_PLATFORM) {
+            log.info("platform is not supported")
             false
         } else {
             val isPlatformAvailable = isPlatformAvailable.value
             val isSynced = _isBlockchainSynced.value ?: false
             val noIdentityCreatedOrInProgress =
                 (blockchainIdentity.value == null) || blockchainIdentity.value!!.creationState == BlockchainIdentityData.CreationState.NONE
+            log.info(
+                "platform available: {}; isSynced: {}: no identity creation is progress: {}",
+                isPlatformAvailable,
+                isSynced,
+                noIdentityCreatedOrInProgress
+            )
             return isSynced && isPlatformAvailable && noIdentityCreatedOrInProgress
         }
     }
diff --git a/wallet/src/de/schildbach/wallet/ui/main/WalletActivityExt.kt b/wallet/src/de/schildbach/wallet/ui/main/WalletActivityExt.kt
index 5dc290a9e0..a619aea541 100644
--- a/wallet/src/de/schildbach/wallet/ui/main/WalletActivityExt.kt
+++ b/wallet/src/de/schildbach/wallet/ui/main/WalletActivityExt.kt
@@ -80,15 +80,26 @@ object WalletActivityExt {
     const val NOTIFICATION_ACTION_KEY = "action"
     private const val BROWSER_ACTION_KEY = "browser"
     private const val ACTION_URL_KEY = "url"
+    private const val CONTACTS_BUTTON_INDEX = 1
+    private const val EXPLORE_BUTTON_INDEX = 3
+
 
     fun MainActivity.setupBottomNavigation(viewModel: MainViewModel) {
         val navHostFragment = supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as NavHostFragment
         val navController = navHostFragment.navController
         val navView: BottomNavigationView = findViewById(R.id.bottom_navigation)
         setupWithNavController(navView, navController)
-        if (!Constants.SUPPORTS_PLATFORM) {
-            navView.menu.removeItem(R.id.contactsFragment)
-            navView.menu.removeItem(R.id.exploreFragment)
+
+
+        viewModel.blockchainIdentity.observe(this) { identityData ->
+
+            if (identityData?.creationComplete == true) {
+                navView.menu.getItem(CONTACTS_BUTTON_INDEX).isVisible = true
+                navView.menu.getItem(EXPLORE_BUTTON_INDEX).isVisible = true
+            } else {
+                navView.menu.getItem(CONTACTS_BUTTON_INDEX).isVisible = false
+                navView.menu.getItem(EXPLORE_BUTTON_INDEX).isVisible = false
+            }
         }
         navView.itemIconTintList = null
         navView.setOnItemSelectedListener { item: MenuItem ->
@@ -105,6 +116,8 @@ object WalletActivityExt {
                 }
                 R.id.paymentsFragment -> viewModel.logEvent(AnalyticsConstants.Home.SEND_RECEIVE_BUTTON)
                 R.id.moreFragment -> viewModel.logEvent(AnalyticsConstants.Home.NAV_MORE)
+                R.id.contactsFragment -> viewModel.logEvent(AnalyticsConstants.Home.NAV_CONTACTS)
+                R.id.exploreFragment -> viewModel.logEvent(AnalyticsConstants.Home.NAV_EXPLORE)
                 else -> { }
             }
             onNavDestinationSelected(item, navController)
@@ -138,9 +151,6 @@ object WalletActivityExt {
         navController.addOnDestinationChangedListener { _, _, arguments ->
             navView.isVisible = arguments?.getBoolean("ShowNavBar", false) == true
         }
-        if (Constants.SUPPORTS_PLATFORM) {
-            navView.menu.findItem(R.id.contactsFragment).isEnabled = false
-        }
     }
 
     fun MainActivity.checkTimeSkew(viewModel: MainViewModel, force: Boolean = false) {
@@ -157,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))
diff --git a/wallet/src/de/schildbach/wallet/ui/main/WalletFragment.kt b/wallet/src/de/schildbach/wallet/ui/main/WalletFragment.kt
index 1fb4d78a43..3e9155caf3 100644
--- a/wallet/src/de/schildbach/wallet/ui/main/WalletFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/main/WalletFragment.kt
@@ -116,6 +116,7 @@ class WalletFragment : Fragment(R.layout.home_content) {
 
         binding.homeToolbar.setOnClickListener { scrollToTop() }
         binding.notificationBell.setOnClickListener {
+            viewModel.logEvent(AnalyticsConstants.Home.NOTIFICATIONS)
             findNavController().navigate(
                 R.id.showNotificationsFragment,
                 bundleOf("mode" to NotificationsFragment.MODE_NOTIFICATIONS),
@@ -125,7 +126,7 @@ class WalletFragment : Fragment(R.layout.home_content) {
             )
         }
         binding.dashpayUserAvatar.setOnClickListener {
-            viewModel.logEvent(AnalyticsConstants.UsersContacts.PROFILE_EDIT_HOME)
+            viewModel.logEvent(AnalyticsConstants.Home.AVATAR)
             startActivity(Intent(requireContext(), EditProfileActivity::class.java))
         }
 
@@ -151,8 +152,17 @@ class WalletFragment : Fragment(R.layout.home_content) {
         }
 
         viewModel.dashPayProfile.observe(viewLifecycleOwner) { profile ->
-            ProfilePictureDisplay.display(binding.dashpayUserAvatar, profile, true)
-            setNotificationIndicator()
+            if (viewModel.hasIdentity) {
+                ProfilePictureDisplay.display(binding.dashpayUserAvatar, profile, true)
+                setNotificationIndicator()
+            }
+        }
+
+        viewModel.blockchainIdentity.observe(viewLifecycleOwner) { identity ->
+            if (identity?.creationComplete == true) {
+                ProfilePictureDisplay.display(binding.dashpayUserAvatar, viewModel.dashPayProfile.value, true)
+                setNotificationIndicator()
+            }
         }
 
         viewModel.notificationCountData.observe(viewLifecycleOwner) { setNotificationIndicator() }
@@ -206,6 +216,10 @@ class WalletFragment : Fragment(R.layout.home_content) {
                 viewModel.walletBalance
             )
         }
+
+        viewModel.hasContacts.observe(viewLifecycleOwner) {
+            refreshShortcutBar()
+        }
     }
 
     fun scrollToTop() {
@@ -280,6 +294,7 @@ class WalletFragment : Fragment(R.layout.home_content) {
     private fun refreshShortcutBar() {
         showHideSecureAction()
         refreshIfUserHasBalance()
+        refreshIfUserHasIdentity()
     }
 
     private fun showHideSecureAction() {
@@ -291,6 +306,10 @@ class WalletFragment : Fragment(R.layout.home_content) {
         binding.shortcutsPane.userHasBalance = balance.isPositive
     }
 
+    private fun refreshIfUserHasIdentity() {
+        binding.shortcutsPane.userHasContacts = viewModel.hasIdentity && viewModel.hasContacts.value
+    }
+
     private fun updateSyncState() {
         val isSyncFailed = viewModel.isBlockchainSyncFailed.value
 
diff --git a/wallet/src/de/schildbach/wallet/ui/main/WalletTransactionsFragment.kt b/wallet/src/de/schildbach/wallet/ui/main/WalletTransactionsFragment.kt
index 31037c157b..b485ff29a6 100644
--- a/wallet/src/de/schildbach/wallet/ui/main/WalletTransactionsFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/main/WalletTransactionsFragment.kt
@@ -39,7 +39,6 @@ import de.schildbach.wallet.ui.dashpay.HistoryHeaderAdapter
 import de.schildbach.wallet.ui.invite.InviteHandler
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import dagger.hilt.android.AndroidEntryPoint
@@ -232,6 +231,7 @@ class WalletTransactionsFragment : Fragment(R.layout.wallet_transactions_fragmen
 
     private fun retryIdentityCreation(header: HistoryHeaderAdapter) {
         viewModel.blockchainIdentity.value?.let { blockchainIdentityData ->
+            viewModel.logEvent(AnalyticsConstants.UsersContacts.CREATE_USERNAME_TRYAGAIN)
             // check to see if an invite was used
             if (!blockchainIdentityData.usingInvite) {
                 requireActivity().startService(
@@ -261,7 +261,8 @@ class WalletTransactionsFragment : Fragment(R.layout.wallet_transactions_fragmen
     private fun openIdentityCreation() {
         viewModel.blockchainIdentity.value?.let { blockchainIdentityData ->
             if (blockchainIdentityData.creationStateErrorMessage != null) {
-                if (blockchainIdentityData.creationState == BlockchainIdentityData.CreationState.USERNAME_REGISTERING) {
+                if (blockchainIdentityData.creationState == BlockchainIdentityData.CreationState.USERNAME_REGISTERING ||
+                    blockchainIdentityData.creationState == BlockchainIdentityData.CreationState.REQUESTED_NAME_CHECKING) {
                     startActivity(CreateUsernameActivity.createIntentReuseTransaction(requireActivity(), blockchainIdentityData))
                 } else {
                     Toast.makeText(requireContext(), blockchainIdentityData.creationStateErrorMessage, Toast.LENGTH_LONG).show()
@@ -275,6 +276,7 @@ class WalletTransactionsFragment : Fragment(R.layout.wallet_transactions_fragmen
     }
 
     private fun onJoinDashPayClicked() {
+        viewModel.logEvent(AnalyticsConstants.UsersContacts.JOIN_DASHPAY)
         viewModel.joinDashPay()
     }
 }
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
diff --git a/wallet/src/de/schildbach/wallet/ui/more/MixDashFirstDialogFragment.kt b/wallet/src/de/schildbach/wallet/ui/more/MixDashFirstDialogFragment.kt
new file mode 100644
index 0000000000..aa896cc118
--- /dev/null
+++ b/wallet/src/de/schildbach/wallet/ui/more/MixDashFirstDialogFragment.kt
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 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 <https://www.gnu.org/licenses/>.
+ */
+
+package de.schildbach.wallet.ui.more
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.View
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.lifecycleScope
+import dagger.hilt.android.AndroidEntryPoint
+import de.schildbach.wallet.ui.CreateUsernameActivity
+import de.schildbach.wallet.ui.coinjoin.CoinJoinActivity
+import de.schildbach.wallet_test.R
+import de.schildbach.wallet_test.databinding.DialogMixDashFirstBinding
+import kotlinx.coroutines.launch
+import org.dash.wallet.common.ui.dialogs.OffsetDialogFragment
+import org.dash.wallet.common.ui.viewBinding
+
+@AndroidEntryPoint
+class MixDashFirstDialogFragment : OffsetDialogFragment(R.layout.dialog_mix_dash_first) {
+    private val binding by viewBinding(DialogMixDashFirstBinding::bind)
+    val viewModel by viewModels<MixDashFirstViewModel>()
+    private val settingsViewModel: SettingsViewModel by viewModels()
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        binding.skipButton.setOnClickListener {
+            startActivity(Intent(requireContext(), CreateUsernameActivity::class.java))
+            viewModel.setMixDashShown()
+            dismiss()
+        }
+
+        binding.mixButton.setOnClickListener {
+            lifecycleScope.launch {
+                val shouldShowFirstTimeInfo = settingsViewModel.shouldShowCoinJoinInfo()
+
+                if (shouldShowFirstTimeInfo) {
+                    settingsViewModel.setCoinJoinInfoShown()
+                }
+
+                val intent = Intent(requireActivity(), CoinJoinActivity::class.java)
+                intent.putExtra(CoinJoinActivity.FIRST_TIME_EXTRA, shouldShowFirstTimeInfo)
+                startActivity(intent)
+                viewModel.setMixDashShown()
+                dismiss()
+            }
+        }
+    }
+}
diff --git a/wallet/src/de/schildbach/wallet/ui/more/MixDashFirstViewModel.kt b/wallet/src/de/schildbach/wallet/ui/more/MixDashFirstViewModel.kt
new file mode 100644
index 0000000000..77adad76a2
--- /dev/null
+++ b/wallet/src/de/schildbach/wallet/ui/more/MixDashFirstViewModel.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 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 <https://www.gnu.org/licenses/>.
+ */
+
+package de.schildbach.wallet.ui.more
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import de.schildbach.wallet.Constants
+import de.schildbach.wallet.ui.dashpay.utils.DashPayConfig
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import org.bitcoinj.core.Address
+import org.bitcoinj.script.ScriptPattern
+import org.bitcoinj.wallet.KeyChain
+import org.dash.wallet.common.WalletDataProvider
+import org.dash.wallet.common.services.BlockchainStateProvider
+import org.dash.wallet.common.util.Constants.DASH_CURRENCY
+import org.slf4j.LoggerFactory
+import javax.inject.Inject
+
+@HiltViewModel
+class MixDashFirstViewModel @Inject constructor(
+    private val dashPayConfig: DashPayConfig,
+) : ViewModel() {
+    fun setMixDashShown() {
+        viewModelScope.launch(Dispatchers.IO) {
+            dashPayConfig.set(DashPayConfig.MIX_DASH_SHOWN, true)
+        }
+    }
+}
diff --git a/wallet/src/de/schildbach/wallet/ui/more/MoreFragment.kt b/wallet/src/de/schildbach/wallet/ui/more/MoreFragment.kt
index 8569b891ea..f16df916e7 100644
--- a/wallet/src/de/schildbach/wallet/ui/more/MoreFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/more/MoreFragment.kt
@@ -36,6 +36,7 @@ import de.schildbach.wallet.Constants
 import de.schildbach.wallet.WalletApplication
 import de.schildbach.wallet.database.entity.BlockchainIdentityData
 import de.schildbach.wallet.database.entity.DashPayProfile
+import de.schildbach.wallet.database.entity.UsernameRequest
 import de.schildbach.wallet.livedata.Status
 import de.schildbach.wallet.service.PackageInfoProvider
 import de.schildbach.wallet.ui.CreateUsernameActivity
@@ -43,6 +44,8 @@ import de.schildbach.wallet.ui.EditProfileActivity
 import de.schildbach.wallet.ui.LockScreenActivity
 import de.schildbach.wallet.ui.ReportIssueDialogBuilder
 import de.schildbach.wallet.ui.SettingsActivity
+import de.schildbach.wallet.ui.coinjoin.CoinJoinLevelViewModel
+import de.schildbach.wallet.ui.dashpay.CreateIdentityViewModel
 import de.schildbach.wallet.ui.dashpay.EditProfileViewModel
 import de.schildbach.wallet.ui.dashpay.utils.display
 import de.schildbach.wallet.ui.invite.CreateInviteViewModel
@@ -51,7 +54,10 @@ import de.schildbach.wallet.ui.invite.InvitesHistoryActivity
 import de.schildbach.wallet.ui.main.MainViewModel
 import de.schildbach.wallet_test.R
 import de.schildbach.wallet_test.databinding.FragmentMoreBinding
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.bitcoinj.core.NetworkParameters
 import org.dash.wallet.common.Configuration
 import org.dash.wallet.common.WalletDataProvider
 import org.dash.wallet.common.services.analytics.AnalyticsConstants
@@ -60,6 +66,7 @@ import org.dash.wallet.common.ui.avatar.ProfilePictureDisplay
 import org.dash.wallet.common.ui.viewBinding
 import org.dash.wallet.common.util.observe
 import org.dash.wallet.common.util.safeNavigate
+import org.dashj.platform.dashpay.UsernameRequestStatus
 import org.slf4j.LoggerFactory
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
@@ -81,6 +88,8 @@ class MoreFragment : Fragment(R.layout.fragment_more) {
     private val mainActivityViewModel: MainViewModel by activityViewModels()
     private val editProfileViewModel: EditProfileViewModel by viewModels()
     private val createInviteViewModel: CreateInviteViewModel by viewModels()
+    private val createIdentityViewModel: CreateIdentityViewModel by viewModels()
+    private val coinJoinViewModel: CoinJoinLevelViewModel by viewModels()
 
     @Inject lateinit var packageInfoProvider: PackageInfoProvider
     @Inject lateinit var configuration: Configuration
@@ -147,7 +156,7 @@ class MoreFragment : Fragment(R.layout.fragment_more) {
         binding.invite.setOnClickListener {
             lifecycleScope.launch {
                 val inviteHistory = mainActivityViewModel.getInviteHistory()
-
+                mainActivityViewModel.logEvent(AnalyticsConstants.MoreMenu.INVITE)
                 if (inviteHistory.isEmpty()) {
                     InviteFriendActivity.startOrError(requireActivity())
                 } else {
@@ -167,46 +176,117 @@ class MoreFragment : Fragment(R.layout.fragment_more) {
         binding.errorUpdatingProfile.cancel.setOnClickListener { dismissProfileError() }
         binding.editUpdateSwitcher.isVisible = false
         binding.joinDashpayBtn.setOnClickListener {
-            startActivity(Intent(requireContext(), CreateUsernameActivity::class.java))
+            lifecycleScope.launch {
+                val shouldShowMixDashDialog = withContext(Dispatchers.IO) { createIdentityViewModel.shouldShowMixDash() }
+                mainActivityViewModel.logEvent(AnalyticsConstants.UsersContacts.JOIN_DASHPAY)
+                if (coinJoinViewModel.isMixing || !shouldShowMixDashDialog) {
+                    startActivity(Intent(requireContext(), CreateUsernameActivity::class.java))
+                } else {
+                    MixDashFirstDialogFragment().show(requireActivity())
+                }
+            }
         }
         binding.usernameVoting.isVisible = Constants.SUPPORTS_PLATFORM
         binding.usernameVoting.setOnClickListener {
+            mainActivityViewModel.logEvent(AnalyticsConstants.MoreMenu.USERNAME_VOTING)
             safeNavigate(MoreFragmentDirections.moreToUsernameVoting())
         }
 
         binding.requestedUsernameContainer.setOnClickListener {
-            startActivity(Intent(requireContext(), CreateUsernameActivity::class.java))
+            if (createIdentityViewModel.creationState.value.ordinal < BlockchainIdentityData.CreationState.VOTING.ordinal &&
+                createIdentityViewModel.creationException.value != null) {
+                // Perform Retry
+                mainActivityViewModel.logEvent(AnalyticsConstants.UsersContacts.CREATE_USERNAME_TRYAGAIN)
+                createIdentityViewModel.retryCreateIdentity()
+            } else {
+                startActivity(Intent(requireContext(), CreateUsernameActivity::class.java))
+            }
         }
 
         mainActivityViewModel.blockchainIdentityDataDao.observeBase().observe(viewLifecycleOwner) {
-            if (it.creationState == BlockchainIdentityData.CreationState.VOTING) {
+            if (!it.restoring && it.creationState.ordinal > BlockchainIdentityData.CreationState.NONE.ordinal &&
+                it.creationState.ordinal < BlockchainIdentityData.CreationState.VOTING.ordinal
+            ) {
+                val username = it.username
+
+                binding.joinDashpayContainer.visibility = View.GONE
+                binding.requestedUsernameContainer.visibility = View.VISIBLE
+                if (it.creationError) {
+                    binding.requestedUsernameTitle.text = getString(R.string.requesting_your_username_error_title)
+                    binding.requestedUsernameSubtitle.text = getString(R.string.requesting_your_username_error_message, username)
+                    binding.requestedUsernameSubtitleTwo.isVisible = false
+                    binding.retryRequestButton.isVisible = true
+                    binding.retryRequestButton.text = getString(R.string.retry)
+                    binding.requestedUsernameIcon.setImageResource(R.drawable.ic_join_dashpay_red)
+                } else {
+                    if (it.usernameRequested == UsernameRequestStatus.NONE) {
+                        binding.requestedUsernameTitle.text = getString(R.string.requesting_your_username_title)
+                        binding.requestedUsernameSubtitle.text = getString(R.string.creating_your_username_message, username)
+                        binding.requestedUsernameSubtitleTwo.isVisible = false
+                        binding.retryRequestButton.isVisible = false
+                        binding.requestedUsernameArrow.isVisible = false
+                        binding.requestedUsernameContainer.isEnabled = false
+                    } else {
+                        binding.requestedUsernameTitle.text = getString(R.string.requesting_your_username_title)
+                        binding.requestedUsernameSubtitle.text = getString(R.string.requesting_your_username_message, username)
+                        binding.retryRequestButton.isVisible = false
+                        binding.requestedUsernameArrow.isVisible = false
+                        binding.requestedUsernameContainer.isEnabled = false
+                    }
+                }
+            } else if (it.creationState == BlockchainIdentityData.CreationState.VOTING) {
                 binding.joinDashpayContainer.visibility = View.GONE
                 binding.requestedUsernameContainer.visibility = View.VISIBLE
-                binding.requestedUsernameTitle.text = mainActivityViewModel.getRequestedUsername()
                 val votingPeriod = it.votingPeriodStart?.let { startTime ->
-                    val endTime = startTime + TimeUnit.MILLISECONDS.toDays(14)
+                    val endTime = startTime + UsernameRequest.VOTING_PERIOD_MILLIS
                     val dateFormat = DateFormat.getMediumDateFormat(requireContext())
-                    String.format("%s - %s", dateFormat.format(startTime), dateFormat.format(endTime))
+                    String.format("%s", dateFormat.format(endTime))
                 } ?: "Voting Period not found"
-                binding.requestedUsernameSubtitleTwo.text = getString(R.string.requested_voting_duration, votingPeriod)
+                when (it.usernameRequested) {
+                    UsernameRequestStatus.SUBMITTING,
+                    UsernameRequestStatus.SUBMITTED,
+                    UsernameRequestStatus.VOTING -> {
+                        binding.requestedUsernameTitle.text = mainActivityViewModel.getRequestedUsername()
+                        binding.requestedUsernameSubtitleTwo.text =
+                            getString(R.string.requested_voting_duration, votingPeriod)
+                        binding.retryRequestButton.isVisible = false
+                        binding.requestedUsernameIcon.setImageResource(R.drawable.ic_join_dashpay)
+                        binding.requestedUsernameArrow.isVisible = true
+                    }
+                    UsernameRequestStatus.LOCKED -> {
+                        binding.requestedUsernameTitle.text = getString(R.string.request_username_blocked)
+                        binding.requestedUsernameSubtitle.text =
+                            getString(R.string.request_username_blocked_message, mainActivityViewModel.getRequestedUsername())
+                        binding.requestedUsernameSubtitleTwo.isVisible = false
+                        binding.requestedUsernameSubtitle.maxLines = 4
+                        binding.retryRequestButton.isVisible = true
+                        binding.retryRequestButton.text = getString(R.string.try_again)
+                        binding.requestedUsernameIcon.setImageResource(R.drawable.ic_join_dashpay_red)
+                        binding.requestedUsernameArrow.isVisible = false
+                    }
+                    UsernameRequestStatus.LOST_VOTE -> {
+                        binding.requestedUsernameTitle.text = getString(R.string.request_username_lost_vote)
+                        binding.requestedUsernameSubtitle.text =
+                            getString(R.string.request_username_lost_vote_message, mainActivityViewModel.getRequestedUsername())
+                        binding.requestedUsernameSubtitle.maxLines = 4
+                        binding.requestedUsernameSubtitleTwo.isVisible = false
+                        binding.retryRequestButton.isVisible = true
+                        binding.retryRequestButton.text = getString(R.string.try_again)
+                        binding.requestedUsernameIcon.setImageResource(R.drawable.ic_join_dashpay_red)
+                        binding.requestedUsernameArrow.isVisible = false
+                    }
+                    else -> error("${it.usernameRequested} is not valid")
+                }
             } else {
                 binding.joinDashpayContainer.visibility = View.VISIBLE
                 binding.requestedUsernameContainer.visibility = View.GONE
             }
         }
 
-//        lifecycleScope.launch {
-//            mainActivityViewModel.getRequestedUsername().also { username ->
-//                if (username.isNotEmpty()) {
-//                    binding.joinDashpayContainer.visibility = View.GONE
-//                    binding.requestedUsernameContainer.visibility = View.VISIBLE
-//                    binding.requestedUsernameTitle.text = username
-//                } else {
-//                    binding.joinDashpayContainer.visibility = View.VISIBLE
-//                    binding.requestedUsernameContainer.visibility = View.GONE
-//                }
-//            }
-//        }
+        binding.retryRequestButton.setOnClickListener {
+            mainActivityViewModel.logEvent(AnalyticsConstants.UsersContacts.CREATE_USERNAME_TRYAGAIN)
+            createIdentityViewModel.retryCreateIdentity()
+        }
 
         initViewModel()
 
@@ -234,6 +314,12 @@ class MoreFragment : Fragment(R.layout.fragment_more) {
                 showProfileSection(dashPayProfile)
             }
         }
+        createIdentityViewModel.creationState.observe(viewLifecycleOwner) { _ ->
+            editProfileViewModel.dashPayProfile.value?.let { dashPayProfile ->
+                showProfileSection(dashPayProfile)
+            }
+        }
+
         // track the status of broadcast changes to our profile
         editProfileViewModel.updateProfileRequestState.observe(viewLifecycleOwner) { state ->
             if (state != null) {
@@ -298,39 +384,43 @@ class MoreFragment : Fragment(R.layout.fragment_more) {
         // show the invite section only after the profile section is visible
         // to avoid flickering
         if (binding.editUpdateSwitcher.isVisible) {
-            binding.invite.isVisible = showInviteSection
+            //TODO: remove && Constants.SUPPORTS_INVITES when INVITES are supported
+            binding.invite.isVisible = showInviteSection && Constants.SUPPORTS_INVITES
         }
     }
 
     private fun showProfileSection(profile: DashPayProfile) {
-        binding.editUpdateSwitcher.visibility = View.VISIBLE
-        binding.editUpdateSwitcher.displayedChild = PROFILE_VIEW
-        if (profile.displayName.isNotEmpty()) {
-            binding.username1.text = profile.displayName
-            binding.username2.text = profile.username
-        } else {
-            binding.username1.text = profile.username
-            binding.username2.visibility = View.GONE
-        }
+        if (createIdentityViewModel.creationState.value.ordinal >= BlockchainIdentityData.CreationState.DONE.ordinal) {
+            binding.editUpdateSwitcher.visibility = View.VISIBLE
+            binding.editUpdateSwitcher.displayedChild = PROFILE_VIEW
+            if (profile.displayName.isNotEmpty()) {
+                binding.username1.text = profile.displayName
+                binding.username2.text = profile.username
+            } else {
+                binding.username1.text = profile.username
+                binding.username2.visibility = View.GONE
+            }
 
-        ProfilePictureDisplay.display(binding.dashpayUserAvatar, profile)
+            ProfilePictureDisplay.display(binding.dashpayUserAvatar, profile)
 
-        binding.editProfile.setOnClickListener {
-            editProfileViewModel.logEvent(AnalyticsConstants.UsersContacts.PROFILE_EDIT_MORE)
-            startActivity(Intent(requireContext(), EditProfileActivity::class.java))
-        }
-        // if the invite section is not visible, show/hide it
-        if (!binding.invite.isVisible) {
-            binding.invite.isVisible = showInviteSection
+            binding.editProfile.setOnClickListener {
+                editProfileViewModel.logEvent(AnalyticsConstants.UsersContacts.PROFILE_EDIT_MORE)
+                startActivity(Intent(requireContext(), EditProfileActivity::class.java))
+            }
+            // if the invite section is not visible, show/hide it
+            if (!binding.invite.isVisible) {
+                //TODO: remove && Constants.SUPPORTS_INVITES when INVITES are supported
+                binding.invite.isVisible = showInviteSection && Constants.SUPPORTS_INVITES
+            }
+        } else {
+            binding.editUpdateSwitcher.isVisible = false
+            binding.invite.isVisible = true
         }
     }
 
     override fun onResume() {
         super.onResume()
-        // Developer Mode Feature
-        binding.invite.isVisible = showInviteSection
-        lifecycleScope.launchWhenResumed {
-
-        }
+        //TODO: remove && Constants.SUPPORTS_INVITES when INVITES are supported
+        binding.invite.isVisible = showInviteSection && Constants.SUPPORTS_INVITES
     }
 }
diff --git a/wallet/src/de/schildbach/wallet/ui/more/SettingsViewModel.kt b/wallet/src/de/schildbach/wallet/ui/more/SettingsViewModel.kt
index 161daf223c..6716585016 100644
--- a/wallet/src/de/schildbach/wallet/ui/more/SettingsViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/more/SettingsViewModel.kt
@@ -33,6 +33,7 @@ import org.bitcoinj.wallet.Wallet
 import org.bitcoinj.wallet.WalletEx
 import org.dash.wallet.common.WalletDataProvider
 import org.dash.wallet.common.data.WalletUIConfig
+import org.dash.wallet.common.services.analytics.AnalyticsService
 import org.dash.wallet.common.util.toBigDecimal
 import java.text.DecimalFormat
 import javax.inject.Inject
@@ -43,7 +44,8 @@ class SettingsViewModel @Inject constructor(
     private val walletUIConfig: WalletUIConfig,
     private val coinJoinConfig: CoinJoinConfig,
     private val coinJoinService: CoinJoinService,
-    private val walletDataProvider: WalletDataProvider
+    private val walletDataProvider: WalletDataProvider,
+    private val analytics: AnalyticsService
 ) : ViewModel() {
     private val powerManager: PowerManager = walletApplication.getSystemService(PowerManager::class.java)
 
@@ -77,4 +79,8 @@ class SettingsViewModel @Inject constructor(
     suspend fun setCoinJoinInfoShown() {
         coinJoinConfig.set(CoinJoinConfig.FIRST_TIME_INFO_SHOWN, true)
     }
+
+    fun logEvent(event: String) {
+        analytics.logEvent(event, mapOf())
+    }
 }
diff --git a/wallet/src/de/schildbach/wallet/ui/payments/PaymentsPayFragment.kt b/wallet/src/de/schildbach/wallet/ui/payments/PaymentsPayFragment.kt
index 11efe9fc69..9dcc65c166 100644
--- a/wallet/src/de/schildbach/wallet/ui/payments/PaymentsPayFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/payments/PaymentsPayFragment.kt
@@ -49,6 +49,7 @@ import org.dash.wallet.common.services.analytics.AnalyticsConstants
 import org.dash.wallet.common.services.analytics.AnalyticsService
 import org.dash.wallet.common.ui.dialogs.AdaptiveDialog
 import org.dash.wallet.common.ui.viewBinding
+import org.dash.wallet.common.util.observe
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -78,7 +79,12 @@ class PaymentsPayFragment : Fragment(R.layout.fragment_payments_pay), OnContactI
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        binding.contactsBtn.isVisible = Constants.SUPPORTS_PLATFORM
+        binding.contactsBtn.isVisible = false
+
+        dashPayViewModel.hasContacts.observe(viewLifecycleOwner) {
+            binding.contactsBtn.isVisible = it
+        }
+
         binding.contactsBtn.setOnClickListener {
             handleSelectContact()
         }
@@ -123,7 +129,7 @@ class PaymentsPayFragment : Fragment(R.layout.fragment_payments_pay), OnContactI
                     // TODO: how do we show an arrow
                     // binding.payByContactSelect.showForwardArrow(true)
                 }
-                binding.frequentContactsRvTopLine.visibility = binding.frequentContactsRv.visibility
+                binding.frequentContactsRv.visibility = binding.frequentContactsRv.visibility
 
                 if (it.data != null) {
                     val results = arrayListOf<UsernameSearchResult>()
diff --git a/wallet/src/de/schildbach/wallet/ui/username/AddVotingKeysFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/AddVotingKeysFragment.kt
index d48c08bfe2..804853398a 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/AddVotingKeysFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/AddVotingKeysFragment.kt
@@ -2,18 +2,31 @@ package de.schildbach.wallet.ui.username
 
 import android.os.Bundle
 import android.view.View
+import androidx.core.view.isGone
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
+import de.schildbach.wallet.database.entity.UsernameVote
 import de.schildbach.wallet.ui.username.adapters.IPAddressAdapter
 import de.schildbach.wallet.ui.username.utils.votingViewModels
 import de.schildbach.wallet_test.R
 import de.schildbach.wallet_test.databinding.FragmentAddVotingKeysBinding
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.dash.wallet.common.ui.setRoundedRippleBackground
 import org.dash.wallet.common.ui.viewBinding
 import org.dash.wallet.common.util.observe
 import org.dash.wallet.common.util.safeNavigate
+import org.slf4j.LoggerFactory
+import java.util.logging.Logger
 
 class AddVotingKeysFragment : Fragment(R.layout.fragment_add_voting_keys) {
+    companion object {
+        private val log = LoggerFactory.getLogger(AddVotingKeysFragment::class.java)
+    }
     private val binding by viewBinding(FragmentAddVotingKeysBinding::bind)
     private val viewModel by votingViewModels<UsernameRequestsViewModel>()
     private val args by navArgs<AddVotingKeysFragmentArgs>()
@@ -25,21 +38,47 @@ class AddVotingKeysFragment : Fragment(R.layout.fragment_add_voting_keys) {
             findNavController().popBackStack()
         }
 
+        viewModel.masternodes.observe(viewLifecycleOwner) {
+            binding.submitButton.isEnabled = it.isNotEmpty()
+        }
+        binding.submitButton.setRoundedRippleBackground(
+            if (args.vote != UsernameVote.APPROVE) R.style.PrimaryButtonTheme_Large_Red else R.style.PrimaryButtonTheme_Large_Blue
+        )
         binding.submitButton.setOnClickListener {
-            viewModel.vote(args.requestId)
+            viewModel.submitVote(args.requestId, args.vote)
             findNavController().popBackStack(R.id.usernameRequestsFragment, false)
         }
 
         binding.addKeyButton.setOnClickListener {
-            safeNavigate(AddVotingKeysFragmentDirections.addKeysToVotingKeyInput(args.requestId))
+            safeNavigate(AddVotingKeysFragmentDirections.addKeysToVotingKeyInput(args.requestId, args.vote))
         }
 
-        val adapter = IPAddressAdapter()
+        val adapter = IPAddressAdapter() { masternodeIP ->
+            log.info("removing masternode: {}", masternodeIP)
+            viewModel.removeMasternode(masternodeIP)
+        }
         binding.ipAddresses.adapter = adapter
 
-        viewModel.masternodeIPs.observe(viewLifecycleOwner) {
-            adapter.submitList(it)
+        viewModel.masternodes.observe(viewLifecycleOwner) {
+            log.info("updating masternode list: {}", it.map { mn -> mn.address })
+            adapter.submitList(
+                it.map { masternode ->
+                    masternode.address
+                }
+            )
             binding.votesCastText.text = getString(R.string.multiple_votes_cast, it.size)
         }
+
+        binding.dontAskAgainButton.setOnClickListener {
+            lifecycleScope.launch(Dispatchers.IO) {
+                viewModel.setDontAskAgain()
+            }
+            binding.dontAskAgainButton.isVisible = false
+        }
+        lifecycleScope.launch {
+            val isFirstTime = withContext(Dispatchers.IO) { viewModel.isFirstTimeVoting() }
+            binding.dontAskAgainButton.isVisible = !isFirstTime
+            viewModel.setSecondTimeVoting()
+        }
     }
 }
diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRegistrationFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRegistrationFragment.kt
index 345bb144d3..85f697a973 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRegistrationFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRegistrationFragment.kt
@@ -64,30 +64,20 @@ class UsernameRegistrationFragment : Fragment(R.layout.fragment_username_registr
     private var reuseTransaction: Boolean = false
     private var useInvite: Boolean = false
 
-    private var handler: Handler = Handler()
-    private lateinit var checkUsernameNotExistRunnable: Runnable
-
     private var createUsernameArgs: CreateUsernameArgs? = null
     private val slideInAnimation by lazy { AnimationUtils.loadAnimation(requireContext(), R.anim.slide_in_bottom) }
     private val fadeOutAnimation by lazy { AnimationUtils.loadAnimation(requireContext(), R.anim.fade_out) }
     private lateinit var completeUsername: String
     private var isProcessing = false
 
-    @SuppressLint("ResourceType")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
         binding.chooseUsernameTitle.text = getText(R.string.choose_your_username)
         binding.closeBtn.setOnClickListener {
-            if (requestUsernameViewModel.isUsernameContestable()) {
-                startActivity(MainActivity.createIntent(requireContext(), R.id.moreFragment))
-            } else {
-                // go to the home screen
-                startActivity(MainActivity.createIntent(requireContext()))
-            }
-            requireActivity().finish()
+            closeActivity()
         }
-        binding.processingIdentityDismissBtn.setOnClickListener { requireActivity().finish() }
+        binding.processingIdentityDismissBtn.setOnClickListener { closeActivity() }
 
         initViewModel()
         walletApplication = requireActivity().application as WalletApplication
@@ -106,7 +96,6 @@ class UsernameRegistrationFragment : Fragment(R.layout.fragment_username_registr
             }
             CreateUsernameActions.REUSE_TRANSACTION -> {
                 reuseTransaction = true
-                //showKeyBoard()
             }
             CreateUsernameActions.FROM_INVITE -> {
                 // don't show the keyboard if launched from invite
@@ -118,6 +107,17 @@ class UsernameRegistrationFragment : Fragment(R.layout.fragment_username_registr
         }
     }
 
+    @SuppressLint("ResourceType")
+    private fun closeActivity() {
+        if (requestUsernameViewModel.isUsernameContestable()) {
+            startActivity(MainActivity.createIntent(requireContext(), R.id.moreFragment))
+        } else {
+            // go to the home screen
+            startActivity(MainActivity.createIntent(requireContext(), R.id.walletFragment))
+        }
+        requireActivity().finish()
+    }
+
     private fun initViewModel() {
         dashPayViewModel.blockchainIdentity.observe(viewLifecycleOwner) {
             when {
@@ -150,14 +150,21 @@ class UsernameRegistrationFragment : Fragment(R.layout.fragment_username_registr
         binding.orbitView.findViewById<View>(R.id.dashpay_user_icon).visibility = View.VISIBLE
         binding.orbitView.findViewById<TextView>(R.id.username_1st_letter).text = completeUsername[0].toString()
 
-        val text = getString(R.string.identity_complete_message, completeUsername)
+        val text = getString(
+            if (requestUsernameViewModel.isUsernameContestable()) {
+                R.string.request_complete_message
+            } else {
+                R.string.identity_complete_message
+            },
+            completeUsername
+        )
 
         val spannableContent = SpannableString(text)
         val start = text.indexOf(completeUsername)
         val end = start + completeUsername.length
         spannableContent.setSpan(StyleSpan(Typeface.BOLD), start, end, 0)
         binding.identityCompleteText.text = spannableContent
-        binding.identityCompleteButton.setOnClickListener { requireActivity().finish() }
+        binding.identityCompleteButton.setOnClickListener { closeActivity() }
     }
 
     private fun showProcessingState() {
diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestDetailsFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestDetailsFragment.kt
index d365c06106..c075292cf2 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestDetailsFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestDetailsFragment.kt
@@ -2,13 +2,19 @@ package de.schildbach.wallet.ui.username
 
 import android.os.Bundle
 import android.view.View
+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 dagger.hilt.android.AndroidEntryPoint
+import de.schildbach.wallet.database.entity.UsernameRequest
+import de.schildbach.wallet.database.entity.UsernameVote
 import de.schildbach.wallet.ui.username.utils.votingViewModels
 import de.schildbach.wallet_test.R
 import de.schildbach.wallet_test.databinding.FragmentUsernameRequestDetailsBinding
+import kotlinx.coroutines.launch
+import org.dash.wallet.common.ui.dialogs.AdaptiveDialog
 import org.dash.wallet.common.ui.setRoundedRippleBackground
 import org.dash.wallet.common.ui.viewBinding
 import org.dash.wallet.common.util.observe
@@ -32,9 +38,11 @@ class UsernameRequestDetailsFragment : Fragment(R.layout.fragment_username_reque
             binding.identity.text = request.identity
 
             if (request.link.isNullOrEmpty()) {
+                binding.link.isVisible = false
                 binding.link.text = getString(R.string.link_not_provided)
                 binding.link.setTextColor(resources.getColor(R.color.content_tertiary, null))
             } else {
+                binding.link.isVisible = true
                 binding.link.text = request.link
             }
 
@@ -42,26 +50,45 @@ class UsernameRequestDetailsFragment : Fragment(R.layout.fragment_username_reque
                 if (request.isApproved) R.style.PrimaryButtonTheme_Large_Red else R.style.PrimaryButtonTheme_Large_Blue
             )
 
-            binding.voteButtonText.setTextColor(
-                resources.getColor(
-                    if (request.isApproved) R.color.system_red else R.color.dash_white,
-                    null
-                )
-            )
-
             binding.voteButtonText.text = getString(
                 if (request.isApproved) R.string.cancel_approval else R.string.vote_to_approve
             )
 
+            viewModel.observeVotesCount(request.normalizedLabel).observe(viewLifecycleOwner) { myVoteCount ->
+                binding.voteButton.isEnabled = (myVoteCount < UsernameVote.MAX_VOTES)
+            }
+
             binding.voteButton.setOnClickListener {
-                if (request.isApproved) {
-                    viewModel.revokeVote(args.requestId)
-                    findNavController().popBackStack(R.id.usernameRequestsFragment, false)
-                } else {
-                    if (viewModel.keysAmount > 0) {
-                        safeNavigate(UsernameRequestDetailsFragmentDirections.detailsToAddKeys(args.requestId))
-                    } else {
-                        safeNavigate(UsernameRequestDetailsFragmentDirections.detailsToVotingKeyInput(args.requestId))
+                lifecycleScope.launch {
+                    val usernameVotes = viewModel.getVotes(request.normalizedLabel)
+                    when {
+                        (usernameVotes.size == UsernameVote.MAX_VOTES - 1) -> {
+                            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)
+                            ).show(requireActivity()) {
+                                if (it == true) {
+                                    lifecycleScope.launch { doVote(request) }
+                                }
+                            }
+                        }
+
+                        // NOT IN THE DESIGN
+                        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)
+                            ).showAsync(requireActivity())
+                        }
+
+                        else -> {
+                            lifecycleScope.launch { doVote(request) }
+                        }
                     }
                 }
             }
@@ -69,4 +96,32 @@ class UsernameRequestDetailsFragment : Fragment(R.layout.fragment_username_reque
 
         viewModel.selectUsernameRequest(args.requestId)
     }
+
+    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,
+                        voteType
+                    )
+                )
+            } else {
+                safeNavigate(
+                    UsernameRequestDetailsFragmentDirections.detailsToVotingKeyInput(
+                        args.requestId,
+                        voteType
+                    )
+                )
+            }
+        } else {
+            viewModel.submitVote(request.requestId, voteType)
+        }
+    }
 }
diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestFilterDialog.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestFilterDialog.kt
index 13932fbc8e..7b38e7feb6 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestFilterDialog.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestFilterDialog.kt
@@ -43,7 +43,8 @@ enum class UsernameSortOption {
 enum class UsernameTypeOption {
     All,
     Approved,
-    NotApproved;
+    NotApproved,
+    HasBlockedVotes;
 
     companion object {
         val defaultOption = NotApproved
diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
index 823f4be56d..e83c173fd8 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsFragment.kt
@@ -27,6 +27,11 @@ 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
+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
@@ -34,34 +39,81 @@ import de.schildbach.wallet_test.R
 import de.schildbach.wallet_test.databinding.FragmentUsernameRequestsBinding
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import org.dash.wallet.common.services.analytics.AnalyticsConstants
 import org.dash.wallet.common.ui.dialogs.AdaptiveDialog
 import org.dash.wallet.common.ui.viewBinding
 import org.dash.wallet.common.util.KeyboardUtil
 import org.dash.wallet.common.util.observe
 import org.dash.wallet.common.util.safeNavigate
+import org.dashj.platform.dpp.voting.AbstainVoteChoice
+import org.dashj.platform.dpp.voting.LockVoteChoice
+import org.dashj.platform.dpp.voting.ResourceVoteChoice
+import org.dashj.platform.dpp.voting.TowardsIdentity
+import org.slf4j.LoggerFactory
 
 @AndroidEntryPoint
 class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
+    companion object {
+        private val log = LoggerFactory.getLogger(UsernameRequestsFragment::class.java)
+    }
     private val viewModel by votingViewModels<UsernameRequestsViewModel>()
     private val binding by viewBinding(FragmentUsernameRequestsBinding::bind)
     private var itemList = listOf<UsernameRequestGroupView>()
     private lateinit var keyboardUtil: KeyboardUtil
-
+    private var isShowingFirstTimeDialog = false
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
         val binding = this.binding
-        binding.toolbar.setOnClickListener {
-            viewModel.prepopulateList()
-        }
+        // TODO: remove when development is complete
+//        binding.toolbar.setOnClickListener {
+//            viewModel.prepopulateList()
+//        }
 
         binding.toolbar.setNavigationOnClickListener { findNavController().popBackStack() }
         binding.filterBtn.setOnClickListener {
             safeNavigate(UsernameRequestsFragmentDirections.requestsToFilters())
         }
-        val adapter = UsernameRequestGroupAdapter {
-            safeNavigate(UsernameRequestsFragmentDirections.requestsToDetails(it.requestId))
-        }
+        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 ->
@@ -97,21 +149,22 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
             binding.appliedFiltersPanel.isVisible = !viewModel.filterState.value.isDefault() && !isShown
         }
 
-        viewModel.uiState.observe(viewLifecycleOwner) { state ->
+        viewModel.                                                                                                              uiState.observe(viewLifecycleOwner) { state ->
             if (state.showFirstTimeInfo) {
                 showFirstTimeInfo()
             }
 
             setState(state.filteredUsernameRequests)
             setList(adapter, state.filteredUsernameRequests)
+            //setVotes(state.votes)
 
-            if (state.voteSubmitted) {
-                showVoteIndicator(binding, false)
-            }
-
-            if (state.voteCancelled) {
-                showVoteIndicator(binding, true)
-            }
+//            if (state.voteSubmitted) {
+//                showVoteIndicator(binding, false)
+//            }
+//
+//            if (state.voteCancelled) {
+//                showVoteIndicator(binding, true)
+//            }
         }
 
         viewModel.filterState.observe(viewLifecycleOwner) { state ->
@@ -124,18 +177,155 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
                 populateAppliedFilters(state)
             }
         }
+
+        viewModel.voteSubmissionLiveData.observe(viewLifecycleOwner) { voteData ->
+            log.info("vote data: {}", voteData)
+            voteData.forEach { (t, u) ->
+                try {
+                    val usernames =
+                        u.data?.outputData?.getStringArray(BroadcastUsernameVotesWorker.KEY_USERNAMES)?.toList()
+                    val votes =
+                        u.data?.outputData?.getStringArray(BroadcastUsernameVotesWorker.KEY_VOTE_CHOICES)?.toList()
+                    when (u.status) {
+                        Status.LOADING -> {
+                            log.info("  loading: {} {}", t, u.data?.outputData)
+                            //showVoteIndicator(binding, votes, usernames, u.status)
+                        }
+
+                        Status.SUCCESS -> {
+                            log.info("  success: {} {}", t, u.data?.outputData)
+                            showVoteIndicator(binding, votes!!, usernames!!, u.status)
+                        }
+
+                        Status.ERROR -> {
+                            log.info("  error: {} {}", t, u.data?.outputData)
+                            showVoteIndicator(binding, votes!!, usernames!!, u.status)
+                        }
+
+                        Status.CANCELED -> {
+                            log.info("  error: {} {}", t, u.data?.outputData)
+                        }
+                    }
+                } catch (e: Exception) {
+                    log.error("error processing vote information", e)
+                }
+            }
+        }
     }
 
-    private fun showFirstTimeInfo() {
+    private fun performVote(request: UsernameRequest) {
         lifecycleScope.launch {
-            delay(200)
-            AdaptiveDialog.create(
-                R.drawable.ic_user_list,
-                getString(R.string.voting_duplicates_only_title),
-                getString(R.string.voting_duplicates_only_message),
-                getString(R.string.button_ok)
-            ).showAsync(requireActivity())
-            viewModel.setFirstTimeInfoShown()
+            // 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
+        val vote = when (viewModel.getVotes(request.normalizedLabel).lastOrNull()?.type) {
+            UsernameVote.LOCK -> UsernameVote.ABSTAIN
+            else -> UsernameVote.LOCK
+        }
+        if (viewModel.shouldMaybeAskForMoreKeys()) {
+            if (viewModel.keysAmount > 0) {
+                safeNavigate(
+                    UsernameRequestsFragmentDirections.requestsToAddVotingKeysFragment(
+                        request.normalizedLabel,
+                        vote
+                    )
+                )
+            } else {
+                safeNavigate(
+                    UsernameRequestsFragmentDirections.requestsToVotingKeyInputFragment(
+                        request.requestId,
+                        vote
+                    )
+                )
+            }
+        } else {
+            viewModel.submitVote(request.requestId, vote)
+        }
+    }
+
+    private suspend fun doVote(request: UsernameRequest) {
+        val lastVote = viewModel.getVotes(request.normalizedLabel).lastOrNull()
+        val voteType = when {
+            lastVote == null -> UsernameVote.APPROVE
+            lastVote.type == UsernameVote.APPROVE && lastVote.identity == request.identity -> UsernameVote.ABSTAIN
+            else -> UsernameVote.APPROVE
+        }
+        if (viewModel.shouldMaybeAskForMoreKeys()) {
+            if (viewModel.keysAmount > 0) {
+                safeNavigate(
+                    UsernameRequestsFragmentDirections.requestsToAddVotingKeysFragment(
+                        request.requestId,
+                        voteType
+                    )
+                )
+            } else {
+                safeNavigate(
+                    UsernameRequestsFragmentDirections.requestsToVotingKeyInputFragment(
+                        request.requestId,
+                        voteType
+                    )
+                )
+            }
+        } else {
+            viewModel.submitVote(request.requestId, voteType)
+        }
+    }
+    private fun showFirstTimeInfo() {
+        if (!isShowingFirstTimeDialog) {
+            isShowingFirstTimeDialog = true
+            lifecycleScope.launch {
+                delay(200)
+                AdaptiveDialog.create(
+                    R.drawable.ic_user_list,
+                    getString(R.string.voting_duplicates_only_title),
+                    getString(R.string.voting_duplicates_only_message),
+                    getString(R.string.button_ok)
+                ).showAsync(requireActivity())
+                isShowingFirstTimeDialog = false
+                viewModel.setFirstTimeInfoShown()
+            }
         }
     }
 
@@ -143,7 +333,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
+        binding.quickVoteButton.isVisible = requests.isNotEmpty() && viewModel.keysAmount > 0 && Constants.SUPPORTS_QUICKVOTING
         binding.noItemsTxt.isVisible = requests.isEmpty()
     }
 
@@ -156,6 +346,10 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
         binding.requestGroups.scrollToPosition(scrollPosition)
     }
 
+//    private fun setVotes(adapter: UsernameRequestGroupAdapter, votes: List<UsernameVote>) {
+//        adapter.updateVotes(votes)
+//    }
+
     private fun filterByQuery(items: List<UsernameRequestGroupView>, query: String?): List<UsernameRequestGroupView> {
         if (query.isNullOrEmpty()) {
             return items
@@ -183,8 +377,46 @@ class UsernameRequestsFragment : Fragment(R.layout.fragment_username_requests) {
         binding.filteredByTxt.text = appliedFilterNames.joinToString(", ")
     }
 
-    private fun showVoteIndicator(binding: FragmentUsernameRequestsBinding, isCancelled: Boolean) {
-        binding.voteSubmittedTxt.text = getString(if (isCancelled) R.string.vote_cancelled else R.string.vote_submitted)
+    private fun showVoteIndicator(
+        binding: FragmentUsernameRequestsBinding,
+        votes: List<String>,
+        usernames: List<String>,
+        status: Status
+    ) {
+        if (votes.isEmpty()) {
+            return
+        }
+        val resourceVoteChoice = ResourceVoteChoice.from(votes.first())
+        val isCancelled = resourceVoteChoice == AbstainVoteChoice()
+        val username = if (usernames.size > 1) getString(R.string.quick_vote) else usernames.first()
+        viewModel.updateBroadcastVotesTimestamp()
+        viewModel.updateUsernameRequestsWithVotes()
+        if (viewModel.currentVote?.any { usernames.contains(it.username) } == true) {
+            log.info("vote, there is not match for {}", usernames)
+            //return
+        }
+        val toastText = when (status) {
+            Status.SUCCESS -> when (resourceVoteChoice) {
+                is AbstainVoteChoice -> getString(R.string.cancel_submitted, username)
+                is LockVoteChoice -> getString(R.string.block_submitted, username)
+                is TowardsIdentity -> getString(R.string.vote_submitted, username)
+                else -> error("invalid vote choice: $resourceVoteChoice")
+            }
+            Status.LOADING -> when (resourceVoteChoice) {
+                is AbstainVoteChoice -> getString(R.string.cancel_submitting, username)
+                is LockVoteChoice -> getString(R.string.block_submitting, username)
+                is TowardsIdentity -> getString(R.string.vote_submitting, username)
+                else -> error("invalid vote choice: $resourceVoteChoice")
+            }
+            Status.ERROR -> when (resourceVoteChoice) {
+                is AbstainVoteChoice -> getString(R.string.cancel_submitted_error, username)
+                is LockVoteChoice -> getString(R.string.block_submitted_error, username)
+                is TowardsIdentity -> getString(R.string.vote_submitted_error, username)
+                else -> error("invalid vote choice: $resourceVoteChoice")
+            }
+            Status.CANCELED -> return
+        }
+        binding.voteSubmittedTxt.text = toastText
         binding.voteSubmittedIcon.isVisible = !isCancelled
         binding.voteSubmittedIndicator.alpha = 0f
         binding.voteSubmittedIndicator.isVisible = true
diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
index 78195d07b0..17e7572c75 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRequestsViewModel.kt
@@ -20,10 +20,17 @@ package de.schildbach.wallet.ui.username
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
+import de.schildbach.wallet.Constants
+import de.schildbach.wallet.WalletApplication
+import de.schildbach.wallet.database.dao.ImportedMasternodeKeyDao
 import de.schildbach.wallet.database.dao.UsernameRequestDao
+import de.schildbach.wallet.database.dao.UsernameVoteDao
+import de.schildbach.wallet.database.entity.ImportedMasternodeKey
 import de.schildbach.wallet.database.entity.UsernameRequest
+import de.schildbach.wallet.database.entity.UsernameVote
 import de.schildbach.wallet.service.platform.PlatformSyncService
 import de.schildbach.wallet.ui.dashpay.utils.DashPayConfig
+import de.schildbach.wallet.ui.dashpay.work.BroadcastUsernameVotesOperation
 import de.schildbach.wallet.ui.username.adapters.UsernameRequestGroupView
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -36,20 +43,50 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.launchIn
 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
+import org.bitcoinj.wallet.authentication.AuthenticationKeyUsage
+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.ResourceVoteChoice
 import org.dashj.platform.sdk.platform.Names
+import java.net.InetSocketAddress
 import java.util.UUID
 import javax.inject.Inject
 import kotlin.math.min
 import kotlin.random.Random
 
+enum class InvalidKeyType {
+    WRONG_NETWORK,
+    ADDRESS,
+    PUBLIC_KEY_HEX,
+    PRIVATE_KEY_HEX,
+    NOT_INVALID,
+    CHARACTER,
+    SHORT,
+    CHECKSUM,
+    UNKNOWN
+}
+
 data class UsernameRequestsUIState(
     val filteredUsernameRequests: List<UsernameRequestGroupView> = listOf(),
+    val usernameVotes: Map<String, List<UsernameVote>> = mapOf(),
     val showFirstTimeInfo: Boolean = false,
     val voteSubmitted: Boolean = false,
     val voteCancelled: Boolean = false
@@ -74,8 +111,14 @@ data class FiltersUIState(
 class UsernameRequestsViewModel @Inject constructor(
     private val dashPayConfig: DashPayConfig,
     private val usernameRequestDao: UsernameRequestDao,
-    private val platformSyncService: PlatformSyncService
+    private val usernameVoteDao: UsernameVoteDao,
+    private val importedMasternodeKeyDao: ImportedMasternodeKeyDao,
+    private val platformSyncService: PlatformSyncService,
+    private val walletDataProvider: WalletDataProvider,
+    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)
 
@@ -95,46 +138,99 @@ class UsernameRequestsViewModel @Inject constructor(
                 .distinctUntilChanged()
         }
 
-    private val validKeys = listOf(
-        "kn2GwaSZkoY8qg6i2dPCpDtDoBCftJWMzZXtHDDJ1w7PjFYfq",
-        "n6YtJ7pdDYPTa57imEHEp8zinq1oNGUdwZQdnGk1MMpCWBHEq",
-        "maEiRZeKXNLZovNqoS3HkmZJGmACbro7s3eC8GenExLF7QMQs"
-    )
+    private val masternodeListManager: SimplifiedMasternodeListManager
+        get() = walletDataProvider.wallet!!.context.masternodeListManager
 
-    private val _addedKeys = MutableStateFlow(listOf<String>())
-    val masternodeIPs: Flow<List<String>> = _addedKeys.map {
-        List(it.size) { i -> "323.232.23.$i" }
-    }
+    private val _addedKeys = MutableStateFlow(listOf<ECKey>())
+    private val _masternodes =  MutableStateFlow<List<ImportedMasternodeKey>>(listOf())
+    val masternodes: StateFlow<List<ImportedMasternodeKey>>
+        get() = _masternodes
+
+    private val currentImportedKeys = listOf<ImportedMasternodeKey>()
+    private val currentMasternodeKeyUsage = listOf<AuthenticationKeyUsage>()
 
     val keysAmount: Int
-        get() = _addedKeys.value.size
+        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 ->
-                    duplicates.groupBy { it.username }
-                        .map { (username, list) ->
+                    duplicates.groupBy { it.normalizedLabel }
+                        .map { (normalizedUsername, list) ->
                             val sortedList = list.sortAndFilter()
-                            UsernameRequestGroupView(username, sortedList, isExpanded = isExpanded(username))
+                            val votes = usernameVoteDao.getVotes(normalizedUsername)
+                            // display usernames in lower case without 0 and 1 if possible
+                            val prettyUsername = when {
+                                list.size == 1 -> list[0].username.lowercase()
+                                else -> {
+                                    list.find {
+                                        !(it.username.contains('0') || it.username.contains('1'))
+                                    }?.username?.lowercase() ?: list[0].username
+                                }
+                            }
+                            UsernameRequestGroupView(prettyUsername, sortedList, isExpanded = isExpanded(normalizedUsername), votes)
                         }.filterNot { it.requests.isEmpty() }
                 }
         }.onEach { requests -> _uiState.update { it.copy(filteredUsernameRequests = requests) } }
             .launchIn(viewModelWorkerScope)
 
+        importedMasternodeKeyDao.observeAll()
+            .onEach { updateMasternodeKeys(it, currentMasternodeKeyUsage) }
+            .launchIn(viewModelScope)
+
+        walletDataProvider.observeAuthenticationKeyUsage()
+            .onEach { updateMasternodeKeys(currentImportedKeys, it)}
+
         viewModelWorkerScope.launch {
             platformSyncService.updateUsernameRequestsWithVotes()
         }
     }
 
+    private suspend fun updateMasternodeKeys(importedKeyList: List<ImportedMasternodeKey>, usage: List<AuthenticationKeyUsage>) {
+        val allKeys = arrayListOf<ImportedMasternodeKey>()
+        allKeys.addAll(importedKeyList)
+
+        usage.forEach {
+            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(
+                        ImportedMasternodeKey(
+                            masternode.proTxHash,
+                            masternode.service.socketAddress.address.hostAddress!!,
+                            it.key.privKeyBytes,
+                            it.key.pubKey,
+                            it.key.pubKeyHash
+                        )
+                    )
+                }
+            }
+        }
+        _masternodes.value = allKeys
+    }
+
     suspend fun setFirstTimeInfoShown() {
         dashPayConfig.set(DashPayConfig.VOTING_INFO_SHOWN, true)
     }
 
+    suspend fun getVotes(username: String): List<UsernameVote> {
+        return usernameVoteDao.getVotes(Names.normalizeString(username))
+    }
+
+    fun observeVotesCount(username: String): Flow<Int> {
+        return usernameVoteDao.observeVotes(Names.normalizeString(username)).flatMapLatest { flowOf(it.size) }
+    }
+
     fun applyFilters(
         sortByOption: UsernameSortOption,
         typeOption: UsernameTypeOption,
@@ -159,10 +255,31 @@ class UsernameRequestsViewModel @Inject constructor(
         if (keysAmount == 0) {
             return
         }
-
-        viewModelScope.launch {
+        logEvent(AnalyticsConstants.UsernameVoting.VOTE)
+        viewModelScope.launch(Dispatchers.IO) {
             usernameRequestDao.getRequest(requestId)?.let { request ->
+                BroadcastUsernameVotesOperation(walletApplication).create(
+                    listOf(request.normalizedLabel),
+                    listOf(ResourceVoteChoice.towardsIdentity(Identifier.from(request.identity))),
+                    masternodes.value.map { it.votingPrivateKey }
+                ).enqueue()
+
+                usernameRequestDao.removeApproval(request.username)
                 usernameRequestDao.update(request.copy(votes = request.votes + keysAmount, isApproved = true))
+//                usernameVoteDao.insert(
+//                    UsernameVote(
+//                        request.normalizedLabel,
+//                        request.identity,
+//                        UsernameVote.APPROVE
+//                    )
+//                )
+                currentVote = arrayListOf(
+                    UsernameVote(
+                        request.normalizedLabel,
+                        request.identity,
+                        UsernameVote.APPROVE
+                    )
+                )
                 _uiState.update { it.copy(voteSubmitted = true) }
             }
         }
@@ -172,10 +289,29 @@ class UsernameRequestsViewModel @Inject constructor(
         if (keysAmount == 0) {
             return
         }
-
-        viewModelScope.launch {
+        logEvent(AnalyticsConstants.UsernameVoting.VOTE_CANCEL)
+        viewModelScope.launch(Dispatchers.IO) {
             usernameRequestDao.getRequest(requestId)?.let { request ->
+                BroadcastUsernameVotesOperation(walletApplication).create(
+                    listOf(request.normalizedLabel),
+                    listOf(ResourceVoteChoice.abstain()),
+                    masternodes.value.map { it.votingPrivateKey }
+                ).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,
+                        "",
+                        UsernameVote.ABSTAIN
+                    )
+                )
                 _uiState.update { it.copy(voteCancelled = true) }
             }
         }
@@ -186,7 +322,7 @@ class UsernameRequestsViewModel @Inject constructor(
             return
         }
 
-        viewModelScope.launch {
+        viewModelScope.launch(Dispatchers.IO) {
             val filteredRequests = _uiState.value.filteredUsernameRequests
             val requestIds = filteredRequests.flatMap {
                 it.requests
@@ -200,6 +336,21 @@ class UsernameRequestsViewModel @Inject constructor(
                 keysAmount
             )
             _uiState.update { it.copy(voteSubmitted = true) }
+
+            val usernames = arrayListOf<String>()
+            val voteChoices = arrayListOf<ResourceVoteChoice>()
+            requestIds.forEach {
+                usernameRequestDao.getRequest(it)?.let { request ->
+                    usernames.add(request.normalizedLabel)
+                    voteChoices.add(ResourceVoteChoice.towardsIdentity(Identifier.from(request.identity)))
+                }
+            }
+
+            BroadcastUsernameVotesOperation(walletApplication).create(
+                usernames,
+                voteChoices,
+                masternodes.value.map { it.votingPrivateKey }
+            ).enqueue()
         }
     }
 
@@ -208,11 +359,51 @@ class UsernameRequestsViewModel @Inject constructor(
     }
 
     fun verifyKey(key: String): Boolean {
-        return validKeys.contains(key)
+        return getKeyFromWIF(key) != null
+    }
+
+    fun verifyMasterVotingKey(key: ECKey): Boolean {
+        return masternodeListManager
+            .listAtChainTip
+            .getMasternodesByVotingKey(KeyId.fromBytes(key.pubKeyHash))
+            .isNotEmpty()
     }
 
-    fun addKey(key: String) {
-        _addedKeys.value = _addedKeys.value + key
+    fun getKeyFromWIF(key: String): ECKey? {
+        return try {
+            DumpedPrivateKey.fromBase58(Constants.NETWORK_PARAMETERS, key).key
+        } catch (e: AddressFormatException) {
+            null
+        }
+    }
+
+    suspend fun addKey(key: ECKey) {
+        if (!_addedKeys.value.contains(key)) {
+            _addedKeys.value += key
+        }
+        val entries = masternodeListManager.listAtChainTip.getMasternodesByVotingKey(KeyId.fromBytes(key.pubKeyHash))
+        entries.forEach {
+            importedMasternodeKeyDao.insert(
+                ImportedMasternodeKey(
+                    it.proTxHash,
+                    it.service.socketAddress.address.hostAddress!!,
+                    key.privKeyBytes,
+                    key.pubKey,
+                    key.pubKeyHash
+                )
+            )
+        }
+    }
+
+    /**
+     * 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>> {
@@ -233,11 +424,12 @@ class UsernameRequestsViewModel @Inject constructor(
                 UsernameSortOption.VotesDescending -> compareByDescending { it.votes }
             }
         )
-
+        val approvedUsernames = sorted.filter { it.isApproved }.map { it.username }
         return when (_filterState.value.typeOption) {
             UsernameTypeOption.All -> sorted
-            UsernameTypeOption.Approved -> sorted.filter { it.isApproved }
-            UsernameTypeOption.NotApproved -> sorted.filter { !it.isApproved }
+            UsernameTypeOption.Approved -> sorted.filter { it.isApproved || approvedUsernames.contains(it.username) }
+            UsernameTypeOption.NotApproved -> sorted.filter { !it.isApproved && !approvedUsernames.contains(it.username) }
+            UsernameTypeOption.HasBlockedVotes -> sorted.filter { it.lockVotes != 0 }
         }
     }
 
@@ -246,11 +438,12 @@ class UsernameRequestsViewModel @Inject constructor(
     }
 
     private var nameCount = 1
+    // TODO: remove this when development is completed.
     fun prepopulateList() {
         nameCount++
-        val now = System.currentTimeMillis() / 1000
+        val now = System.currentTimeMillis()// / 1000
         val names = listOf("John", "doe", "Sarah", "Jane", "jack", "Jill", "Bob")
-        val from = 1658290321L
+        val from = 1658290321000L
 
         viewModelScope.launch {
             var name = names[Random.nextInt(0, min(names.size, nameCount))]
@@ -264,7 +457,7 @@ class UsernameRequestsViewModel @Inject constructor(
                     "https://www.figma.com/file/hh5juOSdGnNNPijJG1NGTi/DashPay%E3%83%BBIn-" +
                         "process%E3%83%BBAndroid?type=design&node-id=752-11735&mode=design&t=zasn6AKlSwb5NuYS-0",
                     Random.nextInt(0, 15),
-                    Random.nextInt(0, 15),
+                    Random.nextInt(0, 1),
                     true
                 )
             )
@@ -278,7 +471,7 @@ class UsernameRequestsViewModel @Inject constructor(
                     Base58.encode(UUID.randomUUID().toString().toByteArray()),
                     null,
                     Random.nextInt(0, 15),
-                    Random.nextInt(0, 15),
+                    Random.nextInt(0, 1),
                     true
                 )
             )
@@ -292,7 +485,7 @@ class UsernameRequestsViewModel @Inject constructor(
                     Base58.encode(UUID.randomUUID().toString().toByteArray()),
                     null,
                     Random.nextInt(0, 15),
-                    Random.nextInt(0, 15),
+                    Random.nextInt(0, 1),
                     false
                 )
             )
@@ -305,7 +498,7 @@ class UsernameRequestsViewModel @Inject constructor(
                     Base58.encode(UUID.randomUUID().toString().toByteArray()),
                     "https://twitter.com/ProductHunt/",
                     Random.nextInt(0, 15),
-                    Random.nextInt(0, 15),
+                    Random.nextInt(0, 1),
                     false
                 )
             )
@@ -318,7 +511,7 @@ class UsernameRequestsViewModel @Inject constructor(
                     Base58.encode(UUID.randomUUID().toString().toByteArray()),
                     null,
                     Random.nextInt(0, 15),
-                    Random.nextInt(0, 15),
+                    Random.nextInt(0, 1),
                     false
                 )
             )
@@ -332,7 +525,7 @@ class UsernameRequestsViewModel @Inject constructor(
                     Base58.encode(UUID.randomUUID().toString().toByteArray()),
                     null,
                     Random.nextInt(0, 15),
-                    Random.nextInt(0, 15),
+                    Random.nextInt(0, 1),
                     false
                 )
             )
@@ -346,10 +539,145 @@ class UsernameRequestsViewModel @Inject constructor(
                     Base58.encode(UUID.randomUUID().toString().toByteArray()),
                     null,
                     Random.nextInt(0, 15),
-                    Random.nextInt(0, 15),
+                    Random.nextInt(0, 2),
                     false
                 )
             )
         }
     }
+
+    fun block(username: String) {
+        if (keysAmount == 0) {
+            return
+        }
+        logEvent(AnalyticsConstants.UsernameVoting.BLOCK)
+        viewModelScope.launch(Dispatchers.IO) {
+            BroadcastUsernameVotesOperation(walletApplication).create(
+                listOf(username),
+                listOf(ResourceVoteChoice.lock()),
+                masternodes.value.map { it.votingPrivateKey }
+            ).enqueue()
+            //usernameRequestDao.update(request.copy(lockVotes = request.lockVotes + keysAmount, isApproved = true))
+
+            // TODO: put after actually submitting a vote
+//            usernameVoteDao.insert(
+//                UsernameVote(
+//                    Names.normalizeString(username),
+//                    "",
+//                    UsernameVote.LOCK
+//                )
+//            )
+            currentVote = arrayListOf(
+                UsernameVote(
+                    Names.normalizeString(username),
+                    "",
+                    UsernameVote.LOCK
+                )
+            )
+            _uiState.update { it.copy(voteSubmitted = true) }
+        }
+    }
+
+    fun logEvent(event: String) {
+        analytics.logEvent(event, mapOf())
+    }
+
+    fun submitVote(requestId: String, vote: String) {
+        when (vote) {
+            UsernameVote.APPROVE -> vote(requestId)
+            UsernameVote.LOCK -> block(requestId)
+            UsernameVote.ABSTAIN -> revokeVote(requestId)
+        }
+    }
+
+    fun setDontAskAgain() {
+        viewModelScope.launch(Dispatchers.IO) {
+            dashPayConfig.set(DashPayConfig.KEYS_DONT_ASK_AGAIN, true)
+        }
+    }
+
+    suspend fun shouldMaybeAskForMoreKeys() = !(dashPayConfig.get(DashPayConfig.KEYS_DONT_ASK_AGAIN) ?: false)
+
+    suspend fun setSecondTimeVoting() {
+        dashPayConfig.set(DashPayConfig.FIRST_TIME_VOTING, false)
+    }
+
+    suspend fun isFirstTimeVoting() = dashPayConfig.get(DashPayConfig.FIRST_TIME_VOTING) ?: true
+
+    fun invalidKeyType(wifKey: String): InvalidKeyType {
+        return try {
+            // check if it is a private key hex 64 chars first
+            if (wifKey.length == 64) {
+                try {
+                    Utils.HEX.decode(wifKey)
+                    return InvalidKeyType.PRIVATE_KEY_HEX
+                } catch (_: Exception) {
+                    // swallow
+                }
+            } else if (wifKey.length == 66) {
+                try {
+                    Utils.HEX.decode(wifKey)
+                    return InvalidKeyType.PUBLIC_KEY_HEX
+                } catch (_: Exception) {
+                    // swallow
+                }
+            }
+            DumpedPrivateKey.fromBase58(Constants.NETWORK_PARAMETERS, wifKey).key
+            InvalidKeyType.NOT_INVALID // shouldn't happen
+        } catch (e: AddressFormatException.WrongNetwork) {
+            try {
+                Address.fromBase58(Constants.NETWORK_PARAMETERS, wifKey)
+                InvalidKeyType.ADDRESS
+            } catch (e: AddressFormatException) {
+                InvalidKeyType.WRONG_NETWORK
+            }
+        } catch (e: AddressFormatException.InvalidChecksum) {
+            try {
+                if (Base58.decode(wifKey).size < 39)
+                    InvalidKeyType.SHORT
+                else InvalidKeyType.CHECKSUM
+            } catch (e: AddressFormatException.InvalidCharacter) {
+                InvalidKeyType.CHARACTER
+            }
+        } catch (e: AddressFormatException.InvalidCharacter) {
+            try {
+                if (Base58.decode(wifKey).size < 32)
+                    InvalidKeyType.SHORT
+                else InvalidKeyType.CHECKSUM
+            } catch (e: AddressFormatException.InvalidCharacter) {
+                InvalidKeyType.CHARACTER
+            }
+        } catch (e: Exception) {
+            // is it an address
+            try {
+                val decodedBytes = Utils.HEX.decode(wifKey)
+                if (decodedBytes.size == 33) {
+                    InvalidKeyType.PUBLIC_KEY_HEX
+                }
+                InvalidKeyType.PRIVATE_KEY_HEX
+            } catch (e: Exception) {
+                InvalidKeyType.UNKNOWN
+            }
+        }
+    }
+
+    fun updateBroadcastVotesTimestamp() {
+        BroadcastUsernameVotesOperation.lastTimestamp = System.currentTimeMillis()
+    }
+
+    fun updateUsernameRequestsWithVotes() {
+        viewModelScope.launch(Dispatchers.IO) {
+            platformSyncService.updateUsernameRequestsWithVotes()
+        }
+    }
+
+    fun removeMasternode(masternodeIp: String) {
+        val masternodeList = masternodeListManager.masternodeList
+        val masternode = masternodeList.getMNByAddress(InetSocketAddress(masternodeIp, Constants.NETWORK_PARAMETERS.port))
+        if (masternode != null) {
+            viewModelWorkerScope.launch {
+                importedMasternodeKeyDao.remove(masternode.proTxHash)
+            }
+        }
+    }
 }
diff --git a/wallet/src/de/schildbach/wallet/ui/username/VotingKeyInputFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/VotingKeyInputFragment.kt
index c49fc27a25..92c65e3dbe 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/VotingKeyInputFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/VotingKeyInputFragment.kt
@@ -31,8 +31,10 @@ 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
 import org.dash.wallet.common.util.safeNavigate
 
 @AndroidEntryPoint
@@ -54,19 +56,55 @@ class VotingKeyInputFragment : Fragment(R.layout.fragment_voting_key_input) {
             binding.inputWrapper.isEndIconVisible = key.isNotEmpty()
             binding.inputWrapper.isErrorEnabled = false
             binding.inputError.isVisible = false
+            onUserInteraction()
         }
 
         binding.verifyButton.setOnClickListener {
-            val key = binding.keyInput.text.toString()
+            val wifKey = binding.keyInput.text.toString()
 
-            if (viewModel.verifyKey(key)) {
-                viewModel.addKey(key)
-                lifecycleScope.launch {
-                    KeyboardUtil.hideKeyboard(requireContext(), binding.keyInput)
-                    delay(200)
-                    safeNavigate(VotingKeyInputFragmentDirections.votingKeyInputToAddKeys(args.requestId))
+            if (viewModel.verifyKey(wifKey)) {
+                val key = viewModel.getKeyFromWIF(wifKey)!!
+                val isValidMasternode = viewModel.verifyMasterVotingKey(key)
+                binding.inputWrapper.isErrorEnabled = false
+                binding.inputError.isVisible = false
+                if (isValidMasternode) {
+                    lifecycleScope.launch {
+                        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)
+                    binding.inputWrapper.isErrorEnabled = true
+                    binding.inputError.isVisible = true
                 }
             } else {
+                // determine the type of invalid key
+                val isMainnet = de.schildbach.wallet.Constants.NETWORK_PARAMETERS.id == NetworkParameters.ID_MAINNET
+                val errorMessageId = when (viewModel.invalidKeyType(wifKey)) {
+                    InvalidKeyType.WRONG_NETWORK -> if (isMainnet) R.string.voting_key_input_invalid_private_key_wrong_network_testnet else R.string.voting_key_input_invalid_private_key_wrong_network_mainnet
+                    InvalidKeyType.ADDRESS -> R.string.voting_key_input_invalid_private_key_address
+                    InvalidKeyType.PRIVATE_KEY_HEX -> R.string.voting_key_input_invalid_private_key_private_key_hex
+                    InvalidKeyType.PUBLIC_KEY_HEX -> R.string.voting_key_input_invalid_private_key_public_key_hex
+                    InvalidKeyType.SHORT -> R.string.voting_key_input_invalid_private_key_too_short
+                    InvalidKeyType.CHECKSUM -> R.string.voting_key_input_invalid_private_key_incorrect
+                    InvalidKeyType.CHARACTER -> R.string.voting_key_input_invalid_private_key_invalid_char
+
+                    else -> R.string.voting_key_input_error
+                }
+                binding.inputError.text = getString(errorMessageId, getString(if (isMainnet) R.string.dash_private_key_mainnet else R.string.dash_private_key_testnet))
                 binding.inputWrapper.isErrorEnabled = true
                 binding.inputError.isVisible = true
             }
diff --git a/wallet/src/de/schildbach/wallet/ui/username/adapters/IPAddressAdapter.kt b/wallet/src/de/schildbach/wallet/ui/username/adapters/IPAddressAdapter.kt
index 2d71ae1854..d81daef652 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/adapters/IPAddressAdapter.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/adapters/IPAddressAdapter.kt
@@ -24,7 +24,7 @@ import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import de.schildbach.wallet_test.databinding.ViewMasternodeIpBinding
 
-class IPAddressAdapter : ListAdapter<String, IPAddressViewHolder>(DiffCallback()) {
+class IPAddressAdapter(private val deleteClickListener: (String) -> Unit) : ListAdapter<String, IPAddressViewHolder>(DiffCallback()) {
     class DiffCallback : DiffUtil.ItemCallback<String>() {
         override fun areItemsTheSame(oldItem: String, newItem: String): Boolean {
             return oldItem == newItem
@@ -42,7 +42,7 @@ class IPAddressAdapter : ListAdapter<String, IPAddressViewHolder>(DiffCallback()
             false
         )
 
-        return IPAddressViewHolder(binding)
+        return IPAddressViewHolder(binding, deleteClickListener)
     }
 
     override fun onBindViewHolder(holder: IPAddressViewHolder, position: Int) {
@@ -51,8 +51,11 @@ class IPAddressAdapter : ListAdapter<String, IPAddressViewHolder>(DiffCallback()
     }
 }
 
-class IPAddressViewHolder(val binding: ViewMasternodeIpBinding): RecyclerView.ViewHolder(binding.root) {
+class IPAddressViewHolder(val binding: ViewMasternodeIpBinding, private val deleteClickListener: (String) -> Unit): RecyclerView.ViewHolder(binding.root) {
     fun bind(ipAddress: String) {
         binding.ipAddress.text = ipAddress
+        binding.removeMasternode.setOnClickListener {
+            deleteClickListener.invoke(ipAddress)
+        }
     }
 }
diff --git a/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupAdapter.kt b/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupAdapter.kt
index c604004760..6499538e58 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupAdapter.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupAdapter.kt
@@ -16,25 +16,60 @@
  */
 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
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 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.UsernameRequestGroupViewBinding
 import de.schildbach.wallet_test.databinding.UsernameRequestViewBinding
 import org.dash.wallet.common.ui.decorators.ListDividerDecorator
-import org.dash.wallet.common.ui.setRoundedBackground
-import java.time.LocalDateTime
-import java.time.ZoneOffset
-import java.time.format.DateTimeFormatter
+import org.dash.wallet.common.ui.applyStyle
+import org.dash.wallet.common.ui.setRoundedRippleBackground
+import org.dash.wallet.common.ui.setRoundedRippleBackgroundButtonStyle
+import org.dashj.platform.sdk.platform.Names
+import java.text.SimpleDateFormat
+
+import java.util.Date
+import java.util.Locale
+
+fun Button.setVoteThemeColors(
+    backgroundColor: Int,
+    textColor: Int
+) {
+    try {
+        val backgroundColor = context.getColor(backgroundColor)
+        val rippleDrawable = background as RippleDrawable
+        val backgroundDrawable = rippleDrawable.getDrawable(1).current as? GradientDrawable
+
+        // Set background color directly on the background drawable
+        backgroundDrawable?.setColor(backgroundColor)
+
+        // Set text color
+        setTextColor(context.getColor(textColor))
+    } catch (e: Exception) {
+        // Fallback
+        background.setColorFilter(backgroundColor, PorterDuff.Mode.SRC_IN)
+        setTextColor(textColor)
+    }
+}
 
 class UsernameRequestGroupAdapter(
-    private val usernameClickListener: (UsernameRequest) -> Unit
+    private val usernameDetailsClickListener: (UsernameRequest) -> Unit,
+    private val voteClickListener: (UsernameRequest) -> Unit
 ): ListAdapter<UsernameRequestGroupView, UsernameRequestGroupViewHolder>(
     DiffCallback()
 ) {
@@ -60,11 +95,17 @@ class UsernameRequestGroupAdapter(
 
     override fun onBindViewHolder(holder: UsernameRequestGroupViewHolder, position: Int) {
         val item = currentList[position]
-        holder.bind(item, usernameClickListener)
+        val hasMoreThanOneRequest = item.requests.size > 1
+        holder.bind(item, usernameDetailsClickListener, voteClickListener)
         holder.binding.root.setOnClickListener {
-            val index = currentList.indexOfFirst { it.username == item.username }
-            currentList[index].isExpanded = !currentList[index].isExpanded
-            notifyItemChanged(index)
+            // expand if there is more than 1 request, otherwise show details
+            if (hasMoreThanOneRequest) {
+                val index = currentList.indexOfFirst { it.username == item.username }
+                currentList[index].isExpanded = !currentList[index].isExpanded
+                notifyItemChanged(index)
+            } else {
+                usernameDetailsClickListener.invoke(item.requests.first())
+            }
         }
     }
 }
@@ -72,34 +113,91 @@ class UsernameRequestGroupAdapter(
 class UsernameRequestGroupViewHolder(
     val binding: UsernameRequestGroupViewBinding
 ): RecyclerView.ViewHolder(binding.root) {
-    fun bind(option: UsernameRequestGroupView, usernameClickListener: (UsernameRequest) -> Unit) {
+    fun bind(option: UsernameRequestGroupView, usernameClickListener: (UsernameRequest) -> Unit, voteClickListener: (UsernameRequest) -> Unit) {
+        val hasMoreThanOneRequest = option.requests.size > 1
         binding.username.text = option.username
+        binding.requestsAmount.isVisible = hasMoreThanOneRequest
         binding.requestsAmount.text = binding.root.resources.getString(R.string.n_requests, option.requests.size)
         binding.requestsList.isVisible = option.isExpanded
+        binding.chevron.isVisible = hasMoreThanOneRequest
         binding.chevron.rotation = if (option.isExpanded) 90f else 270f
+        binding.linkBadge.isVisible = !hasMoreThanOneRequest
+        binding.linkIncluded.isVisible = !hasMoreThanOneRequest
 
-        if (option.isExpanded) {
-            val adapter = UsernameRequestAdapter {
-                usernameClickListener.invoke(it)
+        //binding.blockVotes.text = binding.root.context.getString(R.string.block_vote_count, option.lockVotes())
+        //binding.blockVotes.isVisible = option.lockVotes() != 0
+        val context = binding.root.context
+        binding.blocksButton.text = context.getString(R.string.two_lines_number_text, option.lockVotes(), context.resources.getQuantityString(R.plurals.block_vote_button, option.lockVotes()))
+        binding.blocksButton.setOnClickListener {
+            usernameClickListener.invoke(UsernameRequest.block(option.username, Names.normalizeString(option.username)))
+        }
+        binding.approvalsButton.isVisible = !hasMoreThanOneRequest
+        binding.approvalsButton.text = context.getString(R.string.two_lines_number_text, option.requests.maxOf { it.votes }, context.resources.getQuantityString(R.plurals.approval_button, option.requests.maxOf { it.votes }))
+        binding.approvalsButton.setOnClickListener {
+            // vote for the first request, which is the only request
+            voteClickListener.invoke(option.requests.first())
+        }
+
+        // change the button colors based on our vote(s)
+        val lastVote = option.votes.lastOrNull()
+        when (lastVote?.type?.lowercase()) {
+            UsernameVote.APPROVE -> {
+                binding.blocksButton.text = context.getString(R.string.two_lines_number_text, option.lockVotes(), context.resources.getQuantityString(R.plurals.block_vote_button, option.lockVotes()))
+
+                //binding.approvalsButton.applyStyle(R.style.VoteButton_Blue)
+                //binding.blocksButton.applyStyle(R.style.VoteButton_LightRed)
+
+                binding.blocksButton.setVoteThemeColors(R.color.red_0_05, R.color.red)
+                binding.approvalsButton.setVoteThemeColors(R.color.dash_blue, R.color.dash_white)
+                //binding.blocksButton.setRoundedRippleBackground(R.style.VoteButton_LightRed)
+                //binding.blocksButton.setRoundedRippleBackground(R.style.VoteButton_Blue)
             }
-            binding.requestsList.adapter = adapter
-            val divider = ContextCompat.getDrawable(binding.root.context, R.drawable.list_divider)!!
-            val decorator = ListDividerDecorator(
-                divider,
-                showAfterLast = false,
-                marginStart = binding.root.resources.getDimensionPixelOffset(R.dimen.divider_margin_horizontal),
-                marginEnd = 0
+            UsernameVote.LOCK -> {
+                binding.blocksButton.text = context.getString(R.string.two_lines_number_text, option.lockVotes(), context.getString(R.string.unblock_button))
+                //binding.blocksButton.setRoundedRippleBackgroundButtonStyle(R.style.VoteButton_Red)
+                //binding.blocksButton.applyStyle(R.style.VoteButton_Red)
+                //binding.approvalsButton.applyStyle(R.style.VoteButton_LightBlue)
+                binding.blocksButton.setVoteThemeColors(R.color.red, R.color.dash_white)
+                binding.approvalsButton.setVoteThemeColors(R.color.dash_blue_0_05, R.color.dash_blue)
+                //binding.blocksButton.setRoundedRippleBackground(R.style.VoteButton_Red)
+                //binding.blocksButton.setRoundedRippleBackground(R.style.VoteButton_LightBlue)
+            }
+            else -> {
+                binding.blocksButton.text = context.getString(R.string.two_lines_number_text, option.lockVotes(), context.resources.getQuantityString(R.plurals.block_vote_button, option.lockVotes()))
+                //binding.blocksButton.applyStyle(R.style.VoteButton_LightRed)
+                //binding.approvalsButton.applyStyle(R.style.VoteButton_LightBlue)
+                binding.blocksButton.setVoteThemeColors(R.color.red_0_05, R.color.red)
+                binding.approvalsButton.setVoteThemeColors(R.color.dash_blue_0_05, R.color.dash_blue)
+                //binding.blocksButton.setRoundedRippleBackground(R.style.VoteButton_LightRed)
+                //binding.blocksButton.setRoundedRippleBackground(R.style.VoteButton_LightBlue)
+            }
+        }
+
+        if (option.isExpanded) {
+            val adapter = UsernameRequestAdapter(
+                option.votes,
+                { request -> usernameClickListener.invoke(request) },
+                { request -> voteClickListener.invoke(request) }
             )
-            binding.requestsList.addItemDecoration(decorator)
+            binding.requestsList.adapter = adapter
+//            val divider = ContextCompat.getDrawable(binding.root.context, R.drawable.list_divider)!!
+//            val decorator = ListDividerDecorator(
+//                divider,
+//                showAfterLast = false,
+//                marginStart = binding.root.resources.getDimensionPixelOffset(R.dimen.divider_margin_horizontal),
+//                marginEnd = 0
+//            )
+//            binding.requestsList.addItemDecoration(decorator)
             adapter.submitList(option.requests)
         }
     }
 }
 
 class UsernameRequestAdapter(
-    private val clickListener: (UsernameRequest) -> Unit
-) : ListAdapter<UsernameRequest, UsernameRequestViewHolder>(DiffCallback()) {
-
+    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
@@ -110,53 +208,147 @@ class UsernameRequestAdapter(
         }
     }
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): UsernameRequestViewHolder {
-        val binding = UsernameRequestViewBinding.inflate(
-            LayoutInflater.from(parent.context),
-            parent,
-            false
-        )
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AbstractUsernameRequestViewHolder {
+        if (viewType == 0) {
+            val binding = UsernameRequestViewBinding.inflate(
+                LayoutInflater.from(parent.context),
+                parent,
+                false
+            )
+
+            return UsernameRequestViewHolder(binding)
+        } else {
+            error("invalid viewType: $viewType")
+        }
+    }
 
-        return UsernameRequestViewHolder(binding)
+    override fun getItemViewType(position: Int): Int {
+        return if (getItem(position).requestId == "") {
+            1
+        } else {
+            0
+        }
     }
 
-    override fun onBindViewHolder(holder: UsernameRequestViewHolder, position: Int) {
+    override fun onBindViewHolder(holder: AbstractUsernameRequestViewHolder, position: Int) {
         val item = currentList[position]
-        holder.bind(item)
-        holder.binding.root.setOnClickListener {
-            clickListener.invoke(item)
-        }
+        holder.bind(item, votes)
+
+        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, voteClickListener: (UsernameRequest) -> Unit)
 }
 
 class UsernameRequestViewHolder(
     val binding: UsernameRequestViewBinding
-): RecyclerView.ViewHolder(binding.root) {
-    fun bind(request: UsernameRequest) {
-        binding.dateRegistered.text = DateTimeFormatter.ofPattern("dd MMM yyyy · hh:mm a").format(
-            LocalDateTime.ofEpochSecond(request.createdAt, 0, ZoneOffset.UTC)
-        )
+): AbstractUsernameRequestViewHolder(binding.root) {
+    override fun bind(request: UsernameRequest, votes: List<UsernameVote>) {
+        val context = binding.root.context
+        val dateFormat = SimpleDateFormat("dd MMM yyyy · hh:mm a", Locale.getDefault())
+        binding.dateRegistered.text = dateFormat.format(Date(request.createdAt))
+//            DateTimeFormatter.ofPattern("dd MMM yyyy · hh:mm a").format(
+//            LocalDateTime.ofEpochSecond(request.createdAt / 1000, 0, ZoneOffset.UTC)
+//        )
 
-        binding.voteAmount.setRoundedBackground(
-            if (request.isApproved) {
-                R.style.BlueBadgeTheme
-            } else {
-                R.style.InactiveBadgeTheme
+        binding.approvalsButton.text = context.getString(R.string.two_lines_number_text, request.votes, context.resources.getQuantityString(R.plurals.approval_button, request.votes))
+//        binding.approvalsButton.setOnClickListener {
+//            // vote for the first request, which is the only request
+//            usernameClickListener.invoke(option.requests.first())
+//        }
+//        votes.lastOrNull()?.let { vote ->
+//            when (vote.type) {
+//                UsernameVote.LOCK, UsernameVote.ABSTAIN -> {
+//                    binding.approvalsButton.applyStyle(R.style.VoteButton_LightBlue)
+//                }
+//                UsernameVote.APPROVE -> {
+//                    binding.approvalsButton.applyStyle(R.style.VoteButton_Blue)
+//                }
+//            }
+//        } ?: {
+//            binding.approvalsButton.applyStyle(R.style.VoteButton_LightBlue)
+//        }
+        val lastVote = votes.lastOrNull()
+        when (lastVote?.type) {
+            UsernameVote.APPROVE -> {
+                if (lastVote.identity == request.identity) {
+                    binding.approvalsButton.setVoteThemeColors(R.color.dash_blue, R.color.dash_white)
+                } else {
+                    binding.approvalsButton.setVoteThemeColors(R.color.dash_blue_0_05, R.color.dash_blue)
+                }
             }
-        )
+            UsernameVote.LOCK, UsernameVote.ABSTAIN -> {
+                binding.approvalsButton.setVoteThemeColors(R.color.dash_blue_0_05, R.color.dash_blue)
+            }
+            else -> {
+                binding.approvalsButton.setVoteThemeColors(R.color.dash_blue_0_05, R.color.dash_blue)
+            }
+        }
 
-        binding.voteAmount.setTextColor(
-            binding.voteAmount.resources.getColor(
-                if (request.isApproved) {
-                    R.color.white
-                } else {
-                    R.color.content_tertiary
-                },
-                null
-            )
-        )
+//        binding.voteAmount.setRoundedBackground(
+//            if (request.isApproved) {
+//                R.style.BlueBadgeTheme
+//            } else {
+//                R.style.InactiveBadgeTheme
+//            }
+//        )
+//
+//        binding.voteAmount.setTextColor(
+//            binding.voteAmount.resources.getColor(
+//                if (request.isApproved) {
+//                    R.color.white
+//                } else {
+//                    R.color.content_tertiary
+//                },
+//                null
+//            )
+//        )
+
+        //binding.voteAmount.text = request.votes.toString()
+        binding.linkBadge.isGone = request.link.isNullOrEmpty()
+        binding.linkIncluded.isGone = request.link.isNullOrEmpty()
 
-        binding.voteAmount.text = request.votes.toString()
-        binding.linkBadge.isVisible = !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) {
+        binding.root.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)
+//        }
+//    }
+//}
diff --git a/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupView.kt b/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupView.kt
index fb5c25d90f..e26ec05c0d 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupView.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/adapters/UsernameRequestGroupView.kt
@@ -18,9 +18,22 @@
 package de.schildbach.wallet.ui.username.adapters
 
 import de.schildbach.wallet.database.entity.UsernameRequest
+import de.schildbach.wallet.database.entity.UsernameVote
 
 data class UsernameRequestGroupView(
     val username: String,
     val requests: List<UsernameRequest>,
-    var isExpanded: Boolean = false
-)
+    var isExpanded: Boolean = false,
+    var votes: List<UsernameVote>
+) {
+    val lastVote: UsernameVote?
+        get() = votes.lastOrNull()
+
+    val totalVotes: Int
+        get() = votes.size
+
+    // all username votes should have the same number of lock votes
+    fun lockVotes(): Int {
+        return requests.first().lockVotes
+    }
+}
diff --git a/wallet/src/de/schildbach/wallet/ui/username/voting/ConfirmUsernameRequestDialogFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/voting/ConfirmUsernameRequestDialogFragment.kt
index 403f805143..30e2d951e5 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/voting/ConfirmUsernameRequestDialogFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/voting/ConfirmUsernameRequestDialogFragment.kt
@@ -25,6 +25,7 @@ import androidx.navigation.fragment.navArgs
 import dagger.hilt.android.AndroidEntryPoint
 import de.schildbach.wallet_test.R
 import de.schildbach.wallet_test.databinding.DialogConfirmUsernameRequestBinding
+import org.dash.wallet.common.services.analytics.AnalyticsConstants
 import org.dash.wallet.common.ui.dialogs.OffsetDialogFragment
 import org.dash.wallet.common.ui.viewBinding
 import org.dash.wallet.common.util.observe
@@ -40,6 +41,7 @@ class ConfirmUsernameRequestDialogFragment: OffsetDialogFragment(R.layout.dialog
         super.onViewCreated(view, savedInstanceState)
         viewModel.isContestableUsername = requestUserNameViewModel.isUsernameContestable()
         binding.confirmBtn.setOnClickListener {
+            requestUserNameViewModel.logEvent(AnalyticsConstants.UsersContacts.CREATE_USERNAME_CONFIRM)
             requestUserNameViewModel.submit()
             dismiss()
         }
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 63e6a53279..fe7c60bd12 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUserNameViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUserNameViewModel.kt
@@ -21,17 +21,24 @@ import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import de.schildbach.wallet.Constants
 import de.schildbach.wallet.WalletApplication
+import de.schildbach.wallet.data.CoinJoinConfig
 import de.schildbach.wallet.database.dao.UsernameRequestDao
 import de.schildbach.wallet.database.entity.BlockchainIdentityConfig
 import de.schildbach.wallet.database.entity.BlockchainIdentityConfig.Companion.CREATION_STATE
 import de.schildbach.wallet.database.entity.BlockchainIdentityConfig.Companion.IDENTITY_ID
 import de.schildbach.wallet.database.entity.BlockchainIdentityConfig.Companion.USERNAME
+import de.schildbach.wallet.database.entity.BlockchainIdentityConfig.Companion.USERNAME_REQUESTED
 import de.schildbach.wallet.database.entity.BlockchainIdentityData
 import de.schildbach.wallet.database.entity.UsernameRequest
 import de.schildbach.wallet.livedata.Status
+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
@@ -42,10 +49,18 @@ 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
+import org.dash.wallet.common.services.analytics.AnalyticsService
+import org.dashj.platform.dashpay.UsernameRequestStatus
+import org.dashj.platform.dpp.identifier.Identifier
+import org.dashj.platform.sdk.platform.DomainDocument
 import org.dashj.platform.sdk.platform.Names
+import org.slf4j.LoggerFactory
 import javax.inject.Inject
+import kotlin.math.max
 
 data class RequestUserNameUIState(
     val usernameVerified: Boolean = false,
@@ -64,37 +79,59 @@ data class RequestUserNameUIState(
     val votingPeriodStart: Long = System.currentTimeMillis()
 )
 
+@OptIn(ExperimentalCoroutinesApi::class)
 @HiltViewModel
 class RequestUserNameViewModel @Inject constructor(
     val walletApplication: WalletApplication,
-    val identityConfig: BlockchainIdentityConfig,
+    private val identityConfig: BlockchainIdentityConfig,
     val walletData: WalletDataProvider,
     val platformRepo: PlatformRepo,
-    val usernameRequestDao: UsernameRequestDao
+    val usernameRequestDao: UsernameRequestDao,
+    val coinJoinConfig: CoinJoinConfig,
+    val analytics: AnalyticsService
 ) : ViewModel() {
+    companion object {
+        private val log = LoggerFactory.getLogger(RequestUserNameViewModel::class.java)
+    }
+    private val workerJob = SupervisorJob()
+    private val viewModelWorkerScope = CoroutineScope(Dispatchers.IO + workerJob)
     private val _uiState = MutableStateFlow(RequestUserNameUIState())
     val uiState: StateFlow<RequestUserNameUIState> = _uiState.asStateFlow()
 
     private val _requestedUserNameLink = MutableStateFlow<String?>(null)
     val requestedUserNameLink: StateFlow<String?> = _requestedUserNameLink.asStateFlow()
 
+    var identity: BlockchainIdentityData? = null
     var requestedUserName: String? = null
+    var identityBalance: Long = 0L
+
+    private val _walletBalance = MutableStateFlow(Coin.ZERO)
+    val walletBalance: StateFlow<Coin>
+        get() = _walletBalance
 
-    val walletBalance: Coin
-        get() = walletData.getWalletBalance()
     suspend fun isUserNameRequested(): Boolean {
         val hasRequestedName = identityConfig.get(USERNAME).isNullOrEmpty().not()
         val creationState = BlockchainIdentityData.CreationState.valueOf(
             identityConfig.get(CREATION_STATE) ?: BlockchainIdentityData.CreationState.NONE.name
         )
-        return hasRequestedName && creationState != BlockchainIdentityData.CreationState.NONE &&
-                creationState.ordinal <= BlockchainIdentityData.CreationState.VOTING.ordinal
+        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
     }
+
+    suspend fun isUsernameLostAfterVoting(): Boolean {
+        return isUserNameRequested() &&
+                UsernameRequestStatus.valueOf(identityConfig.get(USERNAME_REQUESTED)!!) == UsernameRequestStatus.LOST_VOTE
+    }
+
     suspend fun hasUserCancelledVerification(): Boolean =
         identityConfig.get(BlockchainIdentityConfig.CANCELED_REQUESTED_USERNAME_LINK) ?: false
 
-    fun canAffordNonContestedUsername(): Boolean = walletBalance >= Constants.DASH_PAY_FEE
-    fun canAffordContestedUsername(): Boolean = walletBalance >= Constants.DASH_PAY_FEE_CONTESTED
+    fun canAffordNonContestedUsername(): Boolean = _walletBalance.value >= Constants.DASH_PAY_FEE
+    fun canAffordContestedUsername(): Boolean = _walletBalance.value >= Constants.DASH_PAY_FEE_CONTESTED
 
     val myUsernameRequest: Flow<UsernameRequest?>
         get() = _myUsernameRequest
@@ -102,19 +139,58 @@ class RequestUserNameViewModel @Inject constructor(
 
     init {
         viewModelScope.launch {
-            _requestedUserNameLink.value = identityConfig.get(BlockchainIdentityConfig.REQUESTED_USERNAME_LINK)
+            _requestedUserNameLink.value = withContext(Dispatchers.IO) {
+                identityConfig.get(BlockchainIdentityConfig.REQUESTED_USERNAME_LINK)
+            }
         }
         identityConfig.observe(IDENTITY_ID)
             .filterNotNull()
             .onEach {
+                identity = identityConfig.load()
+                identityBalance = identity?.let { identity ->
+                    platformRepo.getIdentityBalance(Identifier.from(identity.userId)).balance
+                } ?: 0
+                log.info("identity balance: {}", identityBalance)
                 if (requestedUserName == null) {
                     requestedUserName = identityConfig.get(USERNAME)
                 }
             }
             .flatMapLatest { usernameRequestDao.observeRequest(UsernameRequest.getRequestId(it, requestedUserName!!)) }
-            .onEach { _myUsernameRequest.value = it }
-            .launchIn(viewModelScope)
+            .onEach {
+                if (it != null) {
+                    _myUsernameRequest.value = it
+                } else {
+                    identity?.let { identityData ->
+                        _myUsernameRequest.value = UsernameRequest(
+                            UsernameRequest.getRequestId(identityData.userId!!, requestedUserName!!),
+                            requestedUserName!!,
+                            Names.normalizeString(requestedUserName!!),
+                            identityData.votingPeriodStart ?: -1L,
+                            identityData.userId!!,
+                            identityData.verificationLink ?: "",
+                            0,
+                            0,
+                            false
+                        )
+                    }
+                }
+            }
+            .launchIn(viewModelWorkerScope)
 
+        coinJoinConfig.observeMode()
+            .flatMapLatest { coinJoinMode ->
+                walletData.observeBalance(
+                    if (coinJoinMode == CoinJoinMode.NONE) {
+                        Wallet.BalanceType.ESTIMATED_SPENDABLE
+                    } else {
+                        Wallet.BalanceType.COINJOIN_SPENDABLE
+                    }
+                )
+            }
+            .onEach {
+                _walletBalance.value = it
+            }
+            .launchIn(viewModelScope)
     }
 
     private fun triggerIdentityCreation(reuseTransaction: Boolean) {
@@ -130,9 +206,12 @@ class RequestUserNameViewModel @Inject constructor(
         // Reset ui state for retry if needed
         resetUiForRetrySubmit()
         viewModelScope.launch {
-            updateConfig()
+            withContext(Dispatchers.IO) { updateConfig() }
             // send the request / create username, assume not retry
-            triggerIdentityCreation(false)
+            val reuseTransaction = identity?.let {
+                it.usernameRequested == UsernameRequestStatus.LOCKED || it.usernameRequested == UsernameRequestStatus.LOST_VOTE
+            } ?: false
+            triggerIdentityCreation(reuseTransaction)
         }
         // if call success
         // updateUiForApiSuccess()
@@ -155,7 +234,7 @@ class RequestUserNameViewModel @Inject constructor(
 
     private suspend fun updateConfig() {
         requestedUserName?.let { name ->
-            identityConfig.set(BlockchainIdentityConfig.USERNAME, name)
+            identityConfig.set(USERNAME, name)
         }
         _requestedUserNameLink.value.let { link ->
             identityConfig.set(BlockchainIdentityConfig.REQUESTED_USERNAME_LINK, link ?: "")
@@ -184,22 +263,41 @@ class RequestUserNameViewModel @Inject constructor(
     fun checkUsername(requestedUserName: String?) {
         viewModelScope.launch {
             requestedUserName?.let { username ->
-                val usernameSearchResult = platformRepo.getUsername(username)
+                val usernameSearchResult = withContext(Dispatchers.IO) { platformRepo.getUsername(username) }
                 val usernameExists = when (usernameSearchResult.status) {
                     Status.SUCCESS -> {
                         usernameSearchResult.data != null
                     }
                     else -> false
                 }
-                val usernameContested = false // TODO: make the call
-                val usernameBlocked = false // TODO: make the call
+                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
+                        }
+                    } catch (e: NoSuchElementException) {
+                        -1L
+                    }
+
+                    // is the name blocked
+                    firstCreatedAt == -1L && contenders.lockVoteTally > maxApprovalVotes
+                }
                 _uiState.update {
                     it.copy(
                         usernameCheckSuccess = true,
                         usernameSubmittedError = false,
-                        usernameContested = usernameContested,
-                        usernameExists = usernameExists,
-                        usernameBlocked = usernameBlocked
+                        usernameContested = usernameContested, usernameExists = usernameExists,
+                        usernameBlocked = usernameBlocked,
+                        votingPeriodStart = if (firstCreatedAt == -1L) System.currentTimeMillis() else firstCreatedAt
                     )
                 }
             }
@@ -208,31 +306,35 @@ class RequestUserNameViewModel @Inject constructor(
 
     fun verify() {
         viewModelScope.launch {
-            identityConfig.set(BlockchainIdentityConfig.REQUESTED_USERNAME_LINK, _requestedUserNameLink.value ?: "")
-            identityConfig.get(IDENTITY_ID)?.let { identityId ->
-                val usernameRequest = usernameRequestDao.getRequest(
-                    UsernameRequest.getRequestId(
-                        identityId,
-                        requestedUserName!!
+            withContext(Dispatchers.IO) {
+                identityConfig.set(BlockchainIdentityConfig.REQUESTED_USERNAME_LINK, _requestedUserNameLink.value ?: "")
+                identityConfig.get(IDENTITY_ID)?.let { identityId ->
+                    val usernameRequest = usernameRequestDao.getRequest(
+                        UsernameRequest.getRequestId(
+                            identityId,
+                            requestedUserName!!
+                        )
                     )
-                )
-                usernameRequest!!.link = _requestedUserNameLink.value
-                usernameRequestDao.update(usernameRequest)
+                    usernameRequest!!.link = _requestedUserNameLink.value
+                    usernameRequestDao.update(usernameRequest)
+                }
             }
             _uiState.update {
                 it.copy(
                     usernameVerified = true
                 )
             }
-            //submit()
         }
     }
 
+    @Deprecated("requests cannot be canceled")
     fun cancelRequest() {
         viewModelScope.launch {
-            identityConfig.set(BlockchainIdentityConfig.USERNAME, "")
-            identityConfig.set(BlockchainIdentityConfig.REQUESTED_USERNAME_LINK, "")
-            identityConfig.set(BlockchainIdentityConfig.CANCELED_REQUESTED_USERNAME_LINK, true)
+            withContext(Dispatchers.IO) {
+                identityConfig.set(BlockchainIdentityConfig.USERNAME, "")
+                identityConfig.set(BlockchainIdentityConfig.REQUESTED_USERNAME_LINK, "")
+                identityConfig.set(BlockchainIdentityConfig.CANCELED_REQUESTED_USERNAME_LINK, true)
+            }
         }
     }
 
@@ -243,8 +345,6 @@ class RequestUserNameViewModel @Inject constructor(
     private fun validateUsernameCharacters(uname: String): Pair<Boolean, Boolean> {
         val alphaNumHyphenValid = !Regex("[^a-zA-Z0-9\\-]").containsMatchIn(uname)
         val startOrEndWithHyphen = uname.startsWith("-") || uname.endsWith("-")
-        //val containsHyphen = uname.contains("-")
-
         return Pair(alphaNumHyphenValid, startOrEndWithHyphen)
     }
 
@@ -252,17 +352,24 @@ class RequestUserNameViewModel @Inject constructor(
         val validLength = validateUsernameSize(username)
         val (validCharacters, startOrEndWithHyphen) = validateUsernameCharacters(username)
         val contestable = Names.isUsernameContestable(username)
+
+        // if we have an identity, then we must use our identity balance
+        val enoughIdentityBalance = if (contestable) {
+            identityBalance >= Constants.DASH_PAY_FEE_CONTESTED.value * 1000
+        } else {
+            identityBalance >= Constants.DASH_PAY_FEE.value / 3 * 1000
+        }
         val enoughBalance = if (contestable) {
-            walletBalance >= Constants.DASH_PAY_FEE_CONTESTED
+            _walletBalance.value >= Constants.DASH_PAY_FEE_CONTESTED
         } else {
-            walletBalance >= Constants.DASH_PAY_FEE
+            _walletBalance.value >= Constants.DASH_PAY_FEE
         }
         _uiState.update {
             it.copy(
                 usernameLengthValid = validLength,
                 usernameCharactersValid = validCharacters && !startOrEndWithHyphen,
                 usernameContestable = contestable,
-                enoughBalance = enoughBalance,
+                enoughBalance = if (identityBalance > 0) enoughIdentityBalance else enoughBalance,
                 usernameTooShort = username.isEmpty(),
                 usernameSubmittedError = false,
                 usernameCheckSuccess = false,
@@ -280,7 +387,11 @@ class RequestUserNameViewModel @Inject constructor(
             BroadcastIdentityVerifyOperation(walletApplication).create(
                 requestedUserName!!,
                 url
-            )
+            ).enqueue()
         }
     }
+
+    fun logEvent(event: String) {
+        analytics.logEvent(event, mapOf())
+    }
 }
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 530c5b1b1e..4c4ea19124 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUsernameFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUsernameFragment.kt
@@ -11,18 +11,23 @@ import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.textfield.TextInputLayout
 import dagger.hilt.android.AndroidEntryPoint
+import de.schildbach.wallet.Constants
 import de.schildbach.wallet.database.entity.BlockchainIdentityData
+import de.schildbach.wallet.database.entity.UsernameRequest
 import de.schildbach.wallet.ui.dashpay.DashPayViewModel
 import de.schildbach.wallet_test.R
 import de.schildbach.wallet_test.databinding.FragmentRequestUsernameBinding
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import org.bitcoinj.core.NetworkParameters
 import org.dash.wallet.common.InteractionAwareActivity
+import org.dash.wallet.common.services.analytics.AnalyticsConstants
 import org.dash.wallet.common.ui.dialogs.AdaptiveDialog
 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.dashpay.UsernameRequestStatus
 import java.util.Date
 import java.util.concurrent.TimeUnit
 
@@ -44,26 +49,14 @@ 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()
-            // TODO: Replace with api to verify username
-            val isUsernameValid = binding.usernameInput.text.contentEquals("test") ||
-                binding.usernameInput.text.contentEquals("admin")
-
 
-            if (username != null) {
+            if (username.isNotEmpty()) {
                 val usernameIsValid = requestUserNameViewModel.checkUsernameValid(username)
 
                 if (usernameIsValid) { // ensure username meets basic rules before making a Platform query
-                    // usernameAvailabilityValidationInProgressState()
                     checkUsername(username)
                 } else {
-//                binding.usernameExistsReqProgress.visibility = View.INVISIBLE
-//                binding.usernameExistsReqLabel.visibility = View.GONE
-//                binding.usernameExistsReqImg.visibility = View.GONE
-//                binding.registerBtn.isEnabled = false
                     if (this::checkUsernameNotExistRunnable.isInitialized) {
                         handler.removeCallbacks(checkUsernameNotExistRunnable)
                         dashPayViewModel.searchUsername(null)
@@ -71,8 +64,6 @@ class RequestUsernameFragment : Fragment(R.layout.fragment_request_username) {
                 }
             }
             (requireActivity() as? InteractionAwareActivity)?.imitateUserInteraction()
-
-            // binding.usernameRequested.isVisible = isUsernameValid
         }
 
         binding.inputWrapper.endIconMode = TextInputLayout.END_ICON_CUSTOM
@@ -140,16 +131,21 @@ class RequestUsernameFragment : Fragment(R.layout.fragment_request_username) {
                 binding.checkAvailable.setImageResource(getCheckMarkImage(!it.usernameExists))
                 binding.checkBalance.setImageResource(getCheckMarkImage(it.enoughBalance))
                 binding.walletBalanceContainer.isVisible = !it.enoughBalance
-
                 if (it.usernameContestable || it.usernameContested) {
                     val startDate = Date(it.votingPeriodStart)
-                    val endDate = Date(startDate.time + TimeUnit.DAYS.toMillis(14))
-                    val dateFormat = DateFormat.getMediumDateFormat(context)
-                    binding.votingPeriod.text = getString(
-                        R.string.request_voting_range,
-                        dateFormat.format(endDate)
-                    )
-                    binding.votingPeriodContainer.isVisible = true
+                    val endDate = Date(startDate.time + UsernameRequest.VOTING_PERIOD_MILLIS)
+                    if (it.votingPeriodStart == -1L && System.currentTimeMillis() - it.votingPeriodStart > UsernameRequest.VOTING_PERIOD_MILLIS) {
+                        binding.votingPeriodContainer.isVisible = false
+                    } else if (it.votingPeriodStart == -1L && System.currentTimeMillis() - it.votingPeriodStart > UsernameRequest.SUBMIT_PERIOD_MILLIS) {
+                        binding.votingPeriodContainer.isVisible = false
+                    } else {
+                        val dateFormat = DateFormat.getMediumDateFormat(context)
+                        binding.votingPeriod.text = getString(
+                            R.string.request_voting_range,
+                            dateFormat.format(endDate)
+                        )
+                        binding.votingPeriodContainer.isVisible = true
+                    }
                 } else {
                     binding.votingPeriodContainer.isVisible = false
                 }
@@ -159,10 +155,18 @@ class RequestUsernameFragment : Fragment(R.layout.fragment_request_username) {
                     it.usernameBlocked && it.usernameContestable -> {
                         binding.usernameAvailableMessage.text = getString(R.string.request_username_unavailable)
                         binding.checkAvailable.setImageResource(getCheckMarkImage(false))
+                        binding.votingPeriodContainer.isVisible = false
                     }
                     it.usernameExists -> {
                         binding.usernameAvailableMessage.text = getString(R.string.request_username_taken)
                         binding.checkAvailable.setImageResource(getCheckMarkImage(false, false))
+                        binding.votingPeriodContainer.isVisible = false
+                    }
+                    it.usernameContestable && (it.votingPeriodStart == -1L && System.currentTimeMillis() - it.votingPeriodStart > UsernameRequest.VOTING_PERIOD_MILLIS) -> {
+                        // the submission period has ended, let us just say the username is taken
+                        binding.usernameAvailableMessage.text = getString(R.string.request_username_taken)
+                        binding.checkAvailable.setImageResource(getCheckMarkImage(false, false))
+                        binding.votingPeriodContainer.isVisible = false
                     }
                     it.usernameContestable -> {
                         // voting period container will be visible
@@ -195,8 +199,12 @@ class RequestUsernameFragment : Fragment(R.layout.fragment_request_username) {
         }
 
         dashPayViewModel.blockchainIdentity.observe(viewLifecycleOwner) {
+            if (it?.usernameRequested == UsernameRequestStatus.LOST_VOTE || it?.usernameRequested == UsernameRequestStatus.LOCKED) {
+                return@observe
+            }
             if (it?.creationStateErrorMessage != null) {
-                requireActivity().finish()
+                //why are we closing, we should allow the user to chose a new name
+                //requireActivity().finish()
             } else if ((it?.creationState?.ordinal ?: 0) > BlockchainIdentityData.CreationState.NONE.ordinal) {
                 // completeUsername = it.username ?: ""
                 // showCompleteState()
diff --git a/wallet/src/de/schildbach/wallet/ui/username/voting/VerifyIdentityFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/voting/VerifyIdentityFragment.kt
index 949053c6f7..0d4f9814cd 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/voting/VerifyIdentityFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/voting/VerifyIdentityFragment.kt
@@ -45,7 +45,7 @@ class VerifyIdentityFragment : Fragment(R.layout.fragment_verfiy_identity) {
 
         binding.linkInput.doOnTextChanged { text, _, _, _ ->
             val link = text.toString()
-            val isValidLink = link.startsWith("https://") || link.startsWith("http://")
+            val isValidLink = link.matches(Regex("^https?:\\/\\/.+\$"))
             binding.verifyBtn.isEnabled = isValidLink
             if (!text.isNullOrEmpty()) {
                 binding.linkInputLayout.hint = getString(R.string.link)
diff --git a/wallet/src/de/schildbach/wallet/ui/username/voting/VotingRequestDetailsFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/voting/VotingRequestDetailsFragment.kt
index 1f34b86a4a..675548d2a8 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/voting/VotingRequestDetailsFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/voting/VotingRequestDetailsFragment.kt
@@ -24,10 +24,11 @@ import android.view.View
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.lifecycleScope
-import de.schildbach.wallet.database.entity.BlockchainIdentityConfig
+import de.schildbach.wallet.Constants
+import de.schildbach.wallet.database.entity.UsernameRequest
 import de.schildbach.wallet_test.R
 import de.schildbach.wallet_test.databinding.FragmentVotingRequestDetailsBinding
+import org.bitcoinj.core.NetworkParameters
 import org.dash.wallet.common.ui.dialogs.AdaptiveDialog
 import org.dash.wallet.common.ui.viewBinding
 import org.dash.wallet.common.util.observe
@@ -45,8 +46,6 @@ class VotingRequestDetailsFragment : Fragment(R.layout.fragment_voting_request_d
         binding.titleBar.setNavigationOnClickListener {
             requireActivity().finish()
         }
-        // TODO Mock identity
-
 
         binding.verify.setOnClickListener {
             safeNavigate(
@@ -58,19 +57,37 @@ class VotingRequestDetailsFragment : Fragment(R.layout.fragment_voting_request_d
         requestUserNameViewModel.myUsernameRequest.observe(viewLifecycleOwner) { myUsernameRequest ->
             binding.username.text = myUsernameRequest?.username
             binding.identity.text = myUsernameRequest?.identity
-            val votingPeriod = myUsernameRequest?.createdAt?.let { startTime ->
-                val endTime = startTime + TimeUnit.MILLISECONDS.toDays(14)
+            var isVotingOver = false
+            val votingResults = myUsernameRequest?.createdAt?.let { startTime ->
+                val endTime = startTime + UsernameRequest.VOTING_PERIOD_MILLIS
                 val dateFormat = DateFormat.getMediumDateFormat(requireContext())
-                dateFormat.format(endTime)
+                isVotingOver = endTime < System.currentTimeMillis()
+                if (isVotingOver) {
+                    getString(R.string.request_username_taken_results)
+                } else {
+                    dateFormat.format(endTime)
+                }
             } ?: "Voting Period not found"
-            binding.votingRange.text = votingPeriod
-            if (myUsernameRequest?.link != null) {
-                binding.link.text = myUsernameRequest.link
-                binding.linkLayout.isVisible = true
-                binding.verfiyNowLayout.isVisible = false
-            } else {
-                binding.linkLayout.isVisible = false
-                binding.verfiyNowLayout.isVisible = true
+            binding.votingRange.text = votingResults
+            when {
+                isVotingOver -> {
+                    binding.link.text = if (myUsernameRequest?.link != null && myUsernameRequest.link != "") {
+                        myUsernameRequest.link
+                    } else {
+                        getString(R.string.none)
+                    }
+                    binding.linkLayout.isVisible = true
+                    binding.verifyNowLayout.isVisible = false
+                }
+                myUsernameRequest?.link != null && myUsernameRequest.link != "" -> {
+                    binding.link.text = myUsernameRequest.link
+                    binding.linkLayout.isVisible = true
+                    binding.verifyNowLayout.isVisible = false
+                }
+                else -> {
+                    binding.linkLayout.isVisible = false
+                    binding.verifyNowLayout.isVisible = true
+                }
             }
         }
 
@@ -93,13 +110,12 @@ class VotingRequestDetailsFragment : Fragment(R.layout.fragment_voting_request_d
                         ""
                     ).show(requireActivity())
                 }
-
             }
         }
 
         binding.ivInfo.setOnClickListener {
             safeNavigate(
-                VotingRequestDetailsFragmentDirections.votingRequestDetailsFragmentToUsernameVotingInfoFragment()
+                VotingRequestDetailsFragmentDirections.votingRequestDetailsFragmentToUsernameVotingInfoFragment(true)
             )
         }
     }
diff --git a/wallet/src/de/schildbach/wallet/ui/username/voting/VotingViewModel.kt b/wallet/src/de/schildbach/wallet/ui/username/voting/VotingViewModel.kt
new file mode 100644
index 0000000000..1f5c7738ac
--- /dev/null
+++ b/wallet/src/de/schildbach/wallet/ui/username/voting/VotingViewModel.kt
@@ -0,0 +1,24 @@
+
+package de.schildbach.wallet.ui.username.voting
+
+import androidx.lifecycle.ViewModel
+import javax.inject.Inject
+
+import dagger.hilt.android.lifecycle.HiltViewModel
+import de.schildbach.wallet.database.dao.UsernameRequestDao
+import de.schildbach.wallet.service.platform.PlatformSyncService
+import de.schildbach.wallet.ui.dashpay.utils.DashPayConfig
+import kotlin.OptIn
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import org.dash.wallet.common.WalletDataProvider
+
+@OptIn(ExperimentalCoroutinesApi::class)
+@HiltViewModel
+public class VotingViewModel @Inject constructor(
+    private val dashPayConfig:DashPayConfig,
+    private val usernameRequestDao:UsernameRequestDao,
+    private val platformSyncService: PlatformSyncService,
+    private val walletDataProvider: WalletDataProvider
+): ViewModel() {
+
+}
\ No newline at end of file
diff --git a/wallet/src/de/schildbach/wallet/ui/username/voting/WelcomeToDashPayFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/voting/WelcomeToDashPayFragment.kt
index 0283045bf3..d32281adf5 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/voting/WelcomeToDashPayFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/voting/WelcomeToDashPayFragment.kt
@@ -10,6 +10,7 @@ import de.schildbach.wallet.Constants
 import de.schildbach.wallet_test.R
 import de.schildbach.wallet_test.databinding.FragmentWelcomeToDashpayBinding
 import org.dash.wallet.common.ui.viewBinding
+import org.dash.wallet.common.util.observe
 import org.dash.wallet.common.util.safeNavigate
 
 @AndroidEntryPoint
@@ -25,21 +26,21 @@ class WelcomeToDashPayFragment : Fragment(R.layout.fragment_welcome_to_dashpay)
             safeNavigate(WelcomeToDashPayFragmentDirections.welcomeToDashPayFragmentToUsernameVotingInfoFragment())
         }
 
-        if (!requestUserNameViewModel.canAffordNonContestedUsername()) {
-            binding.balanceRequirementDisclaimer.text = getString(
-                R.string.welcome_request_username_min_balance_disclaimer_noncontested,
-                Constants.DASH_PAY_FEE.toPlainString()
-            )
-        } else if (!requestUserNameViewModel.canAffordContestedUsername()){
-            binding.balanceRequirementDisclaimer.text = getString(
-                R.string.welcome_request_username_min_balance_disclaimer_all,
-                requestUserNameViewModel.walletBalance.toPlainString(),
-                Constants.DASH_PAY_FEE_CONTESTED.toPlainString()
-            )
-        } else {
-
+        requestUserNameViewModel.walletBalance.observe(viewLifecycleOwner) {
+            if (!requestUserNameViewModel.canAffordNonContestedUsername()) {
+                binding.balanceRequirementDisclaimer.text = getString(
+                    R.string.welcome_request_username_min_balance_disclaimer_noncontested,
+                    Constants.DASH_PAY_FEE.toPlainString()
+                )
+            } else if (!requestUserNameViewModel.canAffordContestedUsername()) {
+                binding.balanceRequirementDisclaimer.text = getString(
+                    R.string.welcome_request_username_min_balance_disclaimer_all,
+                    requestUserNameViewModel.walletBalance.value.toPlainString(),
+                    Constants.DASH_PAY_FEE_CONTESTED.toPlainString()
+                )
+            }
+            binding.balanceRequirementDisclaimer.isVisible = !requestUserNameViewModel.canAffordContestedUsername()
+            binding.welcomeDashpayContinueBtn.isEnabled = requestUserNameViewModel.canAffordNonContestedUsername()
         }
-        binding.balanceRequirementDisclaimer.isVisible = !requestUserNameViewModel.canAffordContestedUsername()
-        binding.welcomeDashpayContinueBtn.isEnabled = requestUserNameViewModel.canAffordNonContestedUsername()
     }
 }
diff --git a/wallet/src/de/schildbach/wallet/ui/widget/ShortcutsPane.kt b/wallet/src/de/schildbach/wallet/ui/widget/ShortcutsPane.kt
index df204f1784..b32e19075f 100644
--- a/wallet/src/de/schildbach/wallet/ui/widget/ShortcutsPane.kt
+++ b/wallet/src/de/schildbach/wallet/ui/widget/ShortcutsPane.kt
@@ -104,7 +104,9 @@ class ShortcutsPane(context: Context, attrs: AttributeSet) : FlexboxLayout(conte
         secureNowButton,
         explore,
         receiveButton,
-        if (Constants.SUPPORTS_PLATFORM) payToContactButton else payToAddressButton,
+        payToAddressButton,
+        // TODO: for the time being, never display the "Send to Contact" button
+        // payToContactButton,
         buySellButton,
         scanToPayButton
     )
@@ -124,7 +126,19 @@ class ShortcutsPane(context: Context, attrs: AttributeSet) : FlexboxLayout(conte
             scanToPayButton.shouldAppear = value
             buySellButton.shouldAppear = !value
             payToAddressButton.shouldAppear = value
-            payToContactButton.shouldAppear = if (Constants.SUPPORTS_PLATFORM) value else false
+            // TODO: will the send to contact button ever be displayed, if not remove
+            // payToContactButton.shouldAppear = value && userHasContacts
+
+            if (field != value) {
+                field = value
+                refresh()
+            }
+        }
+
+    var userHasContacts: Boolean = false
+        set(value) {
+            // TODO: will the send to contact button ever be displayed, if not remove
+            // payToContactButton.shouldAppear = value && userHasBalance
 
             if (field != value) {
                 field = value
diff --git a/wallet/testNet3/res/values/values.xml b/wallet/testNet3/res/values/values.xml
index e7743e25e3..be8bfe513a 100644
--- a/wallet/testNet3/res/values/values.xml
+++ b/wallet/testNet3/res/values/values.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="app_name">Dash [testnet]</string>
-	<string name="app_name_short">Dash [testnet]</string>
+	<string name="app_name">DashPay Wallet [testnet]</string>
+	<string name="app_name_short">DashPay [testnet]</string>
 	<string name="app_name_dashpay_short">DashPay Testnet</string>
 	<string name="app_name_dashpay">DashPay Testnet</string>