diff --git a/.tx/config b/.tx/config
index c5327270eb..0c2bce2d4f 100644
--- a/.tx/config
+++ b/.tx/config
@@ -50,6 +50,13 @@ source_lang = en
 type        = ANDROID
 lang_map    = sl_SI: sl, zh_TW: zh-rTW
 
+[o:dash:p:dash-mobile-wallets:r:strings-dashpay]
+file_filter = wallet/res/values-<lang>/strings-dashpay.xml
+source_file = wallet/res/values/strings-dashpay.xml
+source_lang = en
+type        = ANDROID
+lang_map    = sl_SI: sl, zh_TW: zh-rTW
+
 [o:dash:p:dash-mobile-wallets:r:strings-uphold]
 file_filter = integrations/uphold/src/main/res/values-<lang>/strings-uphold.xml
 source_file = integrations/uphold/src/main/res/values/strings-uphold.xml
diff --git a/build.gradle b/build.gradle
index 7f6905ea5e..9e6fdc9362 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         kotlin_version = '1.9.23'
         coroutinesVersion = '1.6.4'
         ok_http_version = '4.9.1'
-        dashjVersion = '20.0.5-CJ-SNAPSHOT'
+        dashjVersion = '21.0.0-CJ-SNAPSHOT'
         hiltVersion = '2.51'
         hiltCompilerVersion = '1.2.0'
         hiltWorkVersion = '1.0.0'
