From 8982189c4780fdbb151437b7740b1b55815eb7c1 Mon Sep 17 00:00:00 2001
From: Samuel Barbosa <sambarbosaa@gmail.com>
Date: Fri, 29 May 2020 15:12:27 -0500
Subject: [PATCH 1/2] Removed step 4 from UI of username registration

---
 wallet/res/values/strings-extra.xml               |  3 +--
 .../ui/dashpay/ProcessingIdentityViewHolder.kt    | 15 ++++++---------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/wallet/res/values/strings-extra.xml b/wallet/res/values/strings-extra.xml
index c0c79914d0..b6232f9109 100644
--- a/wallet/res/values/strings-extra.xml
+++ b/wallet/res/values/strings-extra.xml
@@ -356,8 +356,7 @@
     <string name="processing_home_title">Upgrading to Evolution</string>
     <string name="processing_home_step_1" tools:ignore="TypographyFractions">(1/4) Processing Payment</string>
     <string name="processing_home_step_2">(2/4) Creating ID</string>
-    <string name="processing_home_step_3" tools:ignore="TypographyFractions">(3/4) Registering Username</string>
-    <string name="processing_home_step_4">(4/4) Creating DashPay Profile</string>
+    <string name="processing_home_step_3" tools:ignore="TypographyFractions">(3/3) Registering Username</string>
     <string name="processing_done_title">Hello %s,</string>
     <string name="processing_done_subtitle">Your Evolution account is ready to use</string>
     <string name="processing_error_title">Error Upgrading</string>
diff --git a/wallet/src/de/schildbach/wallet/ui/dashpay/ProcessingIdentityViewHolder.kt b/wallet/src/de/schildbach/wallet/ui/dashpay/ProcessingIdentityViewHolder.kt
index dcb0adcaec..c39154158e 100644
--- a/wallet/src/de/schildbach/wallet/ui/dashpay/ProcessingIdentityViewHolder.kt
+++ b/wallet/src/de/schildbach/wallet/ui/dashpay/ProcessingIdentityViewHolder.kt
@@ -48,29 +48,26 @@ class ProcessingIdentityViewHolder(itemView: View) : RecyclerView.ViewHolder(ite
             CreationState.CREDIT_FUNDING_TX_SENT,
             CreationState.CREDIT_FUNDING_TX_CONFIRMED -> {
                 itemView.progress.visibility = View.VISIBLE
-                itemView.progress.progress = 20
+                itemView.progress.progress = 25
                 itemView.subtitle.setText(R.string.processing_home_step_1)
             }
             CreationState.IDENTITY_REGISTERING,
             CreationState.IDENTITY_REGISTERED -> {
-                itemView.progress.progress = 40
+                itemView.progress.progress = 50
                 itemView.subtitle.setText(R.string.processing_home_step_2)
             }
             CreationState.PREORDER_REGISTERING,
             CreationState.PREORDER_REGISTERED,
             CreationState.USERNAME_REGISTERING,
-            CreationState.USERNAME_REGISTERED -> {
-                itemView.progress.progress = 60
+            CreationState.USERNAME_REGISTERED,
+            CreationState.DASHPAY_PROFILE_CREATING,
+            CreationState.DASHPAY_PROFILE_CREATED -> {
+                itemView.progress.progress = 75
                 itemView.subtitle.setText(
                         if (blockchainIdentityData.creationStateErrorMessage != null) R.string.processing_username_unavailable_subtitle
                         else R.string.processing_home_step_3
                 )
             }
-            CreationState.DASHPAY_PROFILE_CREATING,
-            CreationState.DASHPAY_PROFILE_CREATED -> {
-                itemView.progress.progress = 80
-                itemView.subtitle.setText(R.string.processing_home_step_4)
-            }
             CreationState.DONE -> {
                 itemView.icon.visibility = View.GONE
                 itemView.forward_arrow.visibility = View.VISIBLE

From 46a882968918ec6e369e2cdde461c6711a78dbfe Mon Sep 17 00:00:00 2001
From: Samuel Barbosa <sambarbosaa@gmail.com>
Date: Fri, 29 May 2020 16:16:38 -0500
Subject: [PATCH 2/2] fixing step strings

---
 wallet/res/values/strings-extra.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wallet/res/values/strings-extra.xml b/wallet/res/values/strings-extra.xml
index b6232f9109..08c3438009 100644
--- a/wallet/res/values/strings-extra.xml
+++ b/wallet/res/values/strings-extra.xml
@@ -354,8 +354,8 @@
     <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/4) Processing Payment</string>
-    <string name="processing_home_step_2">(2/4) Creating ID</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_3" tools:ignore="TypographyFractions">(3/3) Registering Username</string>
     <string name="processing_done_title">Hello %s,</string>
     <string name="processing_done_subtitle">Your Evolution account is ready to use</string>