diff --git a/common/src/main/java/org/dash/wallet/common/data/WalletUIConfig.kt b/common/src/main/java/org/dash/wallet/common/data/WalletUIConfig.kt
index ca2be9265a..532d932429 100644
--- a/common/src/main/java/org/dash/wallet/common/data/WalletUIConfig.kt
+++ b/common/src/main/java/org/dash/wallet/common/data/WalletUIConfig.kt
@@ -63,9 +63,6 @@ open class WalletUIConfig @Inject constructor(
         val SHOW_TAP_TO_HIDE_HINT = booleanPreferencesKey("show_tap_to_hide_balance_hint")
         val SELECTED_CURRENCY = stringPreferencesKey("exchange_currency")
         val EXCHANGE_CURRENCY_DETECTED = booleanPreferencesKey("exchange_currency_detected")
-
-        // temporary items for DashPay
-        val VOTE_DASH_PAY_ENABLED = booleanPreferencesKey("VOTE_DASH_PAY_ENABLED")
     }
 
     suspend fun getExchangeCurrencyCode(): String {
diff --git a/wallet/res/drawable/ic_check_circle_empty.xml b/wallet/res/drawable/ic_check_circle_empty.xml
new file mode 100644
index 0000000000..2a413f8df8
--- /dev/null
+++ b/wallet/res/drawable/ic_check_circle_empty.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+  <path
+      android:pathData="M11,0.75L11,0.75A10.25,10.25 0,0 1,21.25 11L21.25,11A10.25,10.25 0,0 1,11 21.25L11,21.25A10.25,10.25 0,0 1,0.75 11L0.75,11A10.25,10.25 0,0 1,11 0.75z"
+      android:strokeAlpha="0.5"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#B0B6BC"/>
+</vector>
diff --git a/wallet/res/drawable/ic_onboard_from_invite_check.xml b/wallet/res/drawable/ic_check_circle_green.xml
similarity index 100%
rename from wallet/res/drawable/ic_onboard_from_invite_check.xml
rename to wallet/res/drawable/ic_check_circle_green.xml
diff --git a/wallet/res/drawable/ic_error_circle.xml b/wallet/res/drawable/ic_error_circle.xml
new file mode 100644
index 0000000000..ab475b1c2e
--- /dev/null
+++ b/wallet/res/drawable/ic_error_circle.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+  <path
+      android:pathData="M10.995,21.989C9.49,21.989 8.075,21.702 6.748,21.127C5.421,20.56 4.25,19.768 3.236,18.754C2.228,17.739 1.437,16.568 0.862,15.241C0.287,13.915 0,12.499 0,10.995C0,9.49 0.287,8.075 0.862,6.748C1.437,5.421 2.228,4.254 3.236,3.246C4.25,2.232 5.418,1.437 6.737,0.862C8.064,0.287 9.48,0 10.984,0C12.495,0 13.915,0.287 15.241,0.862C16.568,1.437 17.739,2.232 18.754,3.246C19.768,4.254 20.563,5.421 21.138,6.748C21.713,8.075 22,9.49 22,10.995C22,12.499 21.713,13.915 21.138,15.241C20.563,16.568 19.768,17.739 18.754,18.754C17.739,19.768 16.568,20.56 15.241,21.127C13.915,21.702 12.499,21.989 10.995,21.989ZM7.504,15.497C7.795,15.497 8.043,15.401 8.249,15.21L11.005,12.432L13.773,15.21C13.964,15.401 14.205,15.497 14.496,15.497C14.78,15.497 15.018,15.401 15.21,15.21C15.408,15.011 15.507,14.773 15.507,14.496C15.507,14.205 15.408,13.968 15.21,13.783L12.432,11.005L15.22,8.227C15.419,8.022 15.518,7.784 15.518,7.514C15.518,7.238 15.419,7.003 15.22,6.812C15.028,6.613 14.794,6.514 14.518,6.514C14.241,6.514 14.003,6.613 13.804,6.812L11.005,9.59L8.217,6.812C8.018,6.627 7.78,6.535 7.504,6.535C7.227,6.535 6.989,6.631 6.791,6.822C6.599,7.007 6.503,7.245 6.503,7.536C6.503,7.798 6.602,8.032 6.801,8.238L9.579,11.005L6.801,13.794C6.602,13.986 6.503,14.22 6.503,14.496C6.503,14.773 6.599,15.011 6.791,15.21C6.989,15.401 7.227,15.497 7.504,15.497Z"
+      android:fillColor="#EA3943"/>
+</vector>
diff --git a/wallet/res/drawable/ic_face_sad.xml b/wallet/res/drawable/ic_face_sad.xml
new file mode 100644
index 0000000000..5fb0d46192
--- /dev/null
+++ b/wallet/res/drawable/ic_face_sad.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M7.34,23.057C8.79,23.685 10.343,24 12,24C13.657,24 15.21,23.685 16.66,23.057C18.109,22.435 19.383,21.572 20.479,20.468C21.576,19.371 22.435,18.102 23.057,16.66C23.685,15.21 24,13.657 24,12C24,10.343 23.685,8.79 23.057,7.34C22.435,5.891 21.576,4.617 20.479,3.521C19.383,2.416 18.109,1.553 16.66,0.932C15.21,0.311 13.657,0 12,0C10.343,0 8.79,0.311 7.34,0.932C5.891,1.553 4.614,2.416 3.509,3.521C2.412,4.617 1.553,5.891 0.932,7.34C0.311,8.79 0,10.343 0,12C0,13.657 0.311,15.21 0.932,16.66C1.553,18.102 2.412,19.371 3.509,20.468C4.614,21.572 5.891,22.435 7.34,23.057ZM9.446,10.424C9.162,10.723 8.832,10.873 8.456,10.873C8.088,10.873 7.762,10.723 7.478,10.424C7.202,10.117 7.064,9.73 7.064,9.262C7.064,8.779 7.202,8.384 7.478,8.077C7.755,7.77 8.081,7.616 8.456,7.616C8.84,7.616 9.174,7.77 9.457,8.077C9.741,8.384 9.883,8.779 9.883,9.262C9.883,9.73 9.737,10.117 9.446,10.424ZM16.51,10.424C16.226,10.723 15.896,10.873 15.521,10.873C15.145,10.873 14.819,10.723 14.543,10.424C14.267,10.117 14.128,9.73 14.128,9.262C14.128,8.779 14.267,8.384 14.543,8.077C14.819,7.77 15.145,7.616 15.521,7.616C15.904,7.616 16.238,7.77 16.522,8.077C16.805,8.384 16.947,8.779 16.947,9.262C16.947,9.73 16.802,10.117 16.51,10.424ZM14.209,15.406C13.572,15.106 12.836,14.957 12,14.957C11.149,14.957 10.405,15.106 9.768,15.406C9.139,15.712 8.644,16.061 8.284,16.452C7.931,16.844 7.755,17.177 7.755,17.454C7.755,17.607 7.816,17.711 7.939,17.764C8.061,17.826 8.192,17.826 8.33,17.764C8.775,17.534 9.277,17.308 9.837,17.085C10.397,16.871 11.118,16.763 12,16.763C12.867,16.763 13.58,16.871 14.14,17.085C14.708,17.308 15.214,17.534 15.659,17.764C15.789,17.818 15.916,17.818 16.038,17.764C16.161,17.711 16.222,17.607 16.222,17.454C16.222,17.177 16.046,16.844 15.693,16.452C15.34,16.061 14.846,15.712 14.209,15.406Z"
+      android:fillColor="#008DE4"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/wallet/res/drawable/ic_voting_icon.xml b/wallet/res/drawable/ic_voting_icon.xml
new file mode 100644
index 0000000000..2774150850
--- /dev/null
+++ b/wallet/res/drawable/ic_voting_icon.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="20dp"
+    android:viewportWidth="28"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M1.124,5.94C0.847,6.116 0.591,6.143 0.354,6.021C0.118,5.9 0,5.673 0,5.343V0.755C0,0.431 0.118,0.209 0.354,0.087C0.591,-0.041 0.847,-0.021 1.124,0.148L4.83,2.396C5.1,2.551 5.235,2.771 5.235,3.054C5.242,3.331 5.107,3.55 4.83,3.712L1.124,5.94ZM8.101,4.836C7.662,4.836 7.328,4.725 7.099,4.502C6.876,4.279 6.765,3.949 6.765,3.51V2.558C6.765,2.133 6.876,1.809 7.099,1.586C7.328,1.356 7.662,1.241 8.101,1.241H26.673C27.105,1.241 27.433,1.356 27.656,1.586C27.885,1.809 28,2.133 28,2.558V3.51C28,3.949 27.885,4.279 27.656,4.502C27.433,4.725 27.105,4.836 26.673,4.836H8.101ZM7.777,9.525C7.494,9.525 7.254,9.424 7.058,9.221C6.862,9.012 6.765,8.769 6.765,8.492C6.765,8.209 6.862,7.965 7.058,7.763C7.254,7.56 7.494,7.459 7.777,7.459H26.977C27.261,7.459 27.5,7.56 27.696,7.763C27.899,7.959 28,8.202 28,8.492C28,8.769 27.899,9.012 27.696,9.221C27.5,9.424 27.261,9.525 26.977,9.525H7.777ZM7.777,14.76C7.494,14.76 7.254,14.659 7.058,14.457C6.862,14.247 6.765,14.004 6.765,13.727C6.765,13.444 6.862,13.201 7.058,12.998C7.254,12.796 7.494,12.695 7.777,12.695H26.977C27.261,12.695 27.5,12.796 27.696,12.998C27.899,13.194 28,13.437 28,13.727C28,14.011 27.899,14.254 27.696,14.457C27.5,14.659 27.261,14.76 26.977,14.76H7.777ZM7.777,19.996C7.494,19.996 7.254,19.891 7.058,19.682C6.862,19.479 6.765,19.24 6.765,18.963C6.765,18.679 6.862,18.436 7.058,18.234C7.254,18.031 7.494,17.93 7.777,17.93H26.977C27.261,17.93 27.5,18.028 27.696,18.224C27.899,18.426 28,18.673 28,18.963C28,19.247 27.899,19.49 27.696,19.692C27.5,19.895 27.261,19.996 26.977,19.996H7.777Z"
+      android:fillColor="#008DE4"/>
+</vector>
diff --git a/wallet/res/drawable/ic_warning_triangle.xml b/wallet/res/drawable/ic_warning_triangle.xml
new file mode 100644
index 0000000000..7dbe447c6b
--- /dev/null
+++ b/wallet/res/drawable/ic_warning_triangle.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="20dp"
+    android:viewportWidth="22"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M2.956,19.971C2.352,19.971 1.828,19.839 1.384,19.575C0.94,19.312 0.597,18.958 0.354,18.514C0.118,18.07 0,17.577 0,17.036C0,16.509 0.139,16.006 0.416,15.527L8.471,1.488C8.742,0.996 9.106,0.624 9.564,0.375C10.022,0.125 10.5,0 11,0C11.5,0 11.975,0.125 12.426,0.375C12.877,0.617 13.244,0.989 13.529,1.488L21.584,15.527C21.722,15.763 21.827,16.009 21.896,16.266C21.965,16.522 22,16.779 22,17.036C22,17.577 21.879,18.07 21.636,18.514C21.393,18.958 21.049,19.312 20.605,19.575C20.168,19.839 19.648,19.971 19.045,19.971H2.956ZM11.01,12.842C11.628,12.842 11.944,12.519 11.957,11.874L12.124,6.65C12.138,6.331 12.037,6.071 11.822,5.869C11.607,5.661 11.333,5.557 11,5.557C10.66,5.557 10.386,5.661 10.178,5.869C9.97,6.071 9.873,6.327 9.886,6.64L10.032,11.885C10.053,12.523 10.379,12.842 11.01,12.842ZM11.01,16.422C11.357,16.422 11.656,16.311 11.905,16.089C12.155,15.867 12.28,15.583 12.28,15.236C12.28,14.896 12.155,14.611 11.905,14.382C11.656,14.153 11.357,14.039 11.01,14.039C10.657,14.039 10.355,14.153 10.105,14.382C9.855,14.611 9.73,14.896 9.73,15.236C9.73,15.583 9.855,15.867 10.105,16.089C10.362,16.311 10.663,16.422 11.01,16.422Z"
+      android:fillColor="#FFC043"/>
+</vector>
diff --git a/wallet/res/layout/activity_onboard_from_invite.xml b/wallet/res/layout/activity_onboard_from_invite.xml
index 40f37153eb..4533e9fa8d 100644
--- a/wallet/res/layout/activity_onboard_from_invite.xml
+++ b/wallet/res/layout/activity_onboard_from_invite.xml
@@ -61,7 +61,7 @@
                         android:layout_height="wrap_content"
                         android:drawablePadding="8dp"
                         android:text="@string/onboard_from_invite_step1"
-                        app:drawableEndCompat="@drawable/ic_onboard_from_invite_check" />
+                        app:drawableEndCompat="@drawable/ic_check_circle_green" />
 
                     <TextView
                         android:id="@+id/title1"
@@ -107,7 +107,7 @@
                         android:layout_height="wrap_content"
                         android:drawablePadding="8dp"
                         android:text="@string/onboard_from_invite_step2"
-                        app:drawableEndCompat="@drawable/ic_onboard_from_invite_check" />
+                        app:drawableEndCompat="@drawable/ic_check_circle_green" />
 
                     <TextView
                         android:id="@+id/title2"
@@ -153,7 +153,7 @@
                         android:layout_height="wrap_content"
                         android:drawablePadding="8dp"
                         android:text="@string/onboard_from_invite_step3"
-                        app:drawableEndCompat="@drawable/ic_onboard_from_invite_check" />
+                        app:drawableEndCompat="@drawable/ic_check_circle_green" />
 
                     <TextView
                         android:id="@+id/title3"
diff --git a/wallet/res/layout/activity_settings.xml b/wallet/res/layout/activity_settings.xml
index 44176a9cc9..40bab2b7cf 100644
--- a/wallet/res/layout/activity_settings.xml
+++ b/wallet/res/layout/activity_settings.xml
@@ -187,30 +187,6 @@
             app:layout_constraintEnd_toEndOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/voting_dash_pay"
-        style="@style/MenuRow.Internal">
-
-        <TextView
-            style="@style/MenuRowTitle.Internal"
-            android:text="@string/voting_period_active"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/voting_dash_pay_switch"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/voting_dash_pay_switch"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="20dp"
-            android:theme="@style/SwitchCompat"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/battery_optimization"
         style="@style/MenuRow.Internal">
diff --git a/wallet/res/layout/dialog_confirm_username_request.xml b/wallet/res/layout/dialog_confirm_username_request.xml
index b0b9a8ea6a..d523143119 100644
--- a/wallet/res/layout/dialog_confirm_username_request.xml
+++ b/wallet/res/layout/dialog_confirm_username_request.xml
@@ -39,7 +39,18 @@
         android:gravity="center_horizontal"
         android:textAlignment="gravity"
         android:layout_marginHorizontal="20dp"
-        android:text="@string/quick_vote" />
+        android:text="@string/confirm" />
+
+    <TextView
+        android:id="@+id/confirm_message"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="17dp"
+        android:gravity="center_horizontal"
+        android:textAlignment="gravity"
+        android:layout_marginHorizontal="20dp"
+        android:text="@string/new_account_confirm_message" />
+
 
     <LinearLayout
         android:layout_marginTop="17dp"
@@ -89,13 +100,27 @@
 
     </LinearLayout>
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginVertical="8dp"
+        android:gravity="center_horizontal">
+        <CheckBox
+            android:id="@+id/user_accepts"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/request_username_confirm" />
+    </LinearLayout>
 
-
-<LinearLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:layout_marginTop="30dp"
+        android:layout_marginTop="25dp"
         android:layout_marginBottom="15dp">
 
         <Button
diff --git a/wallet/res/layout/fragment_more.xml b/wallet/res/layout/fragment_more.xml
index 32799bae78..6a3a64d745 100644
--- a/wallet/res/layout/fragment_more.xml
+++ b/wallet/res/layout/fragment_more.xml
@@ -89,43 +89,7 @@
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/requested_username_container"
-                android:visibility="gone"
-                tools:visibility="visible"
-                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/menu_invite_title" />
 
-                <TextView
-                    android:id="@+id/requested_username_subtitle"
-                    style="@style/MenuRowSubTitle"
-                    android:text="@string/requested_voting_duration"
-                    app:layout_constraintStart_toStartOf="@+id/requested_username_title"
-                    app:layout_constraintTop_toBottomOf="@+id/requested_username_title" />
-
-                <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>
 
             <ViewFlipper
@@ -215,6 +179,53 @@
 
             </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"
diff --git a/wallet/res/layout/fragment_request_username.xml b/wallet/res/layout/fragment_request_username.xml
index 22dd67057f..0eb02c9550 100644
--- a/wallet/res/layout/fragment_request_username.xml
+++ b/wallet/res/layout/fragment_request_username.xml
@@ -43,33 +43,34 @@
             android:layout_marginTop="10dp"
             android:orientation="horizontal">
 
-            <ImageView
-                android:id="@+id/create_a_username_icon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:layout_constraintEnd_toStartOf="@id/create_a_username_title"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="@+id/create_a_username_title"
-                app:srcCompat="@drawable/ic_calendar" />
+<!--            <ImageView-->
+<!--                android:id="@+id/create_a_username_icon"-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                app:layout_constraintEnd_toStartOf="@id/create_a_username_title"-->
+<!--                app:layout_constraintStart_toStartOf="parent"-->
+<!--                app:layout_constraintTop_toTopOf="@+id/create_a_username_title"-->
+<!--                app:srcCompat="@drawable/ic_calendar" />-->
 
-            <TextView
-                style="@style/Caption.SemiBold"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="7dp"
-                android:includeFontPadding="false"
-                android:text="@string/voting"
-                android:textAlignment="gravity" />
+<!--            <TextView-->
+<!--                android:id="@+id/voting_range_label"-->
+<!--                style="@style/Caption.SemiBold"-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:layout_marginStart="7dp"-->
+<!--                android:includeFontPadding="false"-->
+<!--                android:text="@string/voting"-->
+<!--                android:textAlignment="gravity" />-->
 
-            <TextView
-                android:id="@+id/voting_range"
-                style="@style/Caption"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:includeFontPadding="false"
-                android:maxLines="1"
-                android:textAlignment="gravity"
-                tools:text=" 1 Mar – 15 Mar" />
+<!--            <TextView-->
+<!--                android:id="@+id/voting_range"-->
+<!--                style="@style/Caption"-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:includeFontPadding="false"-->
+<!--                android:maxLines="1"-->
+<!--                android:textAlignment="gravity"-->
+<!--                tools:text=" 1 Mar – 15 Mar" />-->
         </LinearLayout>
 
         <org.dash.wallet.common.ui.text.InputWrapper
@@ -93,16 +94,155 @@
                 android:imeOptions="actionNext" />
         </org.dash.wallet.common.ui.text.InputWrapper>
 
-        <TextView
-            android:id="@+id/username_requested"
-            style="@style/Body2"
-            android:visibility="gone"
-            tools:visibility="visible"
+
+
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:text="@string/this_username_has_already_been_requested"
-            android:textAlignment="gravity" />
+            android:layout_marginTop="8dp">
+
+            <ImageView
+                android:id="@+id/check_length"
+                android:layout_width="22dp"
+                android:layout_height="22dp"
+                android:layout_marginEnd="12dp"
+                android:src="@drawable/ic_check_circle_green"
+                />
+            <TextView
+                style="@style/Overline.Medium"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/request_username_length_requirement"
+                />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp">
+
+        <ImageView
+                android:id="@+id/check_letters"
+                android:layout_width="22dp"
+                android:layout_height="22dp"
+                android:layout_marginEnd="12dp"
+                android:src="@drawable/ic_check_circle_green"
+                />
+            <TextView
+                style="@style/Overline.Medium"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/request_username_character_requirement"
+                />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/wallet_balance_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp">
+            <ImageView
+                android:id="@+id/check_balance"
+                android:layout_width="22dp"
+                android:layout_height="22dp"
+                android:layout_marginEnd="12dp"
+                android:src="@drawable/ic_error_circle"
+                />
+
+            <TextView
+                style="@style/Overline.Medium"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/request_username_balance_requirement"
+                android:maxLines="2"
+                />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/username_available_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp">
+
+            <ImageView
+                android:id="@+id/check_available"
+                android:layout_width="22dp"
+                android:layout_height="22dp"
+                android:layout_marginEnd="12dp"
+                android:src="@drawable/ic_check_circle_green"
+                />
+            <TextView
+                style="@style/Overline.Medium"
+                android:id="@+id/username_available_message"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:text="Username is available"
+                />
+        </LinearLayout>
+
+<!--        <LinearLayout-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="wrap_content">-->
+<!--            <CheckBox-->
+<!--                android:id="@+id/check_blocked"-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                />-->
+<!--            <TextView-->
+<!--                style="@style/Overline.Medium"-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:text="Username is blocked"-->
+<!--                />-->
+<!--        </LinearLayout>-->
+
+        <LinearLayout
+            android:id="@+id/voting_period_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp">
+
+            <ImageView
+                android:id="@+id/check_voting_period"
+                android:layout_width="22dp"
+                android:layout_height="22dp"
+                android:layout_marginEnd="12dp"
+                android:src="@drawable/ic_warning_triangle"
+                />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                >
+            <TextView
+                style="@style/Overline.Medium"
+                android:id="@+id/voting_period"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                tools:text="The Dash network will vote on this username. We will notify you of the results on March 14, 2024."
+                />
+            <TextView
+                style="@style/Overline.Medium.Blue"
+                android:id="@+id/username_voting_info_btn"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:text="@string/request_username_username_voting_message"
+                />
+            </LinearLayout>
+        </LinearLayout>
+
+<!--        <TextView-->
+<!--            android:id="@+id/username_requested"-->
+<!--            style="@style/Body2"-->
+<!--            android:visibility="gone"-->
+<!--            tools:visibility="visible"-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:layout_marginTop="5dp"-->
+<!--            android:text="@string/this_username_has_already_been_requested"-->
+<!--            android:textAlignment="gravity" />-->
+
     </LinearLayout>
 
     <Button
@@ -116,19 +256,19 @@
         android:text="@string/request_username"
         app:layout_constraintBottom_toBottomOf="parent" />
 
-    <TextView
-        android:id="@+id/balance_requirement_disclaimer"
-        style="@style/Overline"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="12dp"
-        android:text="@string/request_username_min_balance_disclaimer"
-        android:visibility="gone"
-        android:gravity="center_horizontal"
-        android:textAlignment="gravity"
-        app:layout_constraintBottom_toTopOf="@id/request_username_button"
-        app:layout_constraintEnd_toEndOf="@id/request_username_button"
-        app:layout_constraintStart_toStartOf="@id/request_username_button"
-        tools:visibility="visible" />
+<!--    <TextView-->
+<!--        android:id="@+id/balance_requirement_disclaimer"-->
+<!--        style="@style/Overline"-->
+<!--        android:layout_width="0dp"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:layout_marginBottom="12dp"-->
+<!--        android:text="@string/request_username_min_balance_disclaimer"-->
+<!--        android:visibility="gone"-->
+<!--        android:gravity="center_horizontal"-->
+<!--        android:textAlignment="gravity"-->
+<!--        app:layout_constraintBottom_toTopOf="@id/request_username_button"-->
+<!--        app:layout_constraintEnd_toEndOf="@id/request_username_button"-->
+<!--        app:layout_constraintStart_toStartOf="@id/request_username_button"-->
+<!--        tools:visibility="visible" />-->
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/wallet/res/layout/fragment_username_registration.xml b/wallet/res/layout/fragment_username_registration.xml
new file mode 100644
index 0000000000..1e35a4558a
--- /dev/null
+++ b/wallet/res/layout/fragment_username_registration.xml
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="utf-8"?>
+<de.schildbach.wallet.ui.widget.KeyboardResponsiveCoordinatorLayout 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"
+    app:viewToHideWhenSoftKeyboardIsOpen="@id/header">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/background_primary"
+        android:clipChildren="false"
+        android:clipToPadding="false">
+
+        <!-- Processing -->
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/processing_identity"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:background="@color/dash_blue"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/header">
+
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/horizontal_guideline"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                app:layout_constraintGuide_percent="0.3" />
+
+            <ImageView
+                android:id="@+id/processing_identity_loading_image"
+                android:layout_width="128dp"
+                android:layout_height="128dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="@+id/horizontal_guideline"
+                app:layout_constraintBottom_toBottomOf="@+id/horizontal_guideline"
+                app:srcCompat="@drawable/identity_processing" />
+
+            <TextView
+                android:id="@+id/processing_identity_message"
+                style="@style/Body1.White"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="15dp"
+                android:gravity="center"
+                android:textAlignment="gravity"
+                android:paddingLeft="15dp"
+                android:paddingRight="15dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/processing_identity_loading_image"
+                tools:text="@string/username_being_created" />
+
+            <Button
+                android:id="@+id/processing_identity_dismiss_btn"
+                style="@style/Button.Tertiary.Blue"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="15dp"
+                android:layout_marginRight="15dp"
+                android:layout_marginBottom="25dp"
+                android:text="@string/processing_let_me_know"
+                app:layout_constraintBottom_toBottomOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <!-- Complete -->
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/identity_complete"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:background="@color/background_secondary"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/header"
+            tools:visibility="visible">
+
+            <ImageView
+                android:id="@+id/identity_complete_icon"
+                android:layout_width="125dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="22dp"
+                android:layout_marginLeft="22dp"
+                android:layout_marginTop="14dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:srcCompat="@drawable/identity_complete_icon" />
+
+            <TextView
+                android:id="@+id/identity_complete_text"
+                android:text="@string/identity_complete_message"
+                style="@style/Body1"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="26dp"
+                android:layout_marginEnd="10dp"
+                android:textSize="@dimen/identity_complete_text_size"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="@id/identity_complete_icon"
+                app:layout_constraintTop_toBottomOf="@id/identity_complete_icon" />
+
+            <Button
+                android:id="@+id/identity_complete_button"
+                style="@style/Button.Primary.Blue"
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:layout_marginLeft="15dp"
+                android:layout_marginRight="15dp"
+                android:layout_marginBottom="25dp"
+                android:text="@string/verify_continue"
+                app:layout_constraintBottom_toBottomOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <!--Header-->
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/header"
+            android:layout_width="match_parent"
+            android:layout_height="230dp"
+            android:background="@android:color/white"
+            android:clipChildren="false"
+            android:clipToPadding="false"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <FrameLayout
+                android:id="@+id/orbit_view"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:clipChildren="false"
+                android:clipToPadding="false"
+                android:translationX="@dimen/create_username_orbits_translation_x"
+                android:translationY="-130dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <include layout="@layout/users_orbit" />
+
+            </FrameLayout>
+
+            <ImageView
+                android:id="@+id/close_btn"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="14dp"
+                android:padding="10dp"
+                android:layout_marginTop="26dp"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:srcCompat="@drawable/ic_close_blue" />
+
+            <TextView
+                android:id="@+id/choose_username_title"
+                style="@style/Headline6.Regular.Tertiary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="20dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginTop="146dp"
+                android:lines="2"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:ignore="RtlHardcoded"
+                tools:text="Choose your Dash\nUsername" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</de.schildbach.wallet.ui.widget.KeyboardResponsiveCoordinatorLayout>
diff --git a/wallet/res/layout/fragment_username_voting_info.xml b/wallet/res/layout/fragment_username_voting_info.xml
index 7b0ef558f5..14d14fb8b4 100644
--- a/wallet/res/layout/fragment_username_voting_info.xml
+++ b/wallet/res/layout/fragment_username_voting_info.xml
@@ -60,10 +60,11 @@
                 android:id="@+id/create_a_username_icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                app:srcCompat ="@drawable/ic_blue_clock"
+                app:srcCompat ="@drawable/ic_voting_icon"
                 app:layout_constraintEnd_toStartOf="@id/create_a_username_title"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintBottom_toBottomOf="@id/create_a_username_title"
+                app:layout_constraintTop_toTopOf="@id/create_a_username_title" />
 
             <TextView
                 android:id="@+id/create_a_username_title"
@@ -72,7 +73,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="63dp"
                 android:layout_marginTop="14dp"
-                android:text="@string/voting_will_not_required_forever"
+                android:text="@string/voting_requirement_title"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
@@ -82,12 +83,55 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="2dp"
-                android:text="@string/after_voting"
+                android:text="@string/voting_requirement_subtitle"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="@+id/create_a_username_title"
                 app:layout_constraintTop_toBottomOf="@+id/create_a_username_title" />
         </androidx.constraintlayout.widget.ConstraintLayout>
 
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/blocked_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="20dp"
+            android:layout_marginTop="15dp"
+            android:background="?attr/selectableItemBackground"
+            android:clickable="true"
+            android:focusable="true">
+
+            <ImageView
+                android:id="@+id/blocked_icon"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_marginTop="10dp"
+                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:text="@string/usernames_blocked_title"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/blocked_subtitle"
+                style="@style/Caption.Secondary"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dp"
+                android:text="@string/usernames_blocked_subtitle"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="@+id/blocked_title"
+                app:layout_constraintTop_toBottomOf="@+id/blocked_title" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/request_not_approved_btn"
             android:layout_width="match_parent"
@@ -102,7 +146,7 @@
                 android:id="@+id/request_not_approved_icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                app:srcCompat ="@drawable/ic_request_not_approved"
+                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" />
@@ -176,27 +220,12 @@
 
     <TextView
         android:id="@+id/username_voting_info_continue_btn"
-        style="@style/Button.Primary.Large.LightGrey"
+        style="@style/Button.Primary.Large.Blue"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="parent"
         android:layout_marginBottom="15dp"
         android:layout_marginHorizontal="15dp"
-        android:text="@string/button_ok"
+        android:text="@string/button_continue"
         />
-
-    <TextView
-        android:id="@+id/balance_requirement_disclaimer"
-        style="@style/Overline"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="12dp"
-        android:text="@string/welcome_request_username_min_balance_disclaimer"
-        android:visibility="gone"
-        android:gravity="center_horizontal"
-        android:textAlignment="gravity"
-        app:layout_constraintBottom_toTopOf="@id/username_voting_info_continue_btn"
-        app:layout_constraintEnd_toEndOf="@id/username_voting_info_continue_btn"
-        app:layout_constraintStart_toStartOf="@id/username_voting_info_continue_btn"
-        tools:visibility="visible" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/wallet/res/layout/fragment_welcome_to_dashpay.xml b/wallet/res/layout/fragment_welcome_to_dashpay.xml
index d14994736f..f461a11606 100644
--- a/wallet/res/layout/fragment_welcome_to_dashpay.xml
+++ b/wallet/res/layout/fragment_welcome_to_dashpay.xml
@@ -164,6 +164,22 @@
 
     </LinearLayout>
 
+    <TextView
+        android:id="@+id/balance_requirement_disclaimer"
+        style="@style/Overline"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="12dp"
+        tools:text="@string/welcome_request_username_min_balance_disclaimer_all"
+        android:visibility="gone"
+        android:gravity="center_horizontal"
+        android:textAlignment="gravity"
+        android:maxLines="2"
+        app:layout_constraintBottom_toTopOf="@id/welcome_dashpay_continue_btn"
+        app:layout_constraintEnd_toEndOf="@id/welcome_dashpay_continue_btn"
+        app:layout_constraintStart_toStartOf="@id/welcome_dashpay_continue_btn"
+        tools:visibility="visible" />
+
     <TextView
         android:id="@+id/welcome_dashpay_continue_btn"
         style="@style/Button.Primary.Large.Blue"
diff --git a/wallet/res/navigation/nav_username.xml b/wallet/res/navigation/nav_username.xml
index 589051b5ca..ff19d1e070 100644
--- a/wallet/res/navigation/nav_username.xml
+++ b/wallet/res/navigation/nav_username.xml
@@ -59,6 +59,7 @@
             app:exitAnim="@anim/activity_stay"
             app:popExitAnim="@anim/slide_out_left"
             app:popUpTo="@id/requestUsernameFragment" />
+        <argument android:name="closeInstead" app:argType="boolean" android:defaultValue="false" />
     </fragment>
 
     <fragment
@@ -80,6 +81,20 @@
             app:exitAnim="@anim/activity_stay"
             app:popExitAnim="@anim/slide_out_left" />
 
+        <action
+            android:id="@+id/requests_to_usernameVotingInfoFragment"
+            app:destination="@id/usernameVotingInfoFragment"
+            app:enterAnim="@anim/slide_in_right"
+            app:exitAnim="@anim/activity_stay"
+            app:popExitAnim="@anim/slide_out_left" />
+
+        <action
+            android:id="@+id/requests_toUsernameRegistrationFragment"
+            app:destination="@id/usernameRegistrationFragment"
+            app:enterAnim="@anim/slide_in_right"
+            app:exitAnim="@anim/activity_stay"
+            app:popExitAnim="@anim/slide_out_left" />
+
     </fragment>
 
     <fragment
@@ -116,13 +131,27 @@
             app:enterAnim="@anim/slide_in_right"
             app:exitAnim="@anim/activity_stay"
             app:popExitAnim="@anim/slide_out_left" />
+
+        <action
+            android:id="@+id/verify_toUsernameRegistrationFragment"
+            app:destination="@id/usernameRegistrationFragment"
+            app:enterAnim="@anim/slide_in_right"
+            app:exitAnim="@anim/activity_stay"
+            app:popExitAnim="@anim/slide_out_left" />
     </fragment>
 
+    <fragment
+        android:id="@+id/usernameRegistrationFragment"
+        android:name="de.schildbach.wallet.ui.username.UsernameRegistrationFragment"
+        tools:layout="@layout/fragment_verfiy_identity">
+    </fragment>
 
 
     <dialog
         android:id="@+id/confirmUsernameRequestDialog"
         android:name="de.schildbach.wallet.ui.username.voting.ConfirmUsernameRequestDialogFragment"
         android:label="ConfirmUsernameRequestDialogFragment"
-        tools:layout="@layout/dialog_confirm_username_request" />
+        tools:layout="@layout/dialog_confirm_username_request">
+        <argument android:name="username" app:argType="string" />
+    </dialog>
 </navigation>
\ No newline at end of file
diff --git a/wallet/res/values/strings-dashpay.xml b/wallet/res/values/strings-dashpay.xml
new file mode 100644
index 0000000000..04a023e827
--- /dev/null
+++ b/wallet/res/values/strings-dashpay.xml
@@ -0,0 +1,399 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources  xmlns:tools="http://schemas.android.com/tools">
+
+    <string name="choose_your_username">Choose your <b>Dash\nUsername</b></string>
+    <string name="identity_min_3_chars">Between 3 and 23 characters</string>
+    <string name="identity_alphanum_only">Letters, numbers and hyphens only</string>
+    <string name="identity_hyphen_rule">Must start and end with a letter or number</string>
+    <string name="identity_username_validating">Validating username…</string>
+    <string name="identity_username_available">Username available</string>
+    <string name="identity_username_taken">Username taken</string>
+    <string name="platform_communication_error">Communication error with Dash Platform</string>
+    <string name="register">Register</string>
+
+    <string name="new_account_confirm_button_text">Confirm &amp; Pay</string>
+    <string name="invitation_confirm_button_text">Confirm</string>
+    <string name="new_account_confirm_accept">I Accept</string>
+    <string name="new_account_confirm_upgrade_fee">Upgrade Fee</string>
+    <string name="new_account_confirm_message">You have chosen %s as your username. Please note that the username can NOT be changed once it is registered.</string>
+    <string name="invitation_confirm_title">Invitation Fee</string>
+    <string name="invitation_confirm_message">Each invitation will be funded with this amount so that the receiver can quickly create their username on the Dash Network</string>
+    <string name="invitation_init_title">Invite</string>
+    <string name="invitation_init_header">Invite your friends &amp; family</string>
+    <string name="invitation_init_message">Help your friends and family join the Dash Network. Invite them to the world of social banking.</string>
+    <string name="invitation_init_button_text">Create a new Invitation</string>
+    <string name="invitation_notifications_hint">Invite your friends and family to the Dash Network</string>
+    <string name="invitation_notifications_hint1">Invite Someone to join the Dash Network</string>
+    <string name="invitation_notifications_hint1_or">or</string>
+    <string name="invitation_created_title">Invitation</string>
+    <string name="invitation_created_successfully">Invitation Created Successfully</string>
+    <string name="invitation_created_tag_title">Tag for your reference</string>
+    <string name="invitation_created_tag">eg: Dad</string>
+    <string name="invitation_created_preview">Preview Invitation</string>
+    <string name="invitation_created_copy_link">Copy Invitation Link</string>
+    <string name="invitation_created_send_invitation">Send Invitation</string>
+    <string name="invitation_created_send_invitation_again">Send again</string>
+    <string name="invitation_created_maybe_later">Maybe later</string>
+    <string name="invitation_preview_title">Join Now</string>
+    <string name="invitation_preview_message">You have been invited by %s. Start using Dash cryptocurrency.</string>
+    <string name="invitation_preview_close">Close</string>
+    <string name="invitation_cant_afford_title">Insufficient Wallet Balance</string>
+    <string name="invitation_cant_afford_message">You need at least %s Dash to create an invitation</string>
+    <string name="invitation_creating_error_title">Error Creating Invitation</string>
+    <string name="invitation_creating_error_message">There was a problem creating your invitation. Please try again.</string>
+    <string name="invitation_creating_error_message_not_synced">Wait for syncing to complete and try again.</string>
+    <string name="invitation_creating_progress_title">Creating invitation</string>
+    <string name="invitation_verifying_progress_title">Verifying invitation</string>
+    <string name="invitation_share_message">Invitations are single use only. Do not share with a group.</string>
+    <string name="invitation_share_title">DashPay invitation</string>
+    <string name="invitation_already_claimed_title">Invitation already claimed</string>
+    <string name="invitation_already_claimed_message">Your invitation from %s has been already claimed</string>
+    <string name="invitation_invalid_invite_title">Invalid Invitation</string>
+    <string name="invitation_invalid_invite_message">Your invitation from %s is not valid</string>
+    <string name="invitation_username_already_found_title">Username already found</string>
+    <string name="invitation_username_already_found_message">You cannot claim this invite since you already have a Dash username</string>
+    <string name="invitation_onboarding_has_began_error_title">Onboarding Error</string>
+    <string name="invitation_onboarding_has_began_error">Onboarding is in process, please claim your invite after you have created your wallet.</string>
+    <string name="invitation_accept_title_1">Get your Username</string>
+    <string name="invitation_accept_title_2">Add your Friends &amp; Family</string>
+    <string name="invitation_accept_message_2">Invite your family, find your friends by searching their usernames</string>
+    <string name="invitation_accept_title_3">Personalize</string>
+    <string name="invitation_accept_message_3">Upload your picture, personalize your identity</string>
+    <string name="invitation_accept_continue">Continue</string>
+    <string name="invitation_contact_request_sent_message">A contact request has been sent to %s since they invited you.</string>
+
+    <string name="username_being_created">Your username %s is being created on the Dash Network</string>
+    <string name="username_being_requested">Your username %s is being requested on the Dash Network</string>
+
+    <string name="processing_let_me_know">Let me know when it\'s done</string>
+    <string name="processing_home_title">Upgrading to Evolution</string>
+    <string name="processing_home_step_1" tools:ignore="TypographyFractions">(1/3) Processing Payment</string>
+    <string name="processing_home_step_2">(2/3) Creating ID</string>
+    <string name="processing_home_step_2_restoring">(2/3) Recovering ID</string>
+    <string name="processing_home_step_3" tools:ignore="TypographyFractions">(3/3) Registering Username</string>
+    <string name="processing_home_step_3_requesting" tools:ignore="TypographyFractions">(3/3) Requesting Username</string>
+    <string name="processing_home_step_3_restoring">(3/3) Recovering Username</string>
+    <string name="processing_done_title">Hello %s,</string>
+    <string name="processing_done_subtitle">Your account is ready</string>
+    <string name="processing_voting_subtitle">Voting for your username has begun</string>
+    <string name="processing_error_title">Error Upgrading</string>
+    <string name="processing_error_title_from_invite">Error Upgrading from invite</string>
+    <string name="processing_error_retry">Retry</string>
+    <string name="processing_username_unavailable_title">Username Unavailable</string>
+    <string name="processing_username_unavailable_subtitle">Please choose another</string>
+
+    <string name="dashpay_upgrade_fee">Upgrade Fee</string>
+    <string name="dashpay_invite_fee">Invite Fee</string>
+    <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="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>
+    <string name="sending_contact_request_short">Inviting</string>
+    <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="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>
+    <string name="contact_request_accept">Accept</string>
+    <string name="contact_request_ignore">Ignore</string>
+
+    <string name="contacts_no_results">There are no contacts that match</string>
+
+    <string name="contacts_title">Contacts</string>
+    <string name="contacts_send_to_contact_title">Send to a Contact</string>
+    <string name="contacts_search_for">Search for a contact</string>
+    <string name="contact_requests_title">Contact Requests</string>
+    <string name="contacts_add_new_contact">Add new contact</string>
+    <string name="contacts_contact_requests_count">Contact Requests (%d)</string>
+    <string name="contacts_contact_requests">Contact Requests</string>
+    <string name="contacts_contact_requests_view">view all</string>
+    <string name="contacts_my_contacts">My Contacts</string>
+    <string name="contacts_sort_order">Sort by:</string>
+    <string-array name="contacts_sort">
+        <item>Name</item>
+    </string-array>
+
+    <string name="notifications_title">Notifications</string>
+    <string name="notifications_title_with_count">Notifications (%d)</string>
+    <string name="notifications_profile_activity">Activity</string>
+    <string name="notifications_new">New</string>
+    <string name="notifications_earlier">Earlier</string>
+    <string name="notifications_none_new">There are no new notifications</string>
+    <string name="notifications_contact_has_accepted">%s has accepted your contact request.</string>
+    <string name="notifications_you_have_accepted">You have accepted the contact request from %s</string>
+    <string name="notifications_you_sent">You sent a contact request to %s</string>
+    <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="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>
+    <string name="contact_history_disclaimer">Add % as your contact to &lt;b>Pay Directly to Username&lt;/b> and &lt;b>Retain Mutual Transaction History&lt;/b></string>
+    <string name="contact_history_disclaimer_pending">Once % accepts your request you can &lt;b>Pay Directly to Username&lt;/b></string>
+    <string name="stranger_activity_disclaimer_text">Payments made directly to addresses won’t be retained in activity.</string>
+    <string name="error_loading_identity">Error loading identity</string>
+
+    <string name="edit_profile">Edit Profile</string>
+    <string name="display_name">Display Name</string>
+    <string name="about_me">About me</string>
+    <string name="char_count">%1$d/%2$d characters</string>
+    <string name="character_counter_pattern" tools:override="true" translatable="false">@string/char_count</string> <!-- overrides default TextInputLayout value. Do not change the name -->
+    <string name="save">Save</string>
+    <string name="edit_profile_take_picture">Take a Photo with Camera</string>
+    <string name="edit_profile_choose_picture">Select from Gallery</string>
+    <string name="upgrade_to_evolution_title">Join DashPay</string>
+    <string name="upgrade_to_evolution_message">Create your Username, find friends &amp; family with their usernames and add them to your contacts</string>
+    <string name="image_cropper_title">Move and Zoom your photo to find the perfect fit</string>
+    <string name="select">Select</string>
+    <string name="unable_to_load_image">Unable to load image.</string>
+    <string name="profile_picture_upload_error_title">Upload Error</string>
+    <string name="profile_picture_upload_error_message">Unable to upload your picture.\nPlease try again.</string>
+    <string name="profile_picture_upload_try_again">Try again</string>
+    <string name="profile_picture_uploading_title">Please Wait</string>
+    <string name="profile_picture_uploading_message">Uploading your picture to the network</string>
+    <string name="picture_upload_policy">Picture Upload Policy</string>
+    <string name="imgur_policy_1">The image you select will be uploaded to Imgur anonymously.</string>
+    <string name="imgur_policy_2">Image uploaded can be viewed publicly by anyone.</string>
+    <string name="imgur_policy_3">You can always delete the image uploaded, as long as you have access to this wallet.</string>
+    <string name="profile_picture_delete_title">Are you sure?</string>
+    <string name="profile_picture_delete_message">This image will no longer be used on the Dash network</string>
+    <string name="agree">Agree</string>
+    <string name="yes">Yes</string>
+    <string name="no">No</string>
+
+    <string name="updating_profile">Updating Profile on Dash Network</string>
+    <string name="google_drive_policy_one">No account information is stored on the Dash Network or by the DashPay wallet.</string>
+    <string name="google_drive_policy_two">Image uploaded can be viewed publicly by anyone.</string>
+    <string name="google_drive_policy_three">You can always delete or change the image as long as you have access to the wallet on this device.</string>
+
+    <string name="upload_image_message">Uploading your picture to the network</string>
+    <string name="upload_image_please_wait">Please Wait</string>
+    <string name="upload_image_error_message">Unable to upload your picture. Please try again.</string>
+    <string name="upload_image_upload_error">Upload Error</string>
+
+    <string name="edit_profile_google_drive">Google Drive</string>
+    <string name="edit_profile_imgur">Imgur</string>
+    <string name="google_drive_failed_authorization">Google Drive authorization failed.</string>
+
+
+    <string name="error_updating_profile_try_again">Try Again</string>
+    <string name="error_updating_profile_cancel">Cancel</string>
+    <string name="error_updating_profile_msg">Error updating profile</string>
+    <string name="error_updating_profile_code">Code: %s</string>
+    <string name="edit_profile_public_url">Public URL</string>
+    <string name="public_url_enter_url">Paste your image URL</string>
+    <string name="public_url_error_message">Unable to fetch image. Please enter a valid image URL.</string>
+    <string name="public_url_message">You can specify any URL which is publicly available on the internet so users can see it on the Dash network.</string>
+    <string name="public_url_more_info">More info</string>
+    <string name="public_url_fetching_image">Fetching Image</string>
+
+    <string name="gravatar">Gravatar</string>
+    <string name="gravatar_email_prompt">Enter your Gravatar Email ID</string>
+    <string name="gravatar_fetching">Fetching your Gravatar</string>
+    <string name="gravatar_email_sample">sample@email.com</string>
+    <string name="gravatar_disclaimer">Your Email is not stored in the DashPay wallet nor on any servers. It is used once to get your Gravatar account details and then discarded.</string>
+    <string name="gravatar_email_error">Unable to fetch your Gravatar. Please enter a valid Gravatar email ID.</string>
+
+    <string name="where_to_store_your_picture">Where would you like to store your picture?</string>
+    <string name="external_storage_disclaimer">Your image will always be in your control. Dash does not store any of your data including your profile picture.</string>
+    <string name="select_source_sign_in_required">Sign in required</string>
+    <string name="select_source_google_drive">Google Drive</string>
+    <string name="select_source_no_sign_in_required">No account required</string>
+
+    <string name="join_dashpay_subtitle">Create Username, add your friends…</string>
+    <string name="join_dashpay_more_subtitle">Create your Username, find your friends and add them to your contacts</string>
+    <string name="join">Join</string>
+
+    <string name="more_suggestions">More Suggestions</string>
+    <string name="users_that_matches">Users that matches</string>
+    <string name="not_in_your_contacts">who are currently not in your contacts</string>
+    <string name="no_matching_contacts">No matching users in your contacts</string>
+    <string name="suggestions_empty_result_part_1">There are no users that matches with the name</string>
+    <string name="suggestions_empty_result_part_2">in your contacts</string>
+    <string name="save_changes">Save Changes</string>
+    <string name="save_profile_reminder_text">Would you like to save the changes you made to your profile?</string>
+    <string name="invitation_notification_text">Invite your friends and family to join the Dash Network.</string>
+    <string name="dashpay_min_balance_disclaimer">You need at least <b>%s</b> to get started</string>
+    <string name="dashpay_insuffient_credits">Insufficient credits to perform this action.</string>
+
+    <string name="about_developer_mode">Developer mode activated: all features enabled!</string>
+    <string name="about_developer_mode_disabled">Developer mode deactivated.</string>
+    <string name="invite_history_create_new_invite">Create a new invitation</string>
+    <string name="invitations_history_header">Invitations History</string>
+    <string name="invitations_filter_title">Filter Invitations</string>
+    <string name="invite_history_empty">No invites have been created.</string>
+    <string name="invite_history_empty_claimed">There are no claimed invites.</string>
+    <string name="invite_history_empty_pending">There are no pending invites.</string>
+    <string name="invitation_details_invite_used_by">Invitation used by</string>
+    <string name="invitation_details_invite_without_username">Invitation claimed.  Username registration pending.</string>
+    <string-array name="invite_filter">
+        <item>All</item>
+        <item>Pending</item>
+        <item>Claimed</item>
+    </string-array>
+
+    <!-- Private memo -->
+    <string name="private_memo">Private Note</string>
+    <string name="add_note">Add Note</string>
+    <string name="edit_note">Edit Note</string>
+    <string name="note">Note</string>
+
+    <string name="select_privacy_preferences">Select your username privacy preferences</string>
+    <string name="please_note_cant_change_this_later">Please note that you will not be able to change this later</string>
+    <string name="Intermediate_level_WIFI_Warning">Intermediate privacy level requires a reliable internet connection</string>
+    <string name="Advanced_level_WIFI_Warning">Advanced privacy level requires a reliable internet connection</string>
+    <string name="privcay_level_WIFI_warning_desc">It is recommended to be on a Wi-Fi network to avoid losing any funds</string>
+    <string name="continue_anyway">Continue Anyway</string>
+    <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="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="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_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="all">All</string>
+    <string name="n_usernames">%d usernames</string>
+    <string name="n_requests">%d requests</string>
+    <string name="search_by_username">Search by username</string>
+    <string name="type">Type</string>
+    <string name="only_duplicates">Only duplicates</string>
+    <string name="only_links">Only requests with links</string>
+    <string name="only_links_short">With links</string>
+    <string name="date">Date: %s</string>
+    <string name="votes">Votes: %s</string>
+
+    <string-array name="usernames_sort_by_options">
+        <item>New to old</item>
+        <item>Old to new</item>
+        <item>High to low</item>
+        <item>Low to high</item>
+    </string-array>
+
+    <string-array name="usernames_type_options">
+        <item>All</item>
+        <item>I have approved</item>
+        <item>I have not approved</item>
+    </string-array>
+
+    <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_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="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="identity">Identity</string>
+    <string name="link">Link</string>
+    <string name="link_not_provided">Not provided</string>
+    <string name="cancel_approval">Cancel Approval</string>
+    <string name="verify_your_identity">Verify your identity to enhance your chances of getting your requested username</string>
+    <string name="if_somebody">If somebody else requests the same username as you, we will let the network decide whom to give this username</string>
+    <string name="the_link_will_be_visible">The link you send will be visible only to the network owners</string>
+    <string name="verify_your_identity_voting">Verify your identity</string>
+    <string name="copy_the_text">Copy the text</string>
+    <string name="please_vote_to_approve">Please vote to approve my requested Dash username - %s</string>
+    <string name="prove_your_identity">Prove your identity</string>
+    <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_input_error">You have entered an invalid key</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="quick_vote">Quick Voting</string>
+    <string name="quick_vote_subtitle">By tapping the "Vote for All" button, you will automatically vote for all of the filtered usernames (%d) that were submitted first</string>
+    <string name="vote_for_all">Vote for All</string>
+    <string name="voting_period_active">Username Voting Period Active</string>
+    <string name="there_was_a_network_error">There was a network error, you can try again at no extra cost</string>
+    <string name="requested_username_has_been">Username has been requested.</string>
+    <string name="requested_voting_duration">Results on %s.</string>
+    <string name="cancel_request">Cancel Request</string>
+    <string name="after_the_voting">After the voting ends we will notify you about its results</string>
+    <string name="none">None</string>
+    <string name="verify_now">Verify Now</string>
+    <string name="if_you_tap_cancel">If you tap “Cancel Request”, you will still have a chance to request another username without paying again</string>
+    <string name="do_you_really_want_to_cancel">Do you really want to cancel the username request?</string>
+    <string name="if_you_tap_cancel_request">If you tap “Cancel Request”, you will still have a chance to request another username without paying again</string>
+    <string name="cant_open">Can’t open</string>
+    <string name="invalid_link">The link is invalid</string>
+    <string name="welcome_request_username_min_balance_disclaimer_all">You have %s Dash.  Some usernames cost up to %s Dash.</string>
+    <string name="welcome_request_username_min_balance_disclaimer_noncontested">You need to have more than %s Dash to create a username.</string>
+    <string name="request_username_min_balance_disclaimer">To request a username on the Dash Network, you need to have more than %s Dash</string>
+
+    <!-- CoinJoin -->
+    <string name="coinjoin">CoinJoin</string>
+    <string name="turned_off">Turned off</string>
+    <string name="coinjoin_info_subtitle">Mixing your Dash coins will make your transactions more private</string>
+    <string name="coinjoin_description_1">You will only be able to spend Dash that has been mixed when this is turned on. This can be turned off at any time.</string>
+    <string name="coinjoin_description_2">Newly received Dash will be automatically mixed when the wallet is opened</string>
+    <string name="coinjoin_description_3">Turning this feature on will result a higher battery usage</string>
+    <string name="coinjoin_mixing_level_title">Select mixing level</string>
+    <string name="coinjoin_mixing_level_subtitle">You can change or stop the mixing level at any time</string>
+    <string name="coinjoin_mixing_transactions">Mixing Transactions</string>
+    <string name="coinjoin_transaction_group">These are mixing related transactions.</string>
+    <string name="intermediate">Intermediate</string>
+    <string name="advanced">Advanced</string>
+    <string name="intermediate_level_card_decs">Advanced users who have a very high level of technical expertise can determine your transaction history</string>
+    <string name="advanced_level_card_decs">It would be very difficult for advanced users with any level of technical expertise to determine your transaction history</string>
+    <string name="coinjoin_intermediate_time">up to 30 minutes</string>
+    <string name="coinjoin_advanced_time">Multiple hours</string>
+    <string name="coinjoin_start">Start Mixing</string>
+    <string name="coinjoin_stop">Stop Mixing</string>
+    <string name="coinjoin_mixing">Mixing</string>
+    <string name="coinjoin_paused">Mixing Paused</string>
+    <string name="coinjoin_not_started">Not Started</string>
+    <string name="coinjoin_progress">%s (%d%%) %s of %s</string>
+    <string name="coinjoin_progress_balance">%1$s of %2$s</string>
+    <string name="coinjoin_progress_finished">Fully Mixed</string>
+    <string name="coinjoin_change_level_confirmation">Are you sure you want to change the privacy level?</string>
+    <string name="coinjoin_stop_mixing_title">Are you sure you want to stop mixing?</string>
+    <string name="coinjoin_stop_mixing_message">Any funds that have been mixed will be combined with your unmixed funds</string>
+    <string name="coinjoin_mixed_balance">Mixed balance:</string>
+
+    <!-- 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_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>
+    <string name="credit_balance_insufficient_error_message">You don’t have enough funds to buy credits</string>
+    <string name="buy_credits_estimated_items">%s - %d contacts / %d profile updates</string>
+
+    <string name="request_username_username_voting_message">+ what is username voting?</string>
+    <string name="request_username_character_requirement">Letters, numbers and hyphens only</string>
+    <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>
+
+</resources>
diff --git a/wallet/res/values/strings-extra.xml b/wallet/res/values/strings-extra.xml
index e1f86b8988..eddf81c9c6 100644
--- a/wallet/res/values/strings-extra.xml
+++ b/wallet/res/values/strings-extra.xml
@@ -380,67 +380,6 @@
     <string name="import_image_invalid_private">Invalid Private Key</string>
     <string name="okay">Okay</string>
 
-    <string name="choose_your_username">Choose your <b>Dash\nUsername</b></string>
-    <string name="identity_min_3_chars">Between 3 and 23 characters</string>
-    <string name="identity_alphanum_only">Letters, numbers and hyphens only</string>
-    <string name="identity_hyphen_rule">Must start and end with a letter or number</string>
-    <string name="identity_username_validating">Validating username…</string>
-    <string name="identity_username_available">Username available</string>
-    <string name="identity_username_taken">Username taken</string>
-    <string name="platform_communication_error">Communication error with Dash Platform</string>
-    <string name="register">Register</string>
-
-    <string name="new_account_confirm_button_text">Confirm &amp; Pay</string>
-    <string name="invitation_confirm_button_text">Confirm</string>
-    <string name="new_account_confirm_accept">I Accept</string>
-    <string name="new_account_confirm_upgrade_fee">Upgrade Fee</string>
-    <string name="new_account_confirm_message">You have chose %s as your username. Username cannot be changed once it is registered.</string>
-    <string name="invitation_confirm_title">Invitation Fee</string>
-    <string name="invitation_confirm_message">Each invitation will be funded with this amount so that the receiver can quickly create their username on the Dash Network</string>
-    <string name="invitation_init_title">Invite</string>
-    <string name="invitation_init_header">Invite your friends &amp; family</string>
-    <string name="invitation_init_message">Help your friends and family join the Dash Network. Invite them to the world of social banking.</string>
-    <string name="invitation_init_button_text">Create a new Invitation</string>
-    <string name="invitation_notifications_hint">Invite your friends and family to the Dash Network</string>
-    <string name="invitation_notifications_hint1">Invite Someone to join the Dash Network</string>
-    <string name="invitation_notifications_hint1_or">or</string>
-    <string name="invitation_created_title">Invitation</string>
-    <string name="invitation_created_successfully">Invitation Created Successfully</string>
-    <string name="invitation_created_tag_title">Tag for your reference</string>
-    <string name="invitation_created_tag">eg: Dad</string>
-    <string name="invitation_created_preview">Preview Invitation</string>
-    <string name="invitation_created_copy_link">Copy Invitation Link</string>
-    <string name="invitation_created_send_invitation">Send Invitation</string>
-    <string name="invitation_created_send_invitation_again">Send again</string>
-    <string name="invitation_created_maybe_later">Maybe later</string>
-    <string name="invitation_preview_title">Join Now</string>
-    <string name="invitation_preview_message">You have been invited by %s. Start using Dash cryptocurrency.</string>
-    <string name="invitation_preview_close">Close</string>
-    <string name="invitation_cant_afford_title">Insufficient Wallet Balance</string>
-    <string name="invitation_cant_afford_message">You need at least %s Dash to create an invitation</string>
-    <string name="invitation_creating_error_title">Error Creating Invitation</string>
-    <string name="invitation_creating_error_message">There was a problem creating your invitation. Please try again.</string>
-    <string name="invitation_creating_error_message_not_synced">Wait for syncing to complete and try again.</string>
-    <string name="invitation_creating_progress_title">Creating invitation</string>
-    <string name="invitation_verifying_progress_title">Verifying invitation</string>
-    <string name="invitation_share_message">Invitations are single use only. Do not share with a group.</string>
-    <string name="invitation_share_title">DashPay invitation</string>
-    <string name="invitation_already_claimed_title">Invitation already claimed</string>
-    <string name="invitation_already_claimed_message">Your invitation from %s has been already claimed</string>
-    <string name="invitation_invalid_invite_title">Invalid Invitation</string>
-    <string name="invitation_invalid_invite_message">Your invitation from %s is not valid</string>
-    <string name="invitation_username_already_found_title">Username already found</string>
-    <string name="invitation_username_already_found_message">You cannot claim this invite since you already have a Dash username</string>
-    <string name="invitation_onboarding_has_began_error_title">Onboarding Error</string>
-    <string name="invitation_onboarding_has_began_error">Onboarding is in process, please claim your invite after you have created your wallet.</string>
-    <string name="invitation_accept_title_1">Get your Username</string>
-    <string name="invitation_accept_title_2">Add your Friends &amp; Family</string>
-    <string name="invitation_accept_message_2">Invite your family, find your friends by searching their usernames</string>
-    <string name="invitation_accept_title_3">Personalize</string>
-    <string name="invitation_accept_message_3">Upload your picture, personalize your identity</string>
-    <string name="invitation_accept_continue">Continue</string>
-    <string name="invitation_contact_request_sent_message">A contact request has been sent to %s since they invited you.</string>
-
     <string name="onboard_from_invite_title">Let\'s Get Started</string>
     <string name="onboard_from_invite_subtitle">Welcome to DashPay</string>
     <string name="onboard_from_invite_step1">Step 1</string>
@@ -453,160 +392,7 @@
     <string name="restore_wallet_please_wait">Please Wait</string>
     <string name="restore_wallet_restoring">Your wallet is being restored</string>
 
-    <string name="username_being_created">Your username %s is being created on the Dash Network</string>
-    <string name="processing_let_me_know">Let me know when it\'s done</string>
-    <string name="processing_home_title">Upgrading to Evolution</string>
-    <string name="processing_home_step_1" tools:ignore="TypographyFractions">(1/3) Processing Payment</string>
-    <string name="processing_home_step_2">(2/3) Creating ID</string>
-    <string name="processing_home_step_2_restoring">(2/3) Recovering ID</string>
-    <string name="processing_home_step_3" tools:ignore="TypographyFractions">(3/3) Registering Username</string>
-    <string name="processing_home_step_3_restoring">(3/3) Recovering Username</string>
-    <string name="processing_done_title">Hello %s,</string>
-    <string name="processing_done_subtitle">Your account is ready</string>
-    <string name="processing_error_title">Error Upgrading</string>
-    <string name="processing_error_title_from_invite">Error Upgrading from invite</string>
-    <string name="processing_error_retry">Retry</string>
-    <string name="processing_username_unavailable_title">Username Unavailable</string>
-    <string name="processing_username_unavailable_subtitle">Please choose another</string>
-
-    <string name="dashpay_upgrade_fee">Upgrade Fee</string>
-    <string name="dashpay_invite_fee">Invite Fee</string>
-    <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="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>
-    <string name="sending_contact_request_short">Inviting</string>
-    <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="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>
-    <string name="contact_request_accept">Accept</string>
-    <string name="contact_request_ignore">Ignore</string>
-
-    <string name="contacts_no_results">There are no contacts that match</string>
-
-    <string name="contacts_title">Contacts</string>
-    <string name="contacts_send_to_contact_title">Send to a Contact</string>
-    <string name="contacts_search_for">Search for a contact</string>
-    <string name="contact_requests_title">Contact Requests</string>
-    <string name="contacts_add_new_contact">Add new contact</string>
-    <string name="contacts_contact_requests_count">Contact Requests (%d)</string>
-    <string name="contacts_contact_requests">Contact Requests</string>
-    <string name="contacts_contact_requests_view">view all</string>
-    <string name="contacts_my_contacts">My Contacts</string>
-    <string name="contacts_sort_order">Sort by:</string>
-    <string-array name="contacts_sort">
-        <item>Name</item>
-    </string-array>
 
-    <string name="notifications_title">Notifications</string>
-    <string name="notifications_title_with_count">Notifications (%d)</string>
-    <string name="notifications_profile_activity">Activity</string>
-    <string name="notifications_new">New</string>
-    <string name="notifications_earlier">Earlier</string>
-    <string name="notifications_none_new">There are no new notifications</string>
-    <string name="notifications_contact_has_accepted">%s has accepted your contact request.</string>
-    <string name="notifications_you_have_accepted">You have accepted the contact request from %s</string>
-    <string name="notifications_you_sent">You sent a contact request to %s</string>
-    <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="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>
-    <string name="contact_history_disclaimer">Add % as your contact to &lt;b>Pay Directly to Username&lt;/b> and &lt;b>Retain Mutual Transaction History&lt;/b></string>
-    <string name="contact_history_disclaimer_pending">Once % accepts your request you can &lt;b>Pay Directly to Username&lt;/b></string>
-    <string name="stranger_activity_disclaimer_text">Payments made directly to addresses won’t be retained in activity.</string>
-    <string name="error_loading_identity">Error loading identity</string>
-
-    <string name="edit_profile">Edit Profile</string>
-    <string name="display_name">Display Name</string>
-    <string name="about_me">About me</string>
-    <string name="char_count">%1$d/%2$d characters</string>
-    <string name="character_counter_pattern" tools:override="true" translatable="false">@string/char_count</string> <!-- overrides default TextInputLayout value. Do not change the name -->
-    <string name="save">Save</string>
-    <string name="edit_profile_take_picture">Take a Photo with Camera</string>
-    <string name="edit_profile_choose_picture">Select from Gallery</string>
-    <string name="upgrade_to_evolution_title">Join DashPay</string>
-    <string name="upgrade_to_evolution_message">Create your Username, find friends &amp; family with their usernames and add them to your contacts</string>
-    <string name="image_cropper_title">Move and Zoom your photo to find the perfect fit</string>
-    <string name="select">Select</string>
-    <string name="unable_to_load_image">Unable to load image.</string>
-    <string name="profile_picture_upload_error_title">Upload Error</string>
-    <string name="profile_picture_upload_error_message">Unable to upload your picture.\nPlease try again.</string>
-    <string name="profile_picture_upload_try_again">Try again</string>
-    <string name="profile_picture_uploading_title">Please Wait</string>
-    <string name="profile_picture_uploading_message">Uploading your picture to the network</string>
-    <string name="picture_upload_policy">Picture Upload Policy</string>
-    <string name="imgur_policy_1">The image you select will be uploaded to Imgur anonymously.</string>
-    <string name="imgur_policy_2">Image uploaded can be viewed publicly by anyone.</string>
-    <string name="imgur_policy_3">You can always delete the image uploaded, as long as you have access to this wallet.</string>
-    <string name="profile_picture_delete_title">Are you sure?</string>
-    <string name="profile_picture_delete_message">This image will no longer be used on the Dash network</string>
-    <string name="agree">Agree</string>
-    <string name="yes">Yes</string>
-    <string name="no">No</string>
-
-    <string name="updating_profile">Updating Profile on Dash Network</string>
-    <string name="google_drive_policy_one">No account information is stored on the Dash Network or by the DashPay wallet.</string>
-    <string name="google_drive_policy_two">Image uploaded can be viewed publicly by anyone.</string>
-    <string name="google_drive_policy_three">You can always delete or change the image as long as you have access to the wallet on this device.</string>
-
-    <string name="upload_image_message">Uploading your picture to the network</string>
-    <string name="upload_image_please_wait">Please Wait</string>
-    <string name="upload_image_error_message">Unable to upload your picture. Please try again.</string>
-    <string name="upload_image_upload_error">Upload Error</string>
-
-    <string name="edit_profile_google_drive">Google Drive</string>
-    <string name="edit_profile_imgur">Imgur</string>
-    <string name="google_drive_failed_authorization">Google Drive authorization failed.</string>
-
-
-    <string name="error_updating_profile_try_again">Try Again</string>
-    <string name="error_updating_profile_cancel">Cancel</string>
-    <string name="error_updating_profile_msg">Error updating profile</string>
-    <string name="error_updating_profile_code">Code: %s</string>
-    <string name="edit_profile_public_url">Public URL</string>
-    <string name="public_url_enter_url">Paste your image URL</string>
-    <string name="public_url_error_message">Unable to fetch image. Please enter a valid image URL.</string>
-    <string name="public_url_message">You can specify any URL which is publicly available on the internet so users can see it on the Dash network.</string>
-    <string name="public_url_more_info">More info</string>
-    <string name="public_url_fetching_image">Fetching Image</string>
-
-    <string name="gravatar">Gravatar</string>
-    <string name="gravatar_email_prompt">Enter your Gravatar Email ID</string>
-    <string name="gravatar_fetching">Fetching your Gravatar</string>
-    <string name="gravatar_email_sample">sample@email.com</string>
-    <string name="gravatar_disclaimer">Your Email is not stored in the DashPay wallet nor on any servers. It is used once to get your Gravatar account details and then discarded.</string>
-    <string name="gravatar_email_error">Unable to fetch your Gravatar. Please enter a valid Gravatar email ID.</string>
-
-    <string name="where_to_store_your_picture">Where would you like to store your picture?</string>
-    <string name="external_storage_disclaimer">Your image will always be in your control. Dash does not store any of your data including your profile picture.</string>
-    <string name="select_source_sign_in_required">Sign in required</string>
-    <string name="select_source_google_drive">Google Drive</string>
-    <string name="select_source_no_sign_in_required">No account required</string>
-
-    <string name="join_dashpay_subtitle">Create Username, add your friends…</string>
-    <string name="join_dashpay_more_subtitle">Create your Username, find your friends and add them to your contacts</string>
-    <string name="join">Join</string>
-
-    <string name="more_suggestions">More Suggestions</string>
-    <string name="users_that_matches">Users that matches</string>
-    <string name="not_in_your_contacts">who are currently not in your contacts</string>
-    <string name="no_matching_contacts">No matching users in your contacts</string>
-    <string name="suggestions_empty_result_part_1">There are no users that matches with the name</string>
-    <string name="suggestions_empty_result_part_2">in your contacts</string>
-    <string name="save_changes">Save Changes</string>
-    <string name="save_profile_reminder_text">Would you like to save the changes you made to your profile?</string>
-    <string name="invitation_notification_text">Invite your friends and family to join the Dash Network.</string>
-    <string name="dashpay_min_balance_disclaimer">You need at least <b>%s</b> to get started</string>
-    <string name="dashpay_insuffient_credits">Insufficient credits to perform this action.</string>
 
     <string name="network_unavailable">Network Unavailable</string>
     <string name="network_error_contact_details">Unable to fetch contact details</string>
@@ -614,21 +400,7 @@
     <string name="network_error_contact_suggestions">Unable to provide suggestions</string>
     <string name="network_error_unable_to_update_profile">Unable to update your profile</string>
 
-    <string name="about_developer_mode">Developer mode activated: all features enabled!</string>
-    <string name="about_developer_mode_disabled">Developer mode deactivated.</string>
-    <string name="invite_history_create_new_invite">Create a new invitation</string>
-    <string name="invitations_history_header">Invitations History</string>
-    <string name="invitations_filter_title">Filter Invitations</string>
-    <string name="invite_history_empty">No invites have been created.</string>
-    <string name="invite_history_empty_claimed">There are no claimed invites.</string>
-    <string name="invite_history_empty_pending">There are no pending invites.</string>
-    <string name="invitation_details_invite_used_by">Invitation used by</string>
-    <string name="invitation_details_invite_without_username">Invitation claimed.  Username registration pending.</string>
-    <string-array name="invite_filter">
-        <item>All</item>
-        <item>Pending</item>
-        <item>Claimed</item>
-    </string-array>
+
 
     <string name="today">Today</string>
     <string name="yesterday">Yesterday</string>
@@ -660,11 +432,7 @@
     <string name="start_reset_wallet_title">You may lose %s</string>
     <string name="reset_wallet_text">Reset Wallet</string>
 
-    <!-- Private memo -->
-    <string name="private_memo">Private Note</string>
-    <string name="add_note">Add Note</string>
-    <string name="edit_note">Edit Note</string>
-    <string name="note">Note</string>
+
 
     <!-- Tax category -->
     <string name="reclassify_transactions_title">Reclassify Your Transactions</string>
@@ -704,14 +472,4 @@
     <string name="stale_exchange_rates_error">Prices weren\'t retrieved. Fiat values may be incorrect.</string>
     <string name="stale_exchange_rates_stale">Prices are at least 30 minutes old. Fiat values may be incorrect.</string>
     <string name="stale_exchange_rates_volatile">Prices have fluctuated more than 50% since the last update.</string>
-
-    <!-- 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_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>
-    <string name="credit_balance_insufficient_error_message">You don’t have enough funds to buy credits</string>
-    <string name="buy_credits_estimated_items">%s - %d contacts / %d profile updates</string>
 </resources>
\ No newline at end of file
diff --git a/wallet/res/values/strings.xml b/wallet/res/values/strings.xml
index 1a1c6df7ca..d731fa6ef6 100644
--- a/wallet/res/values/strings.xml
+++ b/wallet/res/values/strings.xml
@@ -413,131 +413,5 @@
     <string name="battery_optimization_dialog_unrestricted_title">Do you want to receive payments in the background?</string>
     <string name="battery_optimization_dialog_message_not_optimized">This app is configured to continue running after not being visible for some time.\n\nWe suggest allowing this app to always stay up-to-date with the blockchain, even in the background.\n\nDon\'t worry, we will always mind your battery usage.</string>
     <string name="battery_optimization_dialog_button_change">Open Settings</string>
-    <string name="select_privacy_preferences">Select your username privacy preferences</string>
-    <string name="please_note_cant_change_this_later">Please note that you will not be able to change this later</string>
-    <string name="Intermediate_level_WIFI_Warning">Intermediate privacy level requires a reliable internet connection</string>
-    <string name="Advanced_level_WIFI_Warning">Advanced privacy level requires a reliable internet connection</string>
-    <string name="privcay_level_WIFI_warning_desc">It is recommended to be on a Wi-Fi network to avoid losing any funds</string>
-    <string name="continue_anyway">Continue Anyway</string>
-    <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="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</string>
-    <string name="case_your_request_is_not_approved">In case your request is not approved</string>
-    <string name="after_voting">After voting is completed on X you can create any username that has not already been created</string>
-    <string name="voting_will_not_required_forever">Voting will not be required forever</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="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="all">All</string>
-    <string name="n_usernames">%d usernames</string>
-    <string name="n_requests">%d requests</string>
-    <string name="search_by_username">Search by username</string>
-    <string name="type">Type</string>
-    <string name="only_duplicates">Only duplicates</string>
-    <string name="only_links">Only requests with links</string>
-    <string name="only_links_short">With links</string>
-    <string name="date">Date: %s</string>
-    <string name="votes">Votes: %s</string>
 
-    <string-array name="usernames_sort_by_options">
-        <item>New to old</item>
-        <item>Old to new</item>
-        <item>High to low</item>
-        <item>Low to high</item>
-    </string-array>
-
-    <string-array name="usernames_type_options">
-        <item>All</item>
-        <item>I have approved</item>
-        <item>I have not approved</item>
-    </string-array>
-
-    <string name="request_your_username">Request your username</string>
-    <string name="request_your_hint">Once the voting ends you can create any username you want as long as it hasn’t already been created</string>
-    <string name="request_username">Request Username</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="identity">Identity</string>
-    <string name="link">Link</string>
-    <string name="link_not_provided">Not provided</string>
-    <string name="cancel_approval">Cancel Approval</string>
-    <string name="verify_your_identity">Verify your identity to enhance your chances of getting your requested username</string>
-    <string name="if_somebody">If somebody else requests the same username as you, we will let the network decide whom to give this username</string>
-    <string name="the_link_will_be_visible">The link you send will be visible only to the network owners</string>
-    <string name="verify_your_identity_voting">Verify your identity</string>
-    <string name="copy_the_text">Copy the text</string>
-    <string name="please_vote_to_approve">Please vote to approve my requested Dash username - %s</string>
-    <string name="prove_your_identity">Prove your identity</string>
-    <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_input_error">You have entered an invalid key</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="quick_vote">Quick Voting</string>
-    <string name="quick_vote_subtitle">By tapping the "Vote for All" button, you will automatically vote for all of the filtered usernames (%d) that were submitted first</string>
-    <string name="vote_for_all">Vote for All</string>
-    <string name="voting_period_active">Username Voting Period Active</string>
-    <string name="there_was_a_network_error">There was a network error, you can try again at no extra cost</string>
-    <string name="requested_voting_duration">Requested · Voting: 1 Mar – 15 Mar</string>
-    <string name="cancel_request">Cancel Request</string>
-    <string name="after_the_voting">After the voting ends we will notify you about its results</string>
-    <string name="none">None</string>
-    <string name="verify_now">Verify Now</string>
-    <string name="if_you_tap_cancel">If you tap “Cancel Request”, you will still have a chance to request another username without paying again</string>
-    <string name="do_you_really_want_to_cancel">Do you really want to cancel the username request?</string>
-    <string name="if_you_tap_cancel_request">If you tap “Cancel Request”, you will still have a chance to request another username without paying again</string>
-    <string name="cant_open">Can’t open</string>
-    <string name="invalid_link">The link is invalid</string>
-    <string name="welcome_request_username_min_balance_disclaimer">You should have more than %s Dash to create a username</string>
-    <string name="request_username_min_balance_disclaimer">To request a username on the Dash Network, you need to have more than %s Dash</string>
-
-    <!-- CoinJoin -->
-    <string name="coinjoin">CoinJoin</string>
-    <string name="turned_off">Turned off</string>
-    <string name="coinjoin_info_subtitle">Mixing your Dash coins will make your transactions more private</string>
-    <string name="coinjoin_description_1">You will only be able to spend Dash that has been mixed when this is turned on. This can be turned off at any time.</string>
-    <string name="coinjoin_description_2">Newly received Dash will be automatically mixed when the wallet is opened</string>
-    <string name="coinjoin_description_3">Turning this feature on will result a higher battery usage</string>
-    <string name="coinjoin_mixing_level_title">Select mixing level</string>
-    <string name="coinjoin_mixing_level_subtitle">You can change or stop the mixing level at any time</string>
-    <string name="coinjoin_mixing_transactions">Mixing Transactions</string>
-    <string name="coinjoin_transaction_group">These are mixing related transactions.</string>
-    <string name="intermediate">Intermediate</string>
-    <string name="advanced">Advanced</string>
-    <string name="intermediate_level_card_decs">Advanced users who have a very high level of technical expertise can determine your transaction history</string>
-    <string name="advanced_level_card_decs">It would be very difficult for advanced users with any level of technical expertise to determine your transaction history</string>
-    <string name="coinjoin_intermediate_time">up to 30 minutes</string>
-    <string name="coinjoin_advanced_time">Multiple hours</string>
-    <string name="coinjoin_start">Start Mixing</string>
-    <string name="coinjoin_stop">Stop Mixing</string>
-    <string name="coinjoin_mixing">Mixing</string>
-    <string name="coinjoin_paused">Mixing Paused</string>
-    <string name="coinjoin_not_started">Not Started</string>
-    <string name="coinjoin_progress">%s (%d%%) %s of %s</string>
-    <string name="coinjoin_progress_balance">%1$s of %2$s</string>
-    <string name="coinjoin_progress_finished">Fully Mixed</string>
-    <string name="coinjoin_change_level_confirmation">Are you sure you want to change the privacy level?</string>
-    <string name="coinjoin_stop_mixing_title">Are you sure you want to stop mixing?</string>
-    <string name="coinjoin_stop_mixing_message">Any funds that have been mixed will be combined with your unmixed funds</string>
-    <string name="coinjoin_mixed_balance">Mixed balance:</string>
 </resources>
diff --git a/wallet/src/de/schildbach/wallet/Constants.java b/wallet/src/de/schildbach/wallet/Constants.java
index 35737d2dca..670d599f81 100644
--- a/wallet/src/de/schildbach/wallet/Constants.java
+++ b/wallet/src/de/schildbach/wallet/Constants.java
@@ -286,8 +286,10 @@ public final static class Files {
     //Backup Warnings (true = both seed and backup file, false = seed only)
     public static final boolean SUPPORT_BOTH_BACKUP_WARNINGS = false;
 
-    // 1,500,000,000 credits
-    public static final Coin DASH_PAY_FEE = Coin.parseCoin("0.45");
+    // 2,500,000,000 credits
+    public static final Coin DASH_PAY_FEE_CONTESTED = Coin.parseCoin("0.25");
+    public static final Coin DASH_PAY_FEE = Coin.parseCoin("0.03");
+
     // 150,000,000
     public static final Coin DASH_PAY_INVITE_MIN = DASH_PAY_FEE.div(10);
 
diff --git a/wallet/src/de/schildbach/wallet/database/dao/UserAlertDao.kt b/wallet/src/de/schildbach/wallet/database/dao/UserAlertDao.kt
index 7f182abfa8..e816992458 100644
--- a/wallet/src/de/schildbach/wallet/database/dao/UserAlertDao.kt
+++ b/wallet/src/de/schildbach/wallet/database/dao/UserAlertDao.kt
@@ -24,7 +24,7 @@ import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface UserAlertDao {
-    @Insert(onConflict = OnConflictStrategy.ABORT)
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insert(userAlert: UserAlert)
 
     @Query("UPDATE user_alerts SET dismissed = 1 WHERE stringResId = :id")
diff --git a/wallet/src/de/schildbach/wallet/database/entity/BlockchainIdentityBaseData.kt b/wallet/src/de/schildbach/wallet/database/entity/BlockchainIdentityBaseData.kt
index 2fd64196f5..5319d7d337 100644
--- a/wallet/src/de/schildbach/wallet/database/entity/BlockchainIdentityBaseData.kt
+++ b/wallet/src/de/schildbach/wallet/database/entity/BlockchainIdentityBaseData.kt
@@ -20,21 +20,31 @@ package de.schildbach.wallet.database.entity
 import de.schildbach.wallet.data.InvitationLinkData
 import org.bitcoinj.core.Sha256Hash
 
-data class BlockchainIdentityBaseData(val id: Int,
-                                      val creationState: BlockchainIdentityData.CreationState,
-                                      val creationStateErrorMessage: String?,
-                                      val username: String?,
-                                      val userId: String?,
-                                      val restoring: Boolean,
-                                      val creditFundingTxId: Sha256Hash? = null,
-                                      val usingInvite: Boolean = false,
-                                      val invite: InvitationLinkData? = null) {
+data class BlockchainIdentityBaseData(
+    val id: Int,
+    val creationState: BlockchainIdentityData.CreationState,
+    val creationStateErrorMessage: String?,
+    val username: String?,
+    val userId: String?,
+    val restoring: Boolean,
+    val creditFundingTxId: Sha256Hash? = null,
+    val usingInvite: Boolean = false,
+    val invite: InvitationLinkData? = null,
+    var requestedUsername: String? = null,
+    var verificationLink: String? = null,
+    val cancelledVerificationLink: Boolean? = null,
+    val usernameRequested: Boolean? = null,
+    val votingPeriodStart: Long? = null
+) {
 
     val creationInProgress: Boolean
         get() = creationState > BlockchainIdentityData.CreationState.NONE &&
-                creationState < BlockchainIdentityData.CreationState.DONE &&
+                creationState < BlockchainIdentityData.CreationState.VOTING &&
                 creationStateErrorMessage == null
 
+    val votingInProgress: Boolean
+        get() = creationState == BlockchainIdentityData.CreationState.VOTING
+
     val creationComplete: Boolean
         get() = creationState >= BlockchainIdentityData.CreationState.DONE
 
diff --git a/wallet/src/de/schildbach/wallet/database/entity/BlockchainIdentityData.kt b/wallet/src/de/schildbach/wallet/database/entity/BlockchainIdentityData.kt
index 6d151feacc..8e9b907e97 100644
--- a/wallet/src/de/schildbach/wallet/database/entity/BlockchainIdentityData.kt
+++ b/wallet/src/de/schildbach/wallet/database/entity/BlockchainIdentityData.kt
@@ -44,25 +44,32 @@ import org.dashj.platform.sdk.KeyType
 import javax.inject.Inject
 import javax.inject.Singleton
 
-data class BlockchainIdentityData(var creationState: CreationState = CreationState.NONE,
-                                  var creationStateErrorMessage: String?,
-                                  var username: String?,
-                                  var userId: String?,
-                                  var restoring: Boolean,
-                                  var identity: Identity? = null,
-                                  var creditFundingTxId: Sha256Hash? = null,
-                                  var usingInvite: Boolean = false,
-                                  var invite: InvitationLinkData? = null,
-                                  var preorderSalt: ByteArray? = null,
-                                  var registrationStatus: BlockchainIdentity.RegistrationStatus? = null,
-                                  var usernameStatus: BlockchainIdentity.UsernameStatus? = null,
-                                  var privacyMode: CoinJoinMode? = null,
-                                  var creditBalance: Coin? = null,
-                                  var activeKeyCount: Int? = null,
-                                  var totalKeyCount: Int? = null,
-                                  var keysCreated: Long? = null,
-                                  var currentMainKeyIndex: Int? = null,
-                                  var currentMainKeyType: KeyType? = null) {
+data class BlockchainIdentityData(
+    var creationState: CreationState = CreationState.NONE,
+    var creationStateErrorMessage: String?,
+    var username: String?,
+    var userId: String?,
+    var restoring: Boolean,
+    var identity: Identity? = null,
+    var creditFundingTxId: Sha256Hash? = null,
+    var usingInvite: Boolean = false,
+    var invite: InvitationLinkData? = null,
+    var preorderSalt: ByteArray? = null,
+    var registrationStatus: BlockchainIdentity.RegistrationStatus? = null,
+    var usernameStatus: BlockchainIdentity.UsernameStatus? = null,
+    var privacyMode: CoinJoinMode? = null,
+    var creditBalance: Coin? = null,
+    var activeKeyCount: Int? = null,
+    var totalKeyCount: Int? = null,
+    var keysCreated: Long? = null,
+    var currentMainKeyIndex: Int? = null,
+    var currentMainKeyType: KeyType? = null,
+    var requestedUsername: String? = null,
+    var verificationLink: String? = null,
+    val cancelledVerificationLink: Boolean? = null,
+    val usernameRequested: Boolean? = null,
+    val votingPeriodStart: Long? = null
+    ) {
 
     var id = 1
         set(@Suppress("UNUSED_PARAMETER") value) {
@@ -110,6 +117,11 @@ data class BlockchainIdentityData(var creationState: CreationState = CreationSta
         USERNAME_REGISTERED,
         DASHPAY_PROFILE_CREATING,
         DASHPAY_PROFILE_CREATED,
+        REQUESTED_NAME_CHECKING,
+        REQUESTED_NAME_CHECKED,
+        REQUESTED_NAME_LINK_SAVING,
+        REQUESTED_NAME_LINK_SAVED,
+        VOTING,
         DONE,
         DONE_AND_DISMISS // this should always be the last value
     }
@@ -148,6 +160,13 @@ open class BlockchainIdentityConfig @Inject constructor(
         val IDENTITY = stringPreferencesKey("identity")
         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 = booleanPreferencesKey("username_requested")
+        val VOTING_PERIOD_START = longPreferencesKey("voting_period_start")
+
     }
 
     private val identityData: Flow<BlockchainIdentityData> = data
@@ -166,7 +185,12 @@ open class BlockchainIdentityConfig @Inject constructor(
                 registrationStatus = prefs[IDENTITY_REGISTRATION_STATUS]?.let { BlockchainIdentity.RegistrationStatus.valueOf(it) },
                 usernameStatus = prefs[USERNAME_REGISTRATION_STATUS]?.let { BlockchainIdentity.UsernameStatus.valueOf(it) },
                 privacyMode = prefs[PRIVACY_MODE]?.let { CoinJoinMode.valueOf(it) },
-                creditBalance = prefs[BALANCE]?.let { Coin.valueOf(it)}
+                creditBalance = prefs[BALANCE]?.let { Coin.valueOf(it) },
+                requestedUsername = prefs[REQUESTED_USERNAME],
+                verificationLink = prefs[REQUESTED_USERNAME_LINK],
+                cancelledVerificationLink = prefs[CANCELED_REQUESTED_USERNAME_LINK],
+                usernameRequested = prefs[USERNAME_REQUESTED],
+                votingPeriodStart = prefs[VOTING_PERIOD_START]
             )
         }
 
@@ -181,7 +205,12 @@ open class BlockchainIdentityConfig @Inject constructor(
                 restoring = prefs[RESTORING] ?: false,
                 creditFundingTxId = prefs[ASSET_LOCK_TXID]?.let { Sha256Hash.wrap(it) },
                 usingInvite = prefs[USING_INVITE] ?: false,
-                invite = prefs[INVITE_LINK]?.let { InvitationLinkData(Uri.parse(it), false) }
+                invite = prefs[INVITE_LINK]?.let { InvitationLinkData(Uri.parse(it), false) },
+                requestedUsername = prefs[REQUESTED_USERNAME],
+                verificationLink = prefs[REQUESTED_USERNAME_LINK],
+                cancelledVerificationLink = prefs[CANCELED_REQUESTED_USERNAME_LINK],
+                usernameRequested = prefs[USERNAME_REQUESTED],
+                votingPeriodStart = prefs[VOTING_PERIOD_START]
             )
         }
 
@@ -202,11 +231,9 @@ open class BlockchainIdentityConfig @Inject constructor(
         return identityBaseData
     }
 
-    suspend fun saveIdentityPrefs(blockchainIdentityData: BlockchainIdentityData) {
+    private suspend fun saveIdentityPrefs(blockchainIdentityData: BlockchainIdentityData) {
         updateCreationState(1, blockchainIdentityData.creationState, blockchainIdentityData.creationStateErrorMessage)
         context.dataStore.edit { prefs ->
-            //prefs[CREATION_STATE] = blockchainIdentityData.creationState.name
-            //blockchainIdentityData.creationStateErrorMessage?.let { prefs[CREATION_STATE_ERROR_MESSAGE] = it }
             blockchainIdentityData.username?.let { prefs[USERNAME] = it }
             blockchainIdentityData.userId?.let { prefs[IDENTITY_ID] = it }
             prefs[RESTORING] = blockchainIdentityData.restoring
@@ -221,11 +248,9 @@ open class BlockchainIdentityConfig @Inject constructor(
         }
     }
 
-    suspend fun saveIdentityBasePrefs(blockchainIdentityBaseData: BlockchainIdentityBaseData) {
+    private suspend fun saveIdentityBasePrefs(blockchainIdentityBaseData: BlockchainIdentityBaseData) {
         updateCreationState(1, blockchainIdentityBaseData.creationState, blockchainIdentityBaseData.creationStateErrorMessage)
         context.dataStore.edit { prefs ->
-            //prefs[CREATION_STATE] = blockchainIdentityBaseData.creationState.name
-            //blockchainIdentityBaseData.creationStateErrorMessage?.let { prefs[CREATION_STATE_ERROR_MESSAGE] = it }
             blockchainIdentityBaseData.username?.let { prefs[USERNAME] = it }
             blockchainIdentityBaseData.userId?.let { prefs[IDENTITY_ID] = it }
             prefs[RESTORING] = blockchainIdentityBaseData.restoring
diff --git a/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt b/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt
index e59d162526..371688a7b7 100644
--- a/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt
+++ b/wallet/src/de/schildbach/wallet/service/platform/PlatformSyncService.kt
@@ -99,6 +99,8 @@ interface PlatformSyncService {
     fun removeContactsUpdatedListener(listener: OnContactsUpdated?)
     fun fireContactsUpdatedListeners()
 
+    suspend fun triggerPreBlockDownloadComplete()
+
     fun addPreBlockProgressListener(listener: OnPreBlockProgressListener)
     fun removePreBlockProgressListener(listener: OnPreBlockProgressListener)
 
@@ -1017,6 +1019,10 @@ class PlatformSynchronizationService @Inject constructor(
         log.info("publishing updates to tx metadata items complete")
     }
 
+    override suspend fun triggerPreBlockDownloadComplete() {
+        finishPreBlockDownload()
+    }
+
     private suspend fun finishPreBlockDownload() {
         log.info("PreDownloadBlocks: complete")
         if (config.areNotificationsDisabled()) {
@@ -1068,7 +1074,7 @@ class PlatformSynchronizationService @Inject constructor(
             preDownloadBlocks.set(true)
             lastPreBlockStage = PreBlockStage.None
             preDownloadBlocksFuture = future
-            log.info("PreDownloadBlocks: starting")
+            log.info("preBlockDownload: starting")
             if (Constants.DASHPAY_DISABLED) {
                 finishPreBlockDownload()
                 return@launch
@@ -1078,13 +1084,13 @@ class PlatformSynchronizationService @Inject constructor(
             // or if the previous restore is incomplete
             val identityData = blockchainIdentityDataDao.load()
             if (identityData == null || identityData.restoring) {
-                log.info("PreDownloadBlocks: checking for existing associated identity")
+                log.info("preBlockDownload: checking for existing associated identity")
 
                 val identity = platformRepo.getIdentityFromPublicKeyId()
                 platformRepo.onIdentityResolved?.invoke(identity)
 
                 if (identity != null) {
-                    log.info("PreDownloadBlocks: initiate recovery of existing identity ${identity.id}")
+                    log.info("preBlockDownload: initiate recovery of existing identity ${identity.id}")
                     ContextCompat.startForegroundService(
                         walletApplication,
                         CreateIdentityService.createIntentForRestore(
@@ -1094,7 +1100,7 @@ class PlatformSynchronizationService @Inject constructor(
                     )
                     return@launch
                 } else {
-                    log.info("PreDownloadBlocks: no existing identity found")
+                    log.info("preBlockDownload: no existing identity found")
                     // resume Sync process, since there is no Platform data to sync
                     finishPreBlockDownload()
                 }
diff --git a/wallet/src/de/schildbach/wallet/ui/CreateUsernameActivity.kt b/wallet/src/de/schildbach/wallet/ui/CreateUsernameActivity.kt
index 8f8fc5fc2c..9f015014dc 100644
--- a/wallet/src/de/schildbach/wallet/ui/CreateUsernameActivity.kt
+++ b/wallet/src/de/schildbach/wallet/ui/CreateUsernameActivity.kt
@@ -38,7 +38,7 @@ import org.dash.wallet.common.InteractionAwareActivity
 import org.slf4j.LoggerFactory
 
 @AndroidEntryPoint
-class CreateUsernameActivity : InteractionAwareActivity() {
+class CreateUsernameActivity : LockScreenActivity() {
 
     private val dashPayViewModel: DashPayViewModel by viewModels()
 
@@ -126,23 +126,15 @@ class CreateUsernameActivity : InteractionAwareActivity() {
                 fromOnboardng = fromOnboardng
             )
 
-            if (dashPayViewModel.isVotingFlowEnabled()) {
-                if (requestUserNameViewModel.isUserNameRequested()) {
-                    navGraph.setStartDestination(R.id.votingRequestDetailsFragment)
-                } else {
-                    if (!dashPayViewModel.isDashPayInfoShown()) {
-                        navGraph.setStartDestination(R.id.welcomeToDashPayFragment)
-                    } else {
-                        navGraph.setStartDestination(R.id.requestUsernameFragment)
-                    }
-                }
+            if (requestUserNameViewModel.isUserNameRequested()) {
+                navGraph.setStartDestination(R.id.votingRequestDetailsFragment)
             } else {
-                    bundle.putParcelable(
-                        CreateUsernameFragment.CREATE_USER_NAME_ARGS,
-                        dashPayViewModel.createUsernameArgs
-                    )
-                    navGraph.setStartDestination(R.id.createUsernameFragment)
+                if (!dashPayViewModel.isDashPayInfoShown()) {
+                    navGraph.setStartDestination(R.id.welcomeToDashPayFragment)
+                } else {
+                    navGraph.setStartDestination(R.id.requestUsernameFragment)
                 }
+            }
 
 
             navController.graph = navGraph
diff --git a/wallet/src/de/schildbach/wallet/ui/SettingsActivity.kt b/wallet/src/de/schildbach/wallet/ui/SettingsActivity.kt
index ad94fef54e..80fcb64a78 100644
--- a/wallet/src/de/schildbach/wallet/ui/SettingsActivity.kt
+++ b/wallet/src/de/schildbach/wallet/ui/SettingsActivity.kt
@@ -150,14 +150,6 @@ class SettingsActivity : LockScreenActivity() {
             .onEach { binding.localCurrencySymbol.text = it }
             .launchIn(lifecycleScope)
 
-        viewModel.voteDashPayIsEnabled.observe(this) {
-            binding.votingDashPaySwitch.isChecked = it ?: false
-        }
-
-        binding.votingDashPaySwitch.setOnCheckedChangeListener { _, isChecked ->
-            viewModel.setVoteDashPay(isChecked)
-        }
-
         viewModel.coinJoinMixingMode.observe(this) { mode ->
             if (mode == CoinJoinMode.NONE) {
                 binding.coinjoinSubtitle.text = getText(R.string.turned_off)
@@ -190,10 +182,6 @@ class SettingsActivity : LockScreenActivity() {
                 }
             }
         }
-
-        if (Constants.DASHPAY_DISABLED) {
-            binding.votingDashPay.isVisible = false
-        }
     }
 
     private fun setBatteryOptimizationText() {
diff --git a/wallet/src/de/schildbach/wallet/ui/dashpay/CreateIdentityService.kt b/wallet/src/de/schildbach/wallet/ui/dashpay/CreateIdentityService.kt
index 4e4e99cecf..72ea4b75c8 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/CreateIdentityService.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/CreateIdentityService.kt
@@ -29,7 +29,6 @@ import org.bitcoinj.core.RejectMessage
 import org.bitcoinj.core.RejectedTransactionException
 import org.bitcoinj.core.TransactionConfidence
 import org.bitcoinj.evolution.AssetLockTransaction
-import org.bitcoinj.wallet.Wallet
 import org.bitcoinj.wallet.authentication.AuthenticationGroupExtension
 import org.bouncycastle.crypto.params.KeyParameter
 import org.dash.wallet.common.Configuration
@@ -43,6 +42,7 @@ import org.dashj.platform.dpp.errors.concensus.ConcensusException
 import org.dashj.platform.dpp.errors.concensus.basic.identity.IdentityAssetLockTransactionOutPointAlreadyExistsException
 import org.dashj.platform.dpp.errors.concensus.basic.identity.InvalidInstantAssetLockProofSignatureException
 import org.dashj.platform.dpp.identity.Identity
+import org.dashj.platform.sdk.platform.Names
 import org.slf4j.LoggerFactory
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
@@ -264,7 +264,7 @@ class CreateIdentityService : LifecycleService() {
         val timerStep1 = AnalyticsTimer(analytics, log, AnalyticsConstants.Process.PROCESS_USERNAME_CREATE_STEP_1)
 
         val blockchainIdentityDataTmp = platformRepo.loadBlockchainIdentityData()
-
+        val blockchainIdentityDataBase = platformRepo.loadBlockchainIdentityBaseData() // for other info
         when {
             (blockchainIdentityDataTmp != null && blockchainIdentityDataTmp.restoring && blockchainIdentityDataTmp.creationStateErrorMessage == null) -> {
                 // TODO: handle case when blockchain reset has happened and the cftx was not found yet
@@ -282,7 +282,15 @@ class CreateIdentityService : LifecycleService() {
 
             }
             (username != null) -> {
-                blockchainIdentityData = BlockchainIdentityData(CreationState.NONE, null, username, null, false)
+                blockchainIdentityData = BlockchainIdentityData(
+                    CreationState.NONE,
+                    null,
+                    username,
+                    null,
+                    false,
+                    requestedUsername = blockchainIdentityDataBase?.requestedUsername, // move these back to dashpayconfig?
+                    verificationLink = blockchainIdentityDataBase?.verificationLink
+                )
                 platformRepo.updateBlockchainIdentityData(blockchainIdentityData)
             }
             else -> {
@@ -345,7 +353,7 @@ class CreateIdentityService : LifecycleService() {
             // check to see if the funding transaction exists
             if (blockchainIdentity.assetLockTransaction == null) {
                 val useCoinJoin = coinJoinConfig.getMode() != CoinJoinMode.NONE
-                platformRepo.createAssetLockTransactionAsync(blockchainIdentity, encryptionKey, useCoinJoin)
+                platformRepo.createAssetLockTransactionAsync(blockchainIdentity, blockchainIdentityData.username!!, encryptionKey, useCoinJoin)
             }
         }
 
@@ -516,14 +524,14 @@ class CreateIdentityService : LifecycleService() {
                 if (e.status.code == Status.INVALID_ARGUMENT.code) {
                     val exception = GrpcExceptionInfo(e).exception
 
-                        if (exception is IdentityAssetLockTransactionOutPointAlreadyExistsException) {
-                            log.warn("Invite has already been used")
+                    if (exception is IdentityAssetLockTransactionOutPointAlreadyExistsException) {
+                        log.warn("Invite has already been used")
 
-                            // activate link or activity with the link (to show that the invite was used)
-                            // and then, wipe all blockchain identity data and status (NONE)
-                            //
-                            throw IllegalStateException("Invite has already been used", exception)
-                        }
+                        // activate link or activity with the link (to show that the invite was used)
+                        // and then, wipe all blockchain identity data and status (NONE)
+                        //
+                        throw IllegalStateException("Invite has already been used", exception)
+                    }
 
                     log.error(e.toString())
                     throw e
@@ -554,7 +562,7 @@ class CreateIdentityService : LifecycleService() {
 
     private suspend fun finishRegistration(blockchainIdentity: BlockchainIdentity, encryptionKey: KeyParameter) {
         // TODO: let's delay to make sure that the identity is propagated
-        delay(20000)
+        // delay(20000)
 
         // This Step is obsolete, verification is handled by the previous block, lets leave it in for now
         if (blockchainIdentityData.creationState <= CreationState.IDENTITY_REGISTERED) {
@@ -585,7 +593,7 @@ class CreateIdentityService : LifecycleService() {
             //
             platformRepo.updateBlockchainIdentityData(blockchainIdentityData, blockchainIdentity)
         }
-        delay(30000) // 20 sec delay for platform sync
+        // delay(30000) // 20 sec delay for platform sync
         if (blockchainIdentityData.creationState <= CreationState.USERNAME_REGISTERING) {
             platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.USERNAME_REGISTERING)
             //
@@ -611,7 +619,44 @@ class CreateIdentityService : LifecycleService() {
         val emptyProfile = DashPayProfile(blockchainIdentity.uniqueIdString, blockchainIdentity.currentUsername!!)
         platformRepo.updateDashPayProfile(emptyProfile)
 
-        addInviteUserAlert(walletApplication.wallet!!)
+        addInviteUserAlert()
+
+        // check for contested username
+        if (blockchainIdentityData.requestedUsername != null && Names.isUsernameContestable(blockchainIdentityData.requestedUsername!!)) {
+            // get the createdAt date to estimate 2 week voting period
+            // check that this username is contested and up for a vote
+            // save the verification link in a new document
+
+            if (blockchainIdentityData.creationState <= CreationState.REQUESTED_NAME_CHECKING) {
+                platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.REQUESTED_NAME_CHECKING)
+
+                blockchainIdentity.currentVotingPeriodStarts = System.currentTimeMillis()
+                blockchainIdentity.currentUsernameRequested = true
+
+                platformRepo.updateBlockchainIdentityData(blockchainIdentityData, blockchainIdentity)
+            }
+
+
+            if (blockchainIdentityData.creationState <= CreationState.REQUESTED_NAME_CHECKED) {
+                platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.REQUESTED_NAME_CHECKED)
+                platformRepo.updateBlockchainIdentityData(blockchainIdentityData, blockchainIdentity)
+            }
+
+            if (blockchainIdentityData.creationState <= CreationState.REQUESTED_NAME_LINK_SAVING) {
+                platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.REQUESTED_NAME_CHECKING)
+                platformRepo.updateBlockchainIdentityData(blockchainIdentityData, blockchainIdentity)
+
+                // save the verification link
+            }
+
+            if (blockchainIdentityData.creationState <= CreationState.REQUESTED_NAME_LINK_SAVED) {
+                platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.REQUESTED_NAME_CHECKED)
+                platformRepo.updateBlockchainIdentityData(blockchainIdentityData, blockchainIdentity)
+            }
+            platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.VOTING)
+        } else {
+            platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.DONE)
+        }
 
         platformRepo.init()
         platformSyncService.initSync()
@@ -621,15 +666,11 @@ class CreateIdentityService : LifecycleService() {
         log.info("username registration complete")
     }
 
-    private suspend fun addInviteUserAlert(wallet: Wallet) {
-        if (blockchainIdentityData.creationState < CreationState.DONE) {
-            platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.DONE)
-
-            // this alert will be shown or not based on the current balance and will be
-            // managed by NotificationsLiveData
-            val userAlert = UserAlert(INVITATION_NOTIFICATION_TEXT, INVITATION_NOTIFICATION_ICON)
-            userAlertDao.insert(userAlert)
-        }
+    private suspend fun addInviteUserAlert() {
+        // this alert will be shown or not based on the current balance and will be
+        // managed by NotificationsLiveData
+        val userAlert = UserAlert(INVITATION_NOTIFICATION_TEXT, INVITATION_NOTIFICATION_ICON)
+        userAlertDao.insert(userAlert)
     }
 
     private fun handleRestoreIdentityAction(identity: ByteArray) {
@@ -643,102 +684,131 @@ class CreateIdentityService : LifecycleService() {
 
     private suspend fun restoreIdentity(identity: ByteArray) {
         log.info("Restoring identity and username")
-        platformSyncService.updateSyncStatus(PreBlockStage.StartRecovery)
+        try {
+            platformSyncService.updateSyncStatus(PreBlockStage.StartRecovery)
+
+            // use an "empty" state for each
+            blockchainIdentityData = BlockchainIdentityData(CreationState.NONE, null, null, null, true)
+
+            val authExtension =
+                walletApplication.wallet!!.getKeyChainExtension(AuthenticationGroupExtension.EXTENSION_ID) as AuthenticationGroupExtension
+            //authExtension.setWallet(walletApplication.wallet!!) // why is the wallet not set?  we didn't deserialize it probably!
+            val cftxs = authExtension.assetLockTransactions
+
+            val creditFundingTransaction: AssetLockTransaction? =
+                cftxs.find { it.identityId.bytes!!.contentEquals(identity) }
+
+            val existingBlockchainIdentityData = blockchainIdentityDataDao.load()
+            if (existingBlockchainIdentityData != null && !(existingBlockchainIdentityData.restoring /*&& existingBlockchainIdentityData.creationStateErrorMessage != null*/)) {
+                log.info("Attempting restore of existing identity and username; save credit funding txid")
+                val blockchainIdentity = platformRepo.blockchainIdentity
+                blockchainIdentity.assetLockTransaction = creditFundingTransaction
+                existingBlockchainIdentityData.creditFundingTxId = creditFundingTransaction!!.txId
+                platformRepo.updateBlockchainIdentityData(existingBlockchainIdentityData)
+                return
+            }
 
-        // use an "empty" state for each
-        blockchainIdentityData = BlockchainIdentityData(CreationState.NONE, null, null, null, true)
+            val loadingFromAssetLockTransaction = creditFundingTransaction != null
+            val existingIdentity: Identity?
 
-        val authExtension = walletApplication.wallet!!.getKeyChainExtension(AuthenticationGroupExtension.EXTENSION_ID) as AuthenticationGroupExtension
-        //authExtension.setWallet(walletApplication.wallet!!) // why is the wallet not set?  we didn't deserialize it probably!
-        val cftxs = authExtension.assetLockTransactions
+            if (!loadingFromAssetLockTransaction) {
+                existingIdentity = platformRepo.getIdentityFromPublicKeyId()
+                if (existingIdentity == null) {
+                    throw IllegalArgumentException("identity $identity does not match a credit funding transaction or it doesn't exist on the network")
+                }
+            }
 
-        val creditFundingTransaction: AssetLockTransaction? = cftxs.find { it.identityId.bytes!!.contentEquals(identity) }
+            val wallet = walletApplication.wallet!!
+            val encryptionKey = platformRepo.getWalletEncryptionKey()
+                ?: throw IllegalStateException("cannot obtain wallet encryption key")
+            val seed = wallet.keyChainSeed ?: throw IllegalStateException("cannot obtain wallet seed")
 
-        val existingBlockchainIdentityData = blockchainIdentityDataDao.load()
-        if (existingBlockchainIdentityData != null && !(existingBlockchainIdentityData.restoring /*&& existingBlockchainIdentityData.creationStateErrorMessage != null*/)) {
-            log.info("Attempting restore of existing identity and username; save credit funding txid")
-            val blockchainIdentity = platformRepo.blockchainIdentity
-            blockchainIdentity.assetLockTransaction = creditFundingTransaction
-            existingBlockchainIdentityData.creditFundingTxId = creditFundingTransaction!!.txId
-            platformRepo.updateBlockchainIdentityData(existingBlockchainIdentityData)
-            return
-        }
+            // create the Blockchain Identity object
+            val blockchainIdentity = BlockchainIdentity(platformRepo.platform.platform, 0, wallet, authExtension)
+            // this process should have been done already, otherwise the credit funding transaction
+            // will not have the credit burn keys associated with it
+            platformRepo.addWalletAuthenticationKeysAsync(seed, encryptionKey)
+            platformSyncService.updateSyncStatus(PreBlockStage.InitWallet)
 
-        val loadingFromAssetLockTransaction = creditFundingTransaction != null
-        val existingIdentity: Identity?
+            //
+            // Step 2: The credit funding registration exists, no need to create it
+            //
 
-        if (!loadingFromAssetLockTransaction) {
-            existingIdentity = platformRepo.getIdentityFromPublicKeyId()
-            if (existingIdentity == null) {
-                throw IllegalArgumentException("identity $identity does not match a credit funding transaction or it doesn't exist on the network")
+            //
+            // Step 3: Find the identity
+            //
+            platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.IDENTITY_REGISTERING)
+            if (loadingFromAssetLockTransaction) {
+                platformRepo.recoverIdentityAsync(blockchainIdentity, creditFundingTransaction!!)
+            } else {
+                val firstIdentityKey = platformRepo.getBlockchainIdentityKey(0, encryptionKey)!!
+                platformRepo.recoverIdentityAsync(
+                    blockchainIdentity,
+                    firstIdentityKey.pubKeyHash
+                )
             }
-        }
+            platformRepo.updateBlockchainIdentityData(blockchainIdentityData, blockchainIdentity)
+            platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.IDENTITY_REGISTERED)
+            platformSyncService.updateSyncStatus(PreBlockStage.GetIdentity)
 
-        val wallet = walletApplication.wallet!!
-        val encryptionKey = platformRepo.getWalletEncryptionKey() ?: throw IllegalStateException("cannot obtain wallet encryption key")
-        val seed = wallet.keyChainSeed ?: throw IllegalStateException("cannot obtain wallet seed")
-
-        // create the Blockchain Identity object
-        val blockchainIdentity = BlockchainIdentity(platformRepo.platform.platform, 0, wallet, authExtension)
-        // this process should have been done already, otherwise the credit funding transaction
-        // will not have the credit burn keys associated with it
-        platformRepo.addWalletAuthenticationKeysAsync(seed, encryptionKey)
-        platformSyncService.updateSyncStatus(PreBlockStage.InitWallet)
-
-        //
-        // Step 2: The credit funding registration exists, no need to create it
-        //
-
-        //
-        // Step 3: Find the identity
-        //
-        platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.IDENTITY_REGISTERING)
-        if (loadingFromAssetLockTransaction) {
-            platformRepo.recoverIdentityAsync(blockchainIdentity, creditFundingTransaction!!)
-        } else {
-            val firstIdentityKey = platformRepo.getBlockchainIdentityKey(0, encryptionKey)!!
-            platformRepo.recoverIdentityAsync(blockchainIdentity,
-                firstIdentityKey.pubKeyHash)
-        }
-        platformRepo.updateBlockchainIdentityData(blockchainIdentityData, blockchainIdentity)
-        platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.IDENTITY_REGISTERED)
-        platformSyncService.updateSyncStatus(PreBlockStage.GetIdentity)
-
-
-        //
-        // Step 4: We don't need to find the preorder documents
-        //
-
-        //
-        // Step 5: Find the username
-        //
-        platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.USERNAME_REGISTERING)
-        platformRepo.recoverUsernamesAsync(blockchainIdentity)
-        platformRepo.updateBlockchainIdentityData(blockchainIdentityData, blockchainIdentity)
-        platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.USERNAME_REGISTERED)
-        platformSyncService.updateSyncStatus(PreBlockStage.GetName)
-
-        //
-        // Step 6: Find the profile
-        //
-        platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.DASHPAY_PROFILE_CREATING)
-        platformRepo.recoverDashPayProfile(blockchainIdentity)
-        // blockchainIdentity hasn't changed
-        platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.DASHPAY_PROFILE_CREATED)
-        platformSyncService.updateSyncStatus(PreBlockStage.GetProfile)
-
-        addInviteUserAlert(walletApplication.wallet!!)
-
-        // We are finished recovering
-        platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.DONE)
-        blockchainIdentityData.finishRestoration()
-        platformRepo.updateBlockchainIdentityData(blockchainIdentityData)
-        // Complete the entire process
-        platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.DONE_AND_DISMISS)
-
-        platformSyncService.updateSyncStatus(PreBlockStage.RecoveryComplete)
-        platformRepo.init()
-        platformSyncService.initSync()
+
+            //
+            // Step 4: We don't need to find the preorder documents
+            //
+
+            //
+            // Step 5: Find the username
+            //
+            platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.USERNAME_REGISTERING)
+            platformRepo.recoverUsernamesAsync(blockchainIdentity)
+            platformRepo.updateBlockchainIdentityData(blockchainIdentityData, blockchainIdentity)
+            platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.USERNAME_REGISTERED)
+            platformSyncService.updateSyncStatus(PreBlockStage.GetName)
+
+            if (blockchainIdentity.currentUsername == null) {
+                platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.REQUESTED_NAME_CHECKING)
+
+                // check if the network has this name in the queue for voting
+
+                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)
+                platformRepo.updateBlockchainIdentityData(blockchainIdentityData, blockchainIdentity)
+
+            }
+
+            //
+            // Step 6: Find the profile
+            //
+            platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.DASHPAY_PROFILE_CREATING)
+            platformRepo.recoverDashPayProfile(blockchainIdentity)
+            // blockchainIdentity hasn't changed
+            platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.DASHPAY_PROFILE_CREATED)
+            platformSyncService.updateSyncStatus(PreBlockStage.GetProfile)
+
+            addInviteUserAlert()
+
+            // We are finished recovering
+            platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.DONE)
+            blockchainIdentityData.finishRestoration()
+            platformRepo.updateBlockchainIdentityData(blockchainIdentityData)
+            // Complete the entire process
+            platformRepo.updateIdentityCreationState(blockchainIdentityData, CreationState.DONE_AND_DISMISS)
+
+            platformSyncService.updateSyncStatus(PreBlockStage.RecoveryComplete)
+            platformRepo.init()
+            platformSyncService.initSync()
+        } catch (e: Exception) {
+            platformSyncService.triggerPreBlockDownloadComplete()
+            throw e
+        }
     }
 
     /**
diff --git a/wallet/src/de/schildbach/wallet/ui/dashpay/DashPayViewModel.kt b/wallet/src/de/schildbach/wallet/ui/dashpay/DashPayViewModel.kt
index 5541942f33..86d9ec16ec 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/DashPayViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/DashPayViewModel.kt
@@ -99,8 +99,6 @@ open class DashPayViewModel @Inject constructor(
 
     private var timerUsernameSearch: AnalyticsTimer? = null
 
-    suspend fun isVotingFlowEnabled(): Boolean =
-        walletUIConfig.get(WalletUIConfig.VOTE_DASH_PAY_ENABLED) ?: false
     suspend fun isDashPayInfoShown(): Boolean =
         dashPayConfig.get(DashPayConfig.HAS_DASH_PAY_INFO_SCREEN_BEEN_SHOWN) ?: false
 
diff --git a/wallet/src/de/schildbach/wallet/ui/dashpay/HistoryHeaderAdapter.kt b/wallet/src/de/schildbach/wallet/ui/dashpay/HistoryHeaderAdapter.kt
index 43b31b8d88..5efb76eabc 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/HistoryHeaderAdapter.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/HistoryHeaderAdapter.kt
@@ -159,10 +159,25 @@ class HistoryHeaderAdapter(
                     when {
                         blockchainIdentityData.creationStateErrorMessage != null -> R.string.processing_username_unavailable_subtitle
                         blockchainIdentityData.restoring -> R.string.processing_home_step_3_restoring
+                        blockchainIdentityData.requestedUsername != null -> R.string.processing_home_step_3_requesting
                         else -> R.string.processing_home_step_3
                     }
                 )
             }
+            BlockchainIdentityData.CreationState.REQUESTED_NAME_CHECKING,
+            BlockchainIdentityData.CreationState.REQUESTED_NAME_CHECKED,
+            BlockchainIdentityData.CreationState.REQUESTED_NAME_LINK_SAVING,
+            BlockchainIdentityData.CreationState.REQUESTED_NAME_LINK_SAVED -> {
+                binding.identityCreation.progress.progress = 90
+            }
+            BlockchainIdentityData.CreationState.VOTING -> {
+                binding.identityCreation.icon.visibility = View.GONE
+                binding.identityCreation.forwardArrow.visibility = View.VISIBLE
+                binding.identityCreation.progress.visibility = View.GONE
+                binding.identityCreation.title.text = binding.root.context.getString(R.string.processing_done_title,
+                    blockchainIdentityData.username)
+                binding.identityCreation.subtitle.setText(R.string.processing_voting_subtitle)
+            }
             BlockchainIdentityData.CreationState.DONE -> {
                 binding.identityCreation.icon.visibility = View.GONE
                 binding.identityCreation.forwardArrow.visibility = View.VISIBLE
diff --git a/wallet/src/de/schildbach/wallet/ui/dashpay/PlatformRepo.kt b/wallet/src/de/schildbach/wallet/ui/dashpay/PlatformRepo.kt
index 9b6b79858e..5ba4fce12f 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/PlatformRepo.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/PlatformRepo.kt
@@ -212,7 +212,7 @@ class PlatformRepo @Inject constructor(
 
     fun getUsername(username: String): Resource<Document> {
         return try {
-            val nameDocument = platform.names.get(username)
+            val nameDocument = platform.names.get(Names.normalizeString(username))
             Resource.success(nameDocument)
         } catch (e: Exception) {
             Resource.error(e.localizedMessage!!, null)
@@ -506,10 +506,20 @@ class PlatformRepo @Inject constructor(
     //
     // Step 2 is to create the credit funding transaction
     //
-    suspend fun createAssetLockTransactionAsync(blockchainIdentity: BlockchainIdentity, keyParameter: KeyParameter?, useCoinJoin: Boolean) {
+    suspend fun createAssetLockTransactionAsync(
+        blockchainIdentity: BlockchainIdentity,
+        username: String,
+        keyParameter: KeyParameter?,
+        useCoinJoin: Boolean)
+    {
         withContext(Dispatchers.IO) {
             Context.propagate(walletApplication.wallet!!.context)
-            val cftx = blockchainIdentity.createAssetLockTransaction(Constants.DASH_PAY_FEE, keyParameter, useCoinJoin, true)
+            val fee = if (Names.isUsernameContestable(username)) {
+                Constants.DASH_PAY_FEE_CONTESTED
+            } else {
+                Constants.DASH_PAY_FEE
+            }
+            val cftx = blockchainIdentity.createAssetLockTransaction(fee, keyParameter, useCoinJoin, true)
             blockchainIdentity.initializeAssetLockTransaction(cftx)
         }
     }
@@ -537,11 +547,7 @@ class PlatformRepo @Inject constructor(
             assetLockTx.addAssetLockPublicKey(privateKey)
 
             // TODO: when all instantsend locks are deterministic, we don't need the catch block
-            val instantSendLock = try {
-                InstantSendLock(platform.params, Utils.HEX.decode(invite.instantSendLock), InstantSendLock.ISDLOCK_VERSION)
-            } catch (e: Exception) {
-                InstantSendLock(platform.params, Utils.HEX.decode(invite.instantSendLock), InstantSendLock.ISLOCK_VERSION)
-            }
+            val instantSendLock = InstantSendLock(platform.params, Utils.HEX.decode(invite.instantSendLock), InstantSendLock.ISDLOCK_VERSION)
 
             assetLockTx.confidence.setInstantSendLock(instantSendLock)
             blockchainIdentity.initializeAssetLockTransaction(assetLockTx)
@@ -1202,4 +1208,5 @@ class PlatformRepo @Inject constructor(
     suspend fun getIdentityBalance(): CreditBalanceInfo {
         return CreditBalanceInfo(platform.client.getIdentityBalance(blockchainIdentity.uniqueIdentifier))
     }
+
 }
\ 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 7a0aea448e..f13b915a4a 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/utils/DashPayConfig.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/utils/DashPayConfig.kt
@@ -53,9 +53,6 @@ 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 REQUESTED_USERNAME = stringPreferencesKey("requested_username")
-        val REQUESTED_USERNAME_LINK = stringPreferencesKey("requested_username_link")
-        val CANCELED_REQUESTED_USERNAME_LINK = booleanPreferencesKey("cancelled_requested_username_link")
     }
 
     open suspend fun areNotificationsDisabled(): Boolean {
diff --git a/wallet/src/de/schildbach/wallet/ui/invite/CreateInviteViewModel.kt b/wallet/src/de/schildbach/wallet/ui/invite/CreateInviteViewModel.kt
index 97ea8001d8..581a7d15ef 100644
--- a/wallet/src/de/schildbach/wallet/ui/invite/CreateInviteViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/invite/CreateInviteViewModel.kt
@@ -66,7 +66,7 @@ class CreateInviteViewModel @Inject constructor(
     private fun combineLatestData(): Boolean {
         val isSynced = blockchainStateData.value?.isSynced() ?: false
         val noIdentityCreatedOrInProgress = (blockchainIdentity.value == null) || blockchainIdentity.value!!.creationState == BlockchainIdentityData.CreationState.NONE
-        return isSynced && !noIdentityCreatedOrInProgress && canAffordIdentityCreation()
+        return isSynced && !noIdentityCreatedOrInProgress //&& canAffordIdentityCreation()
     }
 
     val invitationsLiveData = invitationsDao.observe().asLiveData()
diff --git a/wallet/src/de/schildbach/wallet/ui/invite/OnboardFromInviteActivity.kt b/wallet/src/de/schildbach/wallet/ui/invite/OnboardFromInviteActivity.kt
index c6242f8d96..5f2d694aeb 100644
--- a/wallet/src/de/schildbach/wallet/ui/invite/OnboardFromInviteActivity.kt
+++ b/wallet/src/de/schildbach/wallet/ui/invite/OnboardFromInviteActivity.kt
@@ -16,7 +16,6 @@
 
 package de.schildbach.wallet.ui.invite
 
-import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.graphics.Typeface
@@ -75,7 +74,7 @@ class OnboardFromInviteActivity : AppCompatActivity() {
                         activate(title1, true)
                         activate(title2, true)
                         activate(title3, false)
-                        step1.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, R.drawable.ic_onboard_from_invite_check, 0)
+                        step1.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, R.drawable.ic_check_circle_green, 0)
                         step2.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, 0, 0)
                         step3.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, 0, 0)
                         icon2.setImageResource(R.drawable.ic_onboard_from_invite_2)
@@ -87,8 +86,8 @@ class OnboardFromInviteActivity : AppCompatActivity() {
                         activate(title1, true)
                         activate(title2, true)
                         activate(title3, true)
-                        step1.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, R.drawable.ic_onboard_from_invite_check, 0)
-                        step2.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, R.drawable.ic_onboard_from_invite_check, 0)
+                        step1.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, R.drawable.ic_check_circle_green, 0)
+                        step2.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, R.drawable.ic_check_circle_green, 0)
                         step3.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, 0, 0)
                         icon2.setImageResource(R.drawable.ic_onboard_from_invite_2)
                         icon3.setImageResource(R.drawable.ic_onboard_from_invite_3)
diff --git a/wallet/src/de/schildbach/wallet/ui/main/MainViewModel.kt b/wallet/src/de/schildbach/wallet/ui/main/MainViewModel.kt
index 6029b76de3..d8add773f1 100644
--- a/wallet/src/de/schildbach/wallet/ui/main/MainViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/main/MainViewModel.kt
@@ -697,7 +697,7 @@ class MainViewModel @Inject constructor(
     }
 
     suspend fun getRequestedUsername(): String =
-        dashPayConfig.get(DashPayConfig.REQUESTED_USERNAME) ?: ""
+        blockchainIdentityDataDao.get(BlockchainIdentityConfig.REQUESTED_USERNAME) ?: ""
     suspend fun getInviteHistory() = invitationsDao.loadAll()
 
     private fun combineLatestData(): Boolean {
@@ -709,7 +709,7 @@ class MainViewModel @Inject constructor(
             val noIdentityCreatedOrInProgress =
                 (blockchainIdentity.value == null) || blockchainIdentity.value!!.creationState == BlockchainIdentityData.CreationState.NONE
             val canAffordIdentityCreation = walletData.canAffordIdentityCreation()
-            return isSynced && isPlatformAvailable && noIdentityCreatedOrInProgress && canAffordIdentityCreation
+            return isSynced && isPlatformAvailable && noIdentityCreatedOrInProgress //&& canAffordIdentityCreation
         }
     }
 
diff --git a/wallet/src/de/schildbach/wallet/ui/more/MoreFragment.kt b/wallet/src/de/schildbach/wallet/ui/more/MoreFragment.kt
index 090633244c..2a60311364 100644
--- a/wallet/src/de/schildbach/wallet/ui/more/MoreFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/more/MoreFragment.kt
@@ -33,6 +33,7 @@ import com.google.android.material.transition.MaterialFadeThrough
 import dagger.hilt.android.AndroidEntryPoint
 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.livedata.Status
 import de.schildbach.wallet.service.PackageInfoProvider
@@ -56,6 +57,7 @@ import org.dash.wallet.common.services.analytics.AnalyticsConstants
 import org.dash.wallet.common.services.analytics.AnalyticsService
 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.slf4j.LoggerFactory
 import javax.inject.Inject
@@ -173,6 +175,30 @@ class MoreFragment : Fragment(R.layout.fragment_more) {
             startActivity(Intent(requireContext(), CreateUsernameActivity::class.java))
         }
 
+        mainActivityViewModel.blockchainIdentityDataDao.observeBase().observe(viewLifecycleOwner) {
+            if (it.creationState == BlockchainIdentityData.CreationState.VOTING) {
+                binding.joinDashpayContainer.visibility = View.GONE
+                binding.requestedUsernameContainer.visibility = View.VISIBLE
+                binding.requestedUsernameTitle.text = mainActivityViewModel.getRequestedUsername()
+            } 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
+//                }
+//            }
+//        }
+
         initViewModel()
 
         if (Constants.DASHPAY_DISABLED) {
@@ -251,9 +277,6 @@ class MoreFragment : Fragment(R.layout.fragment_more) {
             binding.dashpayContainer.isVisible = it
         }
 
-
-
-
         createInviteViewModel.isAbleToPerformInviteAction.observe(viewLifecycleOwner) {
             showInviteSection(it)
         }
@@ -298,16 +321,7 @@ class MoreFragment : Fragment(R.layout.fragment_more) {
         // Developer Mode Feature
         binding.invite.isVisible = showInviteSection
         lifecycleScope.launchWhenResumed {
-            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
-                }
-            }
+
         }
     }
 }
diff --git a/wallet/src/de/schildbach/wallet/ui/more/SettingsViewModel.kt b/wallet/src/de/schildbach/wallet/ui/more/SettingsViewModel.kt
index 4df2bfbd03..161daf223c 100644
--- a/wallet/src/de/schildbach/wallet/ui/more/SettingsViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/more/SettingsViewModel.kt
@@ -49,7 +49,6 @@ class SettingsViewModel @Inject constructor(
 
     val isIgnoringBatteryOptimizations: Boolean
         get() = powerManager.isIgnoringBatteryOptimizations(walletApplication.packageName)
-    val voteDashPayIsEnabled = walletUIConfig.observe(WalletUIConfig.VOTE_DASH_PAY_ENABLED)
     val coinJoinMixingMode: Flow<CoinJoinMode>
         get() = coinJoinConfig.observeMode()
     var mixingProgress: Double = 0.0
@@ -71,12 +70,6 @@ class SettingsViewModel @Inject constructor(
     val mixedBalance: String
         get() = decimalFormat.format((walletDataProvider.wallet as WalletEx).coinJoinBalance.toBigDecimal())
 
-    fun setVoteDashPay(isEnabled: Boolean) {
-        viewModelScope.launch {
-            walletUIConfig.set(WalletUIConfig.VOTE_DASH_PAY_ENABLED, isEnabled)
-        }
-    }
-
     suspend fun shouldShowCoinJoinInfo(): Boolean {
         return coinJoinConfig.get(CoinJoinConfig.FIRST_TIME_INFO_SHOWN) != true
     }
diff --git a/wallet/src/de/schildbach/wallet/ui/username/UsernameRegistrationFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/UsernameRegistrationFragment.kt
new file mode 100644
index 0000000000..90a478e9a7
--- /dev/null
+++ b/wallet/src/de/schildbach/wallet/ui/username/UsernameRegistrationFragment.kt
@@ -0,0 +1,425 @@
+package de.schildbach.wallet.ui.username
+
+import android.graphics.Typeface
+import android.graphics.drawable.AnimationDrawable
+import android.os.Bundle
+import android.os.Handler
+import android.os.Parcelable
+import android.text.Editable
+import android.text.SpannableString
+import android.text.TextWatcher
+import android.text.style.StyleSpan
+import android.view.View
+import android.view.animation.AnimationUtils
+import android.widget.TextView
+import androidx.core.content.res.ResourcesCompat
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.fragment.findNavController
+import dagger.hilt.android.AndroidEntryPoint
+import de.schildbach.wallet.Constants
+import de.schildbach.wallet.WalletApplication
+import de.schildbach.wallet.database.entity.BlockchainIdentityData
+import de.schildbach.wallet.data.InvitationLinkData
+import de.schildbach.wallet.livedata.Status
+import de.schildbach.wallet.service.CoinJoinMode
+import de.schildbach.wallet.ui.SetPinActivity
+import de.schildbach.wallet.ui.dashpay.CreateIdentityService
+import de.schildbach.wallet.ui.dashpay.DashPayViewModel
+import de.schildbach.wallet.ui.dashpay.PlatformPaymentConfirmDialog
+import de.schildbach.wallet.ui.invite.OnboardFromInviteActivity
+import de.schildbach.wallet.ui.username.voting.RequestUserNameViewModel
+import de.schildbach.wallet_test.R
+import de.schildbach.wallet_test.databinding.FragmentCreateUsernameBinding
+import de.schildbach.wallet_test.databinding.FragmentUsernameRegistrationBinding
+import kotlinx.android.parcel.Parcelize
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.dash.wallet.common.InteractionAwareActivity
+import org.dash.wallet.common.services.analytics.AnalyticsConstants
+import org.dash.wallet.common.ui.viewBinding
+import org.dash.wallet.common.util.KeyboardUtil
+import org.dash.wallet.common.util.safeNavigate
+
+
+@AndroidEntryPoint
+@ExperimentalCoroutinesApi
+class UsernameRegistrationFragment : Fragment(R.layout.fragment_username_registration) {
+
+    companion object {
+        const val CREATE_USER_NAME_ARGS = "CreateUsernameArgs"
+    }
+    private val binding by viewBinding(FragmentUsernameRegistrationBinding::bind)
+
+    private val dashPayViewModel: DashPayViewModel by activityViewModels()
+    //private val confirmTransactionSharedViewModel: PlatformPaymentConfirmDialog.SharedViewModel by activityViewModels()
+    private val requestUsernameViewModel: RequestUserNameViewModel by activityViewModels()
+    private lateinit var walletApplication: WalletApplication
+
+    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 regularTypeFace by lazy { ResourcesCompat.getFont(requireContext(), R.font.inter_regular) }
+    //private val mediumTypeFace by lazy { ResourcesCompat.getFont(requireContext(), R.font.inter_medium) }
+    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
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        binding.chooseUsernameTitle.text = getText(R.string.choose_your_username)
+        binding.closeBtn.setOnClickListener {
+            requireActivity().finish()
+        }
+//        binding.username.addTextChangedListener(this)
+//        binding.registerBtn.setOnClickListener {
+//            if (reuseTransaction) {
+//                triggerIdentityCreation(true)
+//            } else {
+//                showConfirmationDialog()
+//            }
+//        }
+        binding.processingIdentityDismissBtn.setOnClickListener { requireActivity().finish() }
+
+        initViewModel()
+        walletApplication = requireActivity().application as WalletApplication
+
+        // TODO: we probably don't need this
+        createUsernameArgs = arguments?.getParcelable(CREATE_USER_NAME_ARGS)
+        // why are the args not passed via the nav graph?
+        // TODO: fix the passing of arguments or just use the dashPayViewModel
+        if (createUsernameArgs == null)
+            createUsernameArgs = dashPayViewModel.createUsernameArgs
+        when (createUsernameArgs?.actions) {
+            CreateUsernameActions.DISPLAY_COMPLETE -> {
+                this.completeUsername = createUsernameArgs?.userName!!
+                showCompleteState()
+                doneAndDismiss()
+            }
+            CreateUsernameActions.REUSE_TRANSACTION -> {
+                reuseTransaction = true
+                //showKeyBoard()
+            }
+            CreateUsernameActions.FROM_INVITE -> {
+                // don't show the keyboard if launched from invite
+                useInvite = true
+            }
+            else -> {
+                // not sure what we need to do here
+            }
+        }
+    }
+
+//    private fun showKeyBoard() {
+//        handler.postDelayed({
+//            KeyboardUtil.showSoftKeyboard(requireContext(), binding.username)
+//        }, 1333)
+//    }
+
+    private fun initViewModel() {
+//        confirmTransactionSharedViewModel.clickConfirmButtonEvent.observe(viewLifecycleOwner) {
+//            dashPayViewModel.logEvent(AnalyticsConstants.CoinJoinPrivacy.USERNAME_PRIVACY_CONFIRMATION_BTN_CONFIRM)
+//            if (createUsernameArgs?.actions == CreateUsernameActions.FROM_INVITE) {
+//                triggerIdentityCreationFromInvite(reuseTransaction)
+//            } else {
+//                triggerIdentityCreation(false)
+//            }
+//        }
+
+//        dashPayViewModel.getUsernameLiveData.observe(viewLifecycleOwner) {
+//            (requireActivity() as? InteractionAwareActivity)?.imitateUserInteraction()
+//            when (it.status) {
+//                Status.LOADING -> {
+//                    // this is delayed by the logic of checkUsernameNotExist(...) method,
+//                    // therefore the UI state is configured before calling it using usernameAvailabilityValidationInProgressState()
+//                }
+//                Status.CANCELED -> {
+//                    // no need to do anything
+//                }
+//                Status.ERROR -> {
+//                    usernameAvailabilityValidationErrorState()
+//                }
+//                Status.SUCCESS -> {
+//                    if (it.data != null) {
+//                        // This user name exists
+//                        usernameAvailabilityValidationTakenState()
+//                    } else {
+//                        usernameAvailabilityValidationAvailableState()
+//                    }
+//                }
+//            }
+//        }
+        dashPayViewModel.blockchainIdentity.observe(viewLifecycleOwner) {
+            when {
+                it?.creationStateErrorMessage != null -> {
+                    requireActivity().finish()
+                }
+
+                it?.creationState == BlockchainIdentityData.CreationState.DONE ||
+                        it?.creationState == BlockchainIdentityData.CreationState.VOTING -> {
+                    completeUsername = it.username ?: ""
+                    showCompleteState()
+                }
+
+                it?.creationState?.ordinal in BlockchainIdentityData.CreationState.UPGRADING_WALLET.ordinal until BlockchainIdentityData.CreationState.DONE.ordinal -> {
+                    showProcessingState()
+                }
+            }
+        }
+    }
+
+//    private fun usernameAvailabilityValidationInProgressState() {
+//        binding.usernameExistsReq.visibility = View.VISIBLE
+//        binding.usernameExistsReqLabel.visibility = View.VISIBLE
+//        binding.usernameExistsReqProgress.visibility = View.VISIBLE
+//        binding.usernameExistsReqImg.visibility = View.INVISIBLE
+//        binding.usernameExistsReqLabel.visibility = View.VISIBLE
+//        binding.usernameExistsReqLabel.typeface = regularTypeFace
+//        binding.usernameExistsReqLabel.setTextColor(ResourcesCompat.getColor(resources, R.color.content_primary, null))
+//        binding.usernameExistsReqLabel.setText(R.string.identity_username_validating)
+//        binding.registerBtn.isEnabled = false
+//    }
+//
+//    private fun usernameAvailabilityValidationErrorState() {
+//        binding.usernameExistsReqProgress.visibility = View.INVISIBLE
+//        binding.usernameExistsReqImg.visibility = View.VISIBLE
+//        binding.usernameExistsReqImg.setImageResource(R.drawable.ic_username_requirement_x)
+//        binding.usernameExistsReqLabel.typeface = mediumTypeFace
+//        binding.usernameExistsReqLabel.setTextColor(ResourcesCompat.getColor(resources, R.color.dash_red, null))
+//        binding.usernameExistsReqLabel.setText(R.string.platform_communication_error)
+//        binding.registerBtn.isEnabled = false
+//    }
+//
+//    private fun usernameAvailabilityValidationTakenState() {
+//        binding.usernameExistsReqProgress.visibility = View.INVISIBLE
+//        binding.usernameExistsReqImg.visibility = View.VISIBLE
+//        binding.usernameExistsReqImg.setImageResource(R.drawable.ic_username_requirement_x)
+//        binding.usernameExistsReqLabel.typeface = mediumTypeFace
+//        binding.usernameExistsReqLabel.setTextColor(ResourcesCompat.getColor(resources, R.color.dash_red, null))
+//        binding.usernameExistsReqLabel.setText(R.string.identity_username_taken)
+//        binding.registerBtn.isEnabled = false
+//    }
+//
+//    private fun usernameAvailabilityValidationAvailableState() {
+//        binding.usernameExistsReqProgress.visibility = View.INVISIBLE
+//        binding.usernameExistsReqImg.visibility = View.VISIBLE
+//        binding.usernameExistsReqImg.setImageResource(R.drawable.ic_username_requirement_checkmark)
+//        binding.usernameExistsReqLabel.typeface = mediumTypeFace
+//        binding.usernameExistsReqLabel.setTextColor(ResourcesCompat.getColor(resources, R.color.content_primary, null))
+//        binding.usernameExistsReqLabel.setText(R.string.identity_username_available)
+//        binding.registerBtn.isEnabled = true
+//    }
+
+//    private fun triggerIdentityCreation(reuseTransaction: Boolean) {
+//        val username = binding.username.text.toString()
+//        if (reuseTransaction) {
+//            requireActivity().startService(CreateIdentityService.createIntentForNewUsername(requireContext(), username))
+//            requireActivity().finish()
+//        } else {
+//            dashPayViewModel.blockchainIdentity.observe(viewLifecycleOwner) {
+//                if (it?.creationStateErrorMessage != null) {
+//                    requireActivity().finish()
+//                } else if (it?.creationState == BlockchainIdentityData.CreationState.DONE) {
+//                    completeUsername = it.username ?: ""
+//                    showCompleteState()
+//                }
+//            }
+//            showProcessingState()
+//            requireActivity().startService(CreateIdentityService.createIntent(requireContext(), username))
+//        }
+//    }
+//
+//    private fun triggerIdentityCreationFromInvite(reuseTransaction: Boolean) {
+//        val username = binding.username.text.toString()
+//        if (reuseTransaction) {
+//            requireActivity().startService(CreateIdentityService.createIntentFromInviteForNewUsername(requireContext(), username))
+//            requireActivity().finish()
+//        } else {
+//            val fromOnboarding = createUsernameArgs?.fromOnboardng ?: false
+//            if (fromOnboarding) {
+//                walletApplication.configuration.onboardingInviteUsername = username
+//                val goNextIntent = SetPinActivity.createIntent(requireActivity().application, R.string.set_pin_create_new_wallet, false, null, onboardingInvite = true)
+//                startActivity(OnboardFromInviteActivity.createIntent(requireContext(), OnboardFromInviteActivity.Mode.STEP_2, goNextIntent))
+//                requireActivity().finish()
+//                return
+//            } else {
+//                dashPayViewModel.blockchainIdentity.observe(viewLifecycleOwner) {
+//                    if (it?.creationStateErrorMessage != null && !reuseTransaction) {
+//                        requireActivity().finish()
+//                    } else if (it?.creationState == BlockchainIdentityData.CreationState.DONE) {
+//                        completeUsername = it.username ?: ""
+//                        showCompleteState()
+//                    }
+//                }
+//                showProcessingState()
+//                createUsernameArgs?.invite?.let {
+//                    requireActivity().startService(CreateIdentityService.createIntentFromInvite(requireContext(), username, it))
+//                }
+//            }
+//        }
+//        showProcessingState()
+//    }
+
+    private fun doneAndDismiss() {
+        dashPayViewModel.usernameDoneAndDismiss()
+    }
+
+    private fun showCompleteState() {
+        //binding.registrationContent.visibility = View.GONE
+        binding.processingIdentity.visibility = View.GONE
+        binding.chooseUsernameTitle.visibility = View.GONE
+        binding.orbitView.findViewById<View>(R.id.placeholder_user_icon).visibility = View.GONE
+        binding.identityComplete.visibility = View.VISIBLE
+        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 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() }
+    }
+
+//    private fun validateUsernameSize(uname: String): Boolean {
+//        val lengthValid = uname.length in Constants.USERNAME_MIN_LENGTH..Constants.USERNAME_MAX_LENGTH
+//
+//        binding.minCharsReqImg.visibility = if (uname.isNotEmpty()) {
+//            binding.minCharsReqLabel.typeface = mediumTypeFace
+//            View.VISIBLE
+//        } else {
+//            binding.minCharsReqLabel.typeface = regularTypeFace
+//            View.INVISIBLE
+//        }
+//
+//        if (lengthValid) {
+//            binding.minCharsReqImg.setImageResource(R.drawable.ic_username_requirement_checkmark)
+//        } else {
+//            binding.minCharsReqImg.setImageResource(R.drawable.ic_username_requirement_x)
+//        }
+//
+//        return lengthValid
+//    }
+
+//    private fun validateUsernameCharacters(uname: String): Boolean {
+//        val alphaNumHyphenValid = !Regex("[^a-zA-Z0-9\\-]").containsMatchIn(uname)
+//        val startOrEndWithHyphen = uname.startsWith("-") || uname.endsWith("-")
+//        val containsHyphen = uname.contains("-")
+//
+//        binding.alphanumReqImg.visibility = if (uname.isNotEmpty() || !alphaNumHyphenValid) {
+//            binding.alphanumReqLabel.typeface = mediumTypeFace
+//            View.VISIBLE
+//        } else {
+//            binding.alphanumReqLabel.typeface = regularTypeFace
+//            View.INVISIBLE
+//        }
+//
+//        if (alphaNumHyphenValid) {
+//            binding.alphanumReqImg.setImageResource(R.drawable.ic_username_requirement_checkmark)
+//        } else {
+//            binding.alphanumReqImg.setImageResource(R.drawable.ic_username_requirement_x)
+//        }
+//
+//        if (containsHyphen) {
+//            binding.hyphenReqImg.visibility = View.VISIBLE
+//            binding.hyphenReqLabel.visibility = View.VISIBLE
+//            if (!startOrEndWithHyphen) {
+//                // leave isValid with the same value that is already has (same as isValid && true)
+//                binding.hyphenReqImg.setImageResource(R.drawable.ic_username_requirement_checkmark)
+//                binding.hyphenReqLabel.typeface = mediumTypeFace
+//            } else {
+//                binding.hyphenReqImg.setImageResource(R.drawable.ic_username_requirement_x)
+//                binding.hyphenReqLabel.typeface = regularTypeFace
+//            }
+//        } else {
+//            binding.hyphenReqImg.visibility = View.GONE
+//            binding.hyphenReqLabel.visibility = View.GONE
+//        }
+//
+//        return alphaNumHyphenValid && !startOrEndWithHyphen
+//    }
+
+//    private fun checkUsernameNotExist(username: String) {
+//        if (this::checkUsernameNotExistRunnable.isInitialized) {
+//            handler.removeCallbacks(checkUsernameNotExistRunnable)
+//        }
+//        checkUsernameNotExistRunnable = Runnable {
+//            dashPayViewModel.searchUsername(username)
+//        }
+//        handler.postDelayed(checkUsernameNotExistRunnable, 600)
+//    }
+//
+//    override fun afterTextChanged(s: Editable?) {
+//        val username = s?.toString()
+//
+//        if (username != null) {
+//            var usernameIsValid = validateUsernameCharacters(username) and validateUsernameSize(username) // force validateUsernameSize to execute
+//
+//            if (usernameIsValid) { // ensure username meets basic rules before making a Platform query
+//                usernameAvailabilityValidationInProgressState()
+//                checkUsernameNotExist(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)
+//                }
+//            }
+//        }
+//        (requireActivity() as? InteractionAwareActivity)?.imitateUserInteraction()
+//    }
+
+    private fun showProcessingState() {
+        if (!isProcessing) {
+            val username = requestUsernameViewModel.requestedUserName!!
+                val text = getString(if (requestUsernameViewModel.isUsernameContestable()) {
+                    R.string.username_being_requested
+                } else {
+                    R.string.username_being_created
+                }, username
+            )
+
+            binding.processingIdentity.visibility = View.VISIBLE
+            binding.chooseUsernameTitle.startAnimation(fadeOutAnimation)
+            binding.processingIdentity.startAnimation(slideInAnimation)
+            (binding.processingIdentityLoadingImage.drawable as AnimationDrawable).start()
+
+            val spannableContent = SpannableString(text)
+            val start = text.indexOf(username)
+            val end = start + username.length
+            spannableContent.setSpan(StyleSpan(Typeface.BOLD), start, end, 0)
+            binding.processingIdentityMessage.text = spannableContent
+            isProcessing = true
+        }
+    }
+
+//    private fun showConfirmationDialog() {
+//        val upgradeFee = if (createUsernameArgs?.actions == CreateUsernameActions.FROM_INVITE) null else Constants.DASH_PAY_FEE
+//        val username = "<b>“${binding. username.text}”</b>"
+//        val dialogMessage = getString(R.string.new_account_confirm_message, username)
+//        val dialogTitle = getString(R.string.dashpay_upgrade_fee)
+//        val dialog = PlatformPaymentConfirmDialog.createDialog(dialogTitle, dialogMessage, upgradeFee, createUsernameArgs?.invite != null)
+//        dialog.show(requireActivity().supportFragmentManager, "NewAccountConfirmDialog")
+//    }
+
+//    override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+//    }
+//
+//    override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+//    }
+}
diff --git a/wallet/src/de/schildbach/wallet/ui/username/voting/ConfirmUserNameDialogViewModel.kt b/wallet/src/de/schildbach/wallet/ui/username/voting/ConfirmUserNameDialogViewModel.kt
index a339640c14..8287240b97 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/voting/ConfirmUserNameDialogViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/voting/ConfirmUserNameDialogViewModel.kt
@@ -53,11 +53,11 @@ class ConfirmUserNameDialogViewModel @Inject constructor(
     private val walletUIConfig: WalletUIConfig
 ) : ViewModel() {
 
+    var isContestableUsername: Boolean = false
     private val _uiState = MutableStateFlow(ConfirmUserNameUIState())
     val uiState: StateFlow<ConfirmUserNameUIState> = _uiState.asStateFlow()
-    private val amount by lazy {
-        Coin.valueOf(Constants.DASH_PAY_FEE.value)
-    }
+    private val amount: Coin
+        get() = if (isContestableUsername) Constants.DASH_PAY_FEE_CONTESTED else Constants.DASH_PAY_FEE
 
     init {
 
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 2574a4c595..403f805143 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/voting/ConfirmUsernameRequestDialogFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/voting/ConfirmUsernameRequestDialogFragment.kt
@@ -21,6 +21,7 @@ import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.navArgs
 import dagger.hilt.android.AndroidEntryPoint
 import de.schildbach.wallet_test.R
 import de.schildbach.wallet_test.databinding.DialogConfirmUsernameRequestBinding
@@ -34,13 +35,19 @@ class ConfirmUsernameRequestDialogFragment: OffsetDialogFragment(R.layout.dialog
 
     private val viewModel by viewModels<ConfirmUserNameDialogViewModel>()
     private val requestUserNameViewModel by activityViewModels<RequestUserNameViewModel>()
+    private val args by navArgs<ConfirmUsernameRequestDialogFragmentArgs>()
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-
+        viewModel.isContestableUsername = requestUserNameViewModel.isUsernameContestable()
         binding.confirmBtn.setOnClickListener {
             requestUserNameViewModel.submit()
             dismiss()
         }
+        binding.confirmBtn.isEnabled = false
+        binding.confirmMessage.text = getString(R.string.new_account_confirm_message, args.username)
+        binding.userAccepts.setOnClickListener {
+            binding.confirmBtn.isEnabled = binding.userAccepts.isChecked
+        }
 
         binding.dismissBtn.setOnClickListener { 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 9991df4f5e..41ec3ceee1 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUserNameViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUserNameViewModel.kt
@@ -19,25 +19,48 @@ package de.schildbach.wallet.ui.username.voting
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
-import de.schildbach.wallet.ui.dashpay.utils.DashPayConfig
+import de.schildbach.wallet.Constants
+import de.schildbach.wallet.WalletApplication
+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.REQUESTED_USERNAME
+import de.schildbach.wallet.database.entity.BlockchainIdentityData
+import de.schildbach.wallet.livedata.Status
+import de.schildbach.wallet.ui.dashpay.CreateIdentityService
+import de.schildbach.wallet.ui.dashpay.PlatformRepo
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import org.bitcoinj.core.Coin
 import org.dash.wallet.common.WalletDataProvider
+import org.dashj.platform.sdk.platform.Names
 import javax.inject.Inject
 
 data class RequestUserNameUIState(
     val usernameVerified: Boolean = false,
-    val usernameSubmittedSuccess: Boolean = false,
-    val usernameSubmittedError: Boolean = false
+    val usernameRequestSubmitting: Boolean = false,
+    val usernameRequestSubmitted: Boolean = false,
+    val usernameCheckSuccess: Boolean = false,
+    val usernameSubmittedError: Boolean = false,
+    val usernameLengthValid: Boolean = false,
+    val usernameCharactersValid: Boolean = false,
+    val usernameTooShort: Boolean = true,  // default zero length username
+    val usernameContestable: Boolean = false,
+    val usernameContested: Boolean = false,
+    val usernameExists: Boolean = false,
+    val usernameBlocked: Boolean = false,
+    val enoughBalance: Boolean = false,
+    val votingPeriodStart: Long = System.currentTimeMillis()
 )
 
 @HiltViewModel
 class RequestUserNameViewModel @Inject constructor(
-    val dashPayConfig: DashPayConfig,
-    val walletData: WalletDataProvider
+    val walletApplication: WalletApplication,
+    val identityConfig: BlockchainIdentityConfig,
+    val walletData: WalletDataProvider,
+    val platformRepo: PlatformRepo
 ) : ViewModel() {
     private val _uiState = MutableStateFlow(RequestUserNameUIState())
     val uiState: StateFlow<RequestUserNameUIState> = _uiState.asStateFlow()
@@ -46,28 +69,49 @@ class RequestUserNameViewModel @Inject constructor(
     val requestedUserNameLink: StateFlow<String?> = _requestedUserNameLink.asStateFlow()
 
     var requestedUserName: String? = null
-    suspend fun isUserNameRequested(): Boolean =
-        dashPayConfig.get(DashPayConfig.REQUESTED_USERNAME).isNullOrEmpty().not()
-    suspend fun isUserHaveCancelledRequest(): Boolean =
-        dashPayConfig.get(DashPayConfig.CANCELED_REQUESTED_USERNAME_LINK) ?: false
 
-    fun canAffordIdentityCreation(): Boolean =
-        walletData.canAffordIdentityCreation()
+    val walletBalance: Coin
+        get() = walletData.getWalletBalance()
+    suspend fun isUserNameRequested(): Boolean {
+        val hasRequestedName = identityConfig.get(REQUESTED_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
+    }
+    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
+
     init {
 
         viewModelScope.launch {
-            _requestedUserNameLink.value =
-                dashPayConfig.get(DashPayConfig.REQUESTED_USERNAME_LINK)
+            _requestedUserNameLink.value = identityConfig.get(BlockchainIdentityConfig.REQUESTED_USERNAME_LINK)
+        }
+    }
+
+    private fun triggerIdentityCreation(reuseTransaction: Boolean) {
+        val username = requestedUserName!!
+        if (reuseTransaction) {
+            walletApplication.startService(CreateIdentityService.createIntentForNewUsername(walletApplication, username))
+        } else {
+            walletApplication.startService(CreateIdentityService.createIntent(walletApplication, username))
         }
     }
 
     fun submit() {
         // Reset ui state for retry if needed
-        // resetUiForRetrySubmit()
-
-        // TODO("Change to submit USERNAME")
+        resetUiForRetrySubmit()
+        viewModelScope.launch {
+            updateConfig()
+            // send the request / create username, assume not retry
+            triggerIdentityCreation(false)
+        }
         // if call success
-        updateUiForApiSuccess()
+        // updateUiForApiSuccess()
         // else if call failed
         // updateUiForApiError()
     }
@@ -75,28 +119,31 @@ class RequestUserNameViewModel @Inject constructor(
     private fun resetUiForRetrySubmit() {
         _uiState.update {
             it.copy(
-                usernameVerified = false,
-                usernameSubmittedSuccess = false,
-                usernameSubmittedError = false
+                usernameSubmittedError = false,
+                usernameRequestSubmitted = false,
+                usernameRequestSubmitting = false
             )
         }
     }
     fun setRequestedUserNameLink(link: String) {
         _requestedUserNameLink.value = link
     }
-    private fun updateUiForApiSuccess() {
-        viewModelScope.launch {
-            requestedUserName?.let { name ->
-                dashPayConfig.set(DashPayConfig.REQUESTED_USERNAME, name)
-            }
-            _requestedUserNameLink.value.let { link ->
-                dashPayConfig.set(DashPayConfig.REQUESTED_USERNAME_LINK, link ?: "")
-            }
+
+    private suspend fun updateConfig() {
+        requestedUserName?.let { name ->
+            identityConfig.set(BlockchainIdentityConfig.REQUESTED_USERNAME, name)
         }
+        _requestedUserNameLink.value.let { link ->
+            identityConfig.set(BlockchainIdentityConfig.REQUESTED_USERNAME_LINK, link ?: "")
+        }
+    }
 
+    private fun updateUiForApiSuccess() {
         _uiState.update {
             it.copy(
-                usernameSubmittedSuccess = true,
+                usernameCheckSuccess = true,
+                usernameRequestSubmitting = false,
+                usernameRequestSubmitted = true,
                 usernameSubmittedError = false
             )
         }
@@ -104,28 +151,93 @@ class RequestUserNameViewModel @Inject constructor(
     private fun updateUiForApiError() {
         _uiState.update { it ->
             it.copy(
-                usernameSubmittedSuccess = false,
+                usernameCheckSuccess = false,
                 usernameSubmittedError = true
             )
         }
     }
 
+    fun checkUsername(requestedUserName: String?) {
+        viewModelScope.launch {
+            requestedUserName?.let { username ->
+                val usernameSearchResult = 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
+                _uiState.update {
+                    it.copy(
+                        usernameCheckSuccess = true,
+                        usernameSubmittedError = false,
+                        usernameContested = usernameContested,
+                        usernameExists = usernameExists,
+                        usernameBlocked = usernameBlocked
+                    )
+                }
+            }
+        }
+    }
+
     fun verify() {
         viewModelScope.launch {
-            dashPayConfig.set(DashPayConfig.REQUESTED_USERNAME_LINK, _requestedUserNameLink.value ?: "")
+            identityConfig.set(BlockchainIdentityConfig.REQUESTED_USERNAME_LINK, _requestedUserNameLink.value ?: "")
             _uiState.update {
                 it.copy(
                     usernameVerified = true
                 )
             }
+            //submit()
         }
     }
 
     fun cancelRequest() {
         viewModelScope.launch {
-            dashPayConfig.set(DashPayConfig.REQUESTED_USERNAME, "")
-            dashPayConfig.set(DashPayConfig.REQUESTED_USERNAME_LINK, "")
-            dashPayConfig.set(DashPayConfig.CANCELED_REQUESTED_USERNAME_LINK, true)
+            identityConfig.set(BlockchainIdentityConfig.REQUESTED_USERNAME, "")
+            identityConfig.set(BlockchainIdentityConfig.REQUESTED_USERNAME_LINK, "")
+            identityConfig.set(BlockchainIdentityConfig.CANCELED_REQUESTED_USERNAME_LINK, true)
+        }
+    }
+
+    private fun validateUsernameSize(uname: String): Boolean {
+        return uname.length in Constants.USERNAME_MIN_LENGTH..Constants.USERNAME_MAX_LENGTH
+    }
+
+    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)
+    }
+
+    fun checkUsernameValid(username: String): Boolean {
+        val validLength = validateUsernameSize(username)
+        val (validCharacters, startOrEndWithHyphen) = validateUsernameCharacters(username)
+        val contestable = Names.isUsernameContestable(username)
+        val enoughBalance = if (contestable) {
+            walletBalance >= Constants.DASH_PAY_FEE_CONTESTED
+        } else {
+            walletBalance >= Constants.DASH_PAY_FEE
         }
+        _uiState.update {
+            it.copy(
+                usernameLengthValid = validLength,
+                usernameCharactersValid = validCharacters && !startOrEndWithHyphen,
+                usernameContestable = contestable,
+                enoughBalance = enoughBalance,
+                usernameTooShort = username.isEmpty(),
+                usernameSubmittedError = false,
+                usernameCheckSuccess = false,
+            )
+        }
+        return validCharacters && validLength
+    }
+
+    fun isUsernameContestable(): Boolean {
+        return Names.isUsernameContestable(requestedUserName!!)
     }
 }
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 ff9b4d98f5..ff04b8298a 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUsernameFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUsernameFragment.kt
@@ -1,6 +1,8 @@
 package de.schildbach.wallet.ui.username.voting
 
 import android.os.Bundle
+import android.os.Handler
+import android.text.format.DateFormat
 import android.view.View
 import androidx.core.view.isVisible
 import androidx.core.widget.doOnTextChanged
@@ -9,17 +11,20 @@ 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.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.dash.wallet.common.InteractionAwareActivity
 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 java.util.Date
+import java.util.concurrent.TimeUnit
 
 @AndroidEntryPoint
 class RequestUsernameFragment : Fragment(R.layout.fragment_request_username) {
@@ -27,6 +32,9 @@ class RequestUsernameFragment : Fragment(R.layout.fragment_request_username) {
 
     private val dashPayViewModel: DashPayViewModel by activityViewModels()
     private val requestUserNameViewModel by activityViewModels<RequestUserNameViewModel>()
+
+    private var handler: Handler = Handler()
+    private lateinit var checkUsernameNotExistRunnable: Runnable
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -37,13 +45,34 @@ class RequestUsernameFragment : Fragment(R.layout.fragment_request_username) {
         binding.usernameInput.doOnTextChanged { text, _, _, _ ->
             val username = text.toString()
             binding.requestUsernameButton.isEnabled = username.isNotEmpty() &&
-                requestUserNameViewModel.canAffordIdentityCreation()
+                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")
-            binding.usernameRequested.isVisible = isUsernameValid
+
+
+            if (username != null) {
+                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)
+                    }
+                }
+            }
+            (requireActivity() as? InteractionAwareActivity)?.imitateUserInteraction()
+
+            // binding.usernameRequested.isVisible = isUsernameValid
         }
 
         binding.inputWrapper.endIconMode = TextInputLayout.END_ICON_CUSTOM
@@ -52,69 +81,156 @@ class RequestUsernameFragment : Fragment(R.layout.fragment_request_username) {
         }
 
         binding.requestUsernameButton.setOnClickListener {
-            AdaptiveDialog.create(
-                R.drawable.ic_verify_identity,
-                getString(R.string.verify_your_identity),
-                getString(
-                    R.string.if_somebody
-                ),
-                getString(
-                    R.string.skip
-                ),
-                getString(
-                    R.string.verify
-                )
-            ).show(requireActivity()) {
-                requestUserNameViewModel.requestedUserName = binding.usernameInput.text.toString()
-                if (it == true) {
-                    safeNavigate(
-                        RequestUsernameFragmentDirections.requestUsernameFragmentToVerifyIdentityFragment(
-                            binding.usernameInput.text.toString()
-                        )
+            if (requestUserNameViewModel.uiState.value.usernameContestable) {
+                AdaptiveDialog.create(
+                    R.drawable.ic_verify_identity,
+                    getString(R.string.verify_your_identity),
+                    getString(
+                        R.string.if_somebody
+                    ),
+                    getString(
+                        R.string.skip
+                    ),
+                    getString(
+                        R.string.verify
                     )
-                } else {
-                    lifecycleScope.launch {
-                        checkViewConfirmDialog()
+                ).show(requireActivity()) {
+                    requestUserNameViewModel.requestedUserName = binding.usernameInput.text.toString()
+                    if (it == true) {
+                        safeNavigate(
+                            RequestUsernameFragmentDirections.requestUsernameFragmentToVerifyIdentityFragment(
+                                binding.usernameInput.text.toString()
+                            )
+                        )
+                    } else {
+                        lifecycleScope.launch {
+                            checkViewConfirmDialog()
+                        }
                     }
                 }
+            } else {
+                lifecycleScope.launch {
+                    requestUserNameViewModel.requestedUserName = binding.usernameInput.text.toString()
+                    checkViewConfirmDialog()
+                }
             }
         }
 
+        binding.usernameVotingInfoBtn.setOnClickListener {
+            safeNavigate(RequestUsernameFragmentDirections.requestsToUsernameVotingInfoFragment(true))
+        }
+
         lifecycleScope.launchWhenCreated {
             delay(250) // Wait for the dialog animation to finish before raising keyboard
             showKeyboard()
         }
 
-        binding.balanceRequirementDisclaimer.text = getString(
-            R.string.request_username_min_balance_disclaimer,
-            Constants.DASH_PAY_FEE.toPlainString()
-        )
-
-        binding.balanceRequirementDisclaimer.isVisible = !requestUserNameViewModel.canAffordIdentityCreation()
+//        binding.balanceRequirementDisclaimer.text = getString(
+//            R.string.request_username_min_balance_disclaimer,
+//            Constants.DASH_PAY_FEE.toPlainString()
+//        )
+//
+//        binding.balanceRequirementDisclaimer.isVisible = !requestUserNameViewModel.canAffordIdentityCreation()
 
         requestUserNameViewModel.uiState.observe(viewLifecycleOwner) {
-            if (it.usernameSubmittedSuccess) {
-                requireActivity().finish()
-            }
+//            if (it.usernameSubmittedSuccess) {
+//                requireActivity().finish()
+//            }
 
             if (it.usernameSubmittedError) {
                 showErrorDialog()
             }
 
-            if (it.usernameVerified) {
-                binding.usernameInput.isFocusable = (false)
-                hideKeyboard()
-                checkViewConfirmDialog()
+            binding.checkLetters.setImageResource(getCheckMarkImage(it.usernameCharactersValid, it.usernameTooShort))
+            binding.checkLength.setImageResource(getCheckMarkImage(it.usernameLengthValid, it.usernameTooShort))
+            if (it.usernameCharactersValid && it.usernameLengthValid && it.usernameCheckSuccess) {
+                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
+                } else {
+                    binding.votingPeriodContainer.isVisible = false
+                }
+
+                binding.usernameAvailableContainer.isVisible = true
+                when {
+                    it.usernameBlocked && it.usernameContestable -> {
+                        binding.usernameAvailableMessage.text = getString(R.string.request_username_unavailable)
+                        binding.checkAvailable.setImageResource(getCheckMarkImage(false))
+                    }
+                    it.usernameExists -> {
+                        binding.usernameAvailableMessage.text = getString(R.string.request_username_taken)
+                        binding.checkAvailable.setImageResource(getCheckMarkImage(false, false))
+                    }
+                    it.usernameContestable -> {
+                        // voting period container will be visible
+                        binding.usernameAvailableContainer.isVisible = false
+                    }
+                    else -> {
+                        binding.usernameAvailableMessage.text = getString(R.string.request_username_available)
+                        binding.checkAvailable.setImageResource(getCheckMarkImage(true))
+                    }
+                }
+                binding.requestUsernameButton.isEnabled = it.enoughBalance
+
+                if (it.usernameRequestSubmitting) {
+                    binding.usernameInput.isFocusable = false
+                    hideKeyboard()
+                }
+
+                if (it.usernameVerified) {
+                    binding.usernameInput.isFocusable = false
+                    hideKeyboard()
+                    checkViewConfirmDialog()
+                }
+
+            } else {
+                binding.votingPeriodContainer.isVisible = false
+                binding.walletBalanceContainer.isVisible = false
+                binding.usernameAvailableContainer.isVisible = false
+                binding.requestUsernameButton.isEnabled = false
             }
         }
+
+        dashPayViewModel.blockchainIdentity.observe(viewLifecycleOwner) {
+            if (it?.creationStateErrorMessage != null) {
+                requireActivity().finish()
+            } else if ((it?.creationState?.ordinal ?: 0) > BlockchainIdentityData.CreationState.NONE.ordinal) {
+                // completeUsername = it.username ?: ""
+                // showCompleteState()
+                // for now, just go to the home screen
+                //requireActivity().finish()
+                safeNavigate(RequestUsernameFragmentDirections.requestsToUsernameRegistrationFragment())
+            }
+        }
+    }
+
+    private fun getCheckMarkImage(check: Boolean, empty: Boolean = false): Int {
+        return when {
+            empty -> R.drawable.ic_check_circle_empty
+            check -> R.drawable.ic_check_circle_green
+            else -> R.drawable.ic_error_circle
+        }
     }
 
     private suspend fun checkViewConfirmDialog() {
-        if (requestUserNameViewModel.isUserHaveCancelledRequest()) {
+        // TODO: Can we cancel the request?
+        if (requestUserNameViewModel.hasUserCancelledVerification()) {
             requestUserNameViewModel.submit()
         } else {
             safeNavigate(
-                RequestUsernameFragmentDirections.requestsToConfirmUsernameRequestDialog()
+                RequestUsernameFragmentDirections.requestsToConfirmUsernameRequestDialog(
+                    requestUserNameViewModel.requestedUserName!!
+                )
             )
         }
     }
@@ -143,4 +259,15 @@ class RequestUsernameFragment : Fragment(R.layout.fragment_request_username) {
             }
         }
     }
+
+    private fun checkUsername(username: String) {
+        if (this::checkUsernameNotExistRunnable.isInitialized) {
+            handler.removeCallbacks(checkUsernameNotExistRunnable)
+        }
+        checkUsernameNotExistRunnable = Runnable {
+            //dashPayViewModel.searchUsername(username)
+            requestUserNameViewModel.checkUsername(username)
+        }
+        handler.postDelayed(checkUsernameNotExistRunnable, 600)
+    }
 }
diff --git a/wallet/src/de/schildbach/wallet/ui/username/voting/UsernameVotingInfoFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/voting/UsernameVotingInfoFragment.kt
index 6a31cfb83f..0a6887c5c0 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/voting/UsernameVotingInfoFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/voting/UsernameVotingInfoFragment.kt
@@ -7,9 +7,11 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
+import androidx.navigation.fragment.navArgs
 import dagger.hilt.android.AndroidEntryPoint
 import de.schildbach.wallet.Constants
 import de.schildbach.wallet.ui.dashpay.DashPayViewModel
+import de.schildbach.wallet.ui.username.CreateUsernameArgs
 import de.schildbach.wallet_test.R
 import de.schildbach.wallet_test.databinding.FragmentUsernameVotingInfoBinding
 import kotlinx.coroutines.launch
@@ -21,6 +23,8 @@ class UsernameVotingInfoFragment : Fragment(R.layout.fragment_username_voting_in
     private val binding by viewBinding(FragmentUsernameVotingInfoBinding::bind)
     private val dashPayViewModel: DashPayViewModel by activityViewModels()
     private val requestUserNameViewModel by activityViewModels<RequestUserNameViewModel>()
+    private val args by navArgs<UsernameVotingInfoFragmentArgs>()
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -29,18 +33,14 @@ class UsernameVotingInfoFragment : Fragment(R.layout.fragment_username_voting_in
         }
 
         binding.usernameVotingInfoContinueBtn.setOnClickListener {
-            safeNavigate(
-                UsernameVotingInfoFragmentDirections.usernameVotingInfoFragmentToRequestUsernameFragment()
-            )
+            if (!args.closeInstead) {
+                safeNavigate(
+                    UsernameVotingInfoFragmentDirections.usernameVotingInfoFragmentToRequestUsernameFragment()
+                )
+            } else {
+                findNavController().popBackStack()
+            }
         }
-
-        binding.balanceRequirementDisclaimer.text = getString(
-            R.string.welcome_request_username_min_balance_disclaimer,
-            Constants.DASH_PAY_FEE.toPlainString()
-        )
-        binding.balanceRequirementDisclaimer.isVisible = !requestUserNameViewModel.canAffordIdentityCreation()
-        binding.usernameVotingInfoContinueBtn.isEnabled = requestUserNameViewModel.canAffordIdentityCreation()
-
         lifecycleScope.launchWhenStarted {
             lifecycleScope.launch {
                 dashPayViewModel.setIsDashPayInfoShown(true)
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 9940eba72a..168b688511 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/voting/VerifyIdentityFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/voting/VerifyIdentityFragment.kt
@@ -1,19 +1,28 @@
 package de.schildbach.wallet.ui.username.voting
 
 import android.os.Bundle
+import android.text.format.DateFormat
 import android.view.View
 import android.widget.Toast
+import androidx.core.view.isVisible
 import androidx.core.widget.doOnTextChanged
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
+import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import dagger.hilt.android.AndroidEntryPoint
+import de.schildbach.wallet.database.entity.BlockchainIdentityData
 import de.schildbach.wallet.ui.dashpay.DashPayViewModel
 import de.schildbach.wallet_test.R
 import de.schildbach.wallet_test.databinding.FragmentVerfiyIdentityBinding
+import kotlinx.coroutines.launch
 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 java.util.Date
+import java.util.concurrent.TimeUnit
 
 
 @AndroidEntryPoint
@@ -56,11 +65,53 @@ class VerifyIdentityFragment : Fragment(R.layout.fragment_verfiy_identity) {
         binding.verifyBtn.setOnClickListener {
             requestUserNameViewModel.setRequestedUserNameLink(binding.linkInput.text.toString())
             requestUserNameViewModel.verify()
-            findNavController().popBackStack()
+            lifecycleScope.launch {
+                checkViewConfirmDialog()
+            }
+            //findNavController().popBackStack()
+        }
+
+        requestUserNameViewModel.uiState.observe(viewLifecycleOwner) {
+//            if (it.usernameSubmittedSuccess) {
+//                requireActivity().finish()
+//            }
+
+//            if (it.usernameSubmittedError) {
+//                showErrorDialog()
+//            }
+//
+//             if (it.usernameCharactersValid && it.usernameLengthValid && it.usernameCheckSuccess) {
+//
+//                if (it.usernameVerified) {
+//                    hideKeyboard()
+//                    checkViewConfirmDialog()
+//                }
+//            }
+        }
+
+        dashPayViewModel.blockchainIdentity.observe(viewLifecycleOwner) {
+            if (it?.creationStateErrorMessage != null) {
+                requireActivity().finish()
+            } else if ((it?.creationState?.ordinal ?: 0) > BlockchainIdentityData.CreationState.NONE.ordinal) {
+                safeNavigate(VerifyIdentityFragmentDirections.verifyToUsernameRegistrationFragment())
+            }
         }
     }
 
     private fun hideKeyboard() {
         KeyboardUtil.hideKeyboard(requireContext(), view = binding.linkInput)
     }
+
+    private suspend fun checkViewConfirmDialog() {
+        // TODO: Can we cancel the request?
+        if (requestUserNameViewModel.hasUserCancelledVerification()) {
+            requestUserNameViewModel.submit()
+        } else {
+            safeNavigate(
+                VerifyIdentityFragmentDirections.verifyIdentityFragmentToConfirmUsernameRequestDialog(
+                    requestUserNameViewModel.requestedUserName!!
+                )
+            )
+        }
+    }
 }
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 af9f0d8632..9568c284c1 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/voting/VotingRequestDetailsFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/voting/VotingRequestDetailsFragment.kt
@@ -25,7 +25,7 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
-import de.schildbach.wallet.ui.dashpay.utils.DashPayConfig
+import de.schildbach.wallet.database.entity.BlockchainIdentityConfig
 import de.schildbach.wallet_test.R
 import de.schildbach.wallet_test.databinding.FragmentVotingRequestDetailsBinding
 import org.dash.wallet.common.ui.dialogs.AdaptiveDialog
@@ -43,7 +43,7 @@ class VotingRequestDetailsFragment : Fragment(R.layout.fragment_voting_request_d
 
         lifecycleScope.launchWhenResumed {
             binding.username.text =
-                requestUserNameViewModel.dashPayConfig.get(DashPayConfig.REQUESTED_USERNAME)
+                requestUserNameViewModel.identityConfig.get(BlockchainIdentityConfig.REQUESTED_USERNAME)
 
             requestUserNameViewModel.requestedUserNameLink.observe(viewLifecycleOwner) {
                 it?.let { link ->
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 ce5224a1a1..0283045bf3 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/voting/WelcomeToDashPayFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/voting/WelcomeToDashPayFragment.kt
@@ -2,8 +2,11 @@ package de.schildbach.wallet.ui.username.voting
 
 import android.os.Bundle
 import android.view.View
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
 import dagger.hilt.android.AndroidEntryPoint
+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
@@ -12,7 +15,7 @@ import org.dash.wallet.common.util.safeNavigate
 @AndroidEntryPoint
 class WelcomeToDashPayFragment : Fragment(R.layout.fragment_welcome_to_dashpay) {
     private val binding by viewBinding(FragmentWelcomeToDashpayBinding::bind)
-
+    private val requestUserNameViewModel by activityViewModels<RequestUserNameViewModel>()
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -21,5 +24,22 @@ class WelcomeToDashPayFragment : Fragment(R.layout.fragment_welcome_to_dashpay)
         binding.welcomeDashpayContinueBtn.setOnClickListener {
             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 {
+
+        }
+        binding.balanceRequirementDisclaimer.isVisible = !requestUserNameViewModel.canAffordContestedUsername()
+        binding.welcomeDashpayContinueBtn.isEnabled = requestUserNameViewModel.canAffordNonContestedUsername()
     }
 }