From 2ac300152ec82612413fdf0feedb668ee383c64e Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Thu, 22 Aug 2024 16:08:44 -0700
Subject: [PATCH] fix: align with Send Request functionality

---
 .../fragment_voting_request_details.xml       | 199 ++++++++++--------
 wallet/res/values/strings-dashpay.xml         |   3 +-
 .../wallet/database/entity/UsernameRequest.kt |  10 +-
 .../schildbach/wallet/ui/main/MainActivity.kt |  19 +-
 .../wallet/ui/main/MainViewModel.kt           |   2 +-
 .../schildbach/wallet/ui/more/MoreFragment.kt |   8 +
 .../voting/RequestUserNameViewModel.kt        |  42 +++-
 .../username/voting/VerifyIdentityFragment.kt |  25 ++-
 .../voting/VotingRequestDetailsFragment.kt    |  82 +++++---
 9 files changed, 252 insertions(+), 138 deletions(-)

diff --git a/wallet/res/layout/fragment_voting_request_details.xml b/wallet/res/layout/fragment_voting_request_details.xml
index c73f503243..211961868c 100644
--- a/wallet/res/layout/fragment_voting_request_details.xml
+++ b/wallet/res/layout/fragment_voting_request_details.xml
@@ -54,68 +54,68 @@
             android:layout_marginTop="15dp"
             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" />
-
-            <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"
-                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" />
+<!--            <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"-->
+<!--                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>
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/votes_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_thumb_up_fill" />
-
-            <TextView
-                android:id="@+id/votes_number"
-                style="@style/Caption.SemiBold"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="7dp"
-                android:includeFontPadding="false"
-                android:text="@string/votes"
-                android:textAlignment="gravity" />
-
-            <ImageView
-                android:id="@+id/votes_arrow"
-                android:layout_width="wrap_content"
-                android:layout_height="11dp"
-                android:layout_gravity="center"
-                android:src="@drawable/ic_menu_row_arrow"
-                app:srcCompat="@drawable/ic_menu_row_arrow" />
-        </LinearLayout>
+<!--        <LinearLayout-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:layout_marginTop="10dp"-->
+<!--            android:orientation="horizontal">-->
+
+<!--            <ImageView-->
+<!--                android:id="@+id/votes_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_thumb_up_fill" />-->
+
+<!--            <TextView-->
+<!--                android:id="@+id/votes_number"-->
+<!--                style="@style/Caption.SemiBold"-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:layout_marginStart="7dp"-->
+<!--                android:includeFontPadding="false"-->
+<!--                android:text="@string/votes"-->
+<!--                android:textAlignment="gravity" />-->
+
+<!--            <ImageView-->
+<!--                android:id="@+id/votes_arrow"-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="11dp"-->
+<!--                android:layout_gravity="center"-->
+<!--                android:src="@drawable/ic_menu_row_arrow"-->
+<!--                app:srcCompat="@drawable/ic_menu_row_arrow" />-->
+<!--        </LinearLayout>-->
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -150,7 +150,7 @@
                     android:layout_weight="1"
                     android:gravity="end"
                     android:textAlignment="textEnd"
-                    tools:text="John Doe" />
+                    tools:text="JohnDoe" />
             </LinearLayout>
 
             <LinearLayout
@@ -187,7 +187,7 @@
                         android:textAlignment="textEnd" />
 
                     <TextView
-                        android:id="@+id/verfiy_now"
+                        android:id="@+id/verify"
                         style="@style/Overline.Medium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -264,34 +264,61 @@
                     android:layout_weight="1"
                     android:gravity="end"
                     android:textAlignment="textEnd"
-                    tools:text="John Doe" />
+                    tools:text="GWRSAVFMjXx8HpQFaNJMqBV7MBgMK4br5UESsB4S31Ec" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:paddingVertical="15dp">
+
+                <TextView
+                    style="@style/Caption.Medium.Tertiary"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="15dp"
+                    android:text="@string/results" />
+
+                <TextView
+                    android:id="@+id/voting_range"
+                    style="@style/Caption"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:layout_marginTop="2dp"
+                    android:layout_weight="1"
+                    android:gravity="end"
+                    android:textAlignment="textEnd"
+                    tools:text="March 31, 2024" />
 
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
 
-    <Button
-        android:id="@+id/cancel_request_button"
-        style="@style/Button.Primary.Large.LightRed"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="15dp"
-        android:layout_marginBottom="15dp"
-        android:text="@string/cancel_request"
-        app:layout_constraintBottom_toBottomOf="parent" />
-
-    <TextView
-        android:id="@+id/balance_requirement_disclaimer"
-        style="@style/Overline.Secondary"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="12dp"
-        android:gravity="center_horizontal"
-        android:text="@string/if_you_tap_cancel"
-        android:textAlignment="gravity"
-        app:layout_constraintBottom_toTopOf="@id/cancel_request_button"
-        app:layout_constraintEnd_toEndOf="@id/cancel_request_button"
-        app:layout_constraintStart_toStartOf="@id/cancel_request_button"
-        tools:visibility="visible" />
+<!--    <Button-->
+<!--        android:id="@+id/cancel_request_button"-->
+<!--        style="@style/Button.Primary.Large.LightRed"-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:layout_marginHorizontal="15dp"-->
+<!--        android:layout_marginBottom="15dp"-->
+<!--        android:text="@string/cancel_request"-->
+<!--        app:layout_constraintBottom_toBottomOf="parent" />-->
+
+<!--    <TextView-->
+<!--        android:id="@+id/balance_requirement_disclaimer"-->
+<!--        style="@style/Overline.Secondary"-->
+<!--        android:layout_width="0dp"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:layout_marginBottom="12dp"-->
+<!--        android:gravity="center_horizontal"-->
+<!--        android:text="@string/if_you_tap_cancel"-->
+<!--        android:textAlignment="gravity"-->
+<!--        app:layout_constraintBottom_toTopOf="@id/cancel_request_button"-->
+<!--        app:layout_constraintEnd_toEndOf="@id/cancel_request_button"-->
+<!--        app:layout_constraintStart_toStartOf="@id/cancel_request_button"-->
+<!--        tools:visibility="visible" />-->
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/wallet/res/values/strings-dashpay.xml b/wallet/res/values/strings-dashpay.xml
index 04a023e827..8586d1ecb3 100644
--- a/wallet/res/values/strings-dashpay.xml
+++ b/wallet/res/values/strings-dashpay.xml
@@ -279,7 +279,7 @@
     <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 name="votes">Votes: %d</string>
 
     <string-array name="usernames_sort_by_options">
         <item>New to old</item>
@@ -308,6 +308,7 @@
     <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="results">Results</string>
     <string name="link">Link</string>
     <string name="link_not_provided">Not provided</string>
     <string name="cancel_approval">Cancel Approval</string>
diff --git a/wallet/src/de/schildbach/wallet/database/entity/UsernameRequest.kt b/wallet/src/de/schildbach/wallet/database/entity/UsernameRequest.kt
index 5daf2d9d35..e809aff9c8 100644
--- a/wallet/src/de/schildbach/wallet/database/entity/UsernameRequest.kt
+++ b/wallet/src/de/schildbach/wallet/database/entity/UsernameRequest.kt
@@ -27,7 +27,13 @@ data class UsernameRequest(
     val username: String,
     val createdAt: Long,
     val identity: String,
-    val link: String?,
+    var link: String?,
     val votes: Int,
     val isApproved: Boolean
-)
+) {
+    companion object {
+        fun getRequestId(identity: String, username: String): String {
+            return String.format("%s %s", identity, username)
+        }
+    }
+}
diff --git a/wallet/src/de/schildbach/wallet/ui/main/MainActivity.kt b/wallet/src/de/schildbach/wallet/ui/main/MainActivity.kt
index bb10dc9122..00efdcfbc2 100644
--- a/wallet/src/de/schildbach/wallet/ui/main/MainActivity.kt
+++ b/wallet/src/de/schildbach/wallet/ui/main/MainActivity.kt
@@ -33,11 +33,13 @@ import android.view.MenuItem
 import android.view.WindowManager
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
+import androidx.annotation.NavigationRes
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.lifecycleScope
+import androidx.navigation.findNavController
 import com.google.common.collect.ImmutableList
 import dagger.hilt.android.AndroidEntryPoint
 import de.schildbach.wallet.Constants
@@ -91,9 +93,19 @@ class MainActivity : AbstractBindServiceActivity(), ActivityCompat.OnRequestPerm
 
         const val EXTRA_RESET_BLOCKCHAIN = "reset_blockchain"
         private const val EXTRA_INVITE = "extra_invite"
+        private const val EXTRA_NAVIGATION_DESTINATION = "extra_destination"
 
         fun createIntent(context: Context): Intent {
-            return Intent(context, MainActivity::class.java)
+            return Intent(context, MainActivity::class.java).apply {
+                addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP)
+            }
+        }
+
+        fun createIntent(context: Context, @NavigationRes destination: Int): Intent {
+            return Intent(context, MainActivity::class.java).apply {
+                putExtra(EXTRA_NAVIGATION_DESTINATION, destination)
+                addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP)
+            }
         }
 
         fun createIntent(context: Context, invite: InvitationLinkData): Intent {
@@ -385,6 +397,11 @@ class MainActivity : AbstractBindServiceActivity(), ActivityCompat.OnRequestPerm
                 pendingInvite = invite
             }
         }
+        if (intent.hasExtra(EXTRA_NAVIGATION_DESTINATION)) {
+            val destination = intent.extras!!.getInt(EXTRA_NAVIGATION_DESTINATION)
+            val navController = findNavController(R.id.nav_host_fragment)
+            navController.navigate(destination)
+        }
         val action = intent.action
         val extras = intent.extras
         if (NfcAdapter.ACTION_NDEF_DISCOVERED == action) {
diff --git a/wallet/src/de/schildbach/wallet/ui/main/MainViewModel.kt b/wallet/src/de/schildbach/wallet/ui/main/MainViewModel.kt
index d8add773f1..c2fd8de53b 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 =
-        blockchainIdentityDataDao.get(BlockchainIdentityConfig.REQUESTED_USERNAME) ?: ""
+        blockchainIdentityDataDao.get(BlockchainIdentityConfig.USERNAME) ?: ""
     suspend fun getInviteHistory() = invitationsDao.loadAll()
 
     private fun combineLatestData(): Boolean {
diff --git a/wallet/src/de/schildbach/wallet/ui/more/MoreFragment.kt b/wallet/src/de/schildbach/wallet/ui/more/MoreFragment.kt
index 2a60311364..0c1551c8be 100644
--- a/wallet/src/de/schildbach/wallet/ui/more/MoreFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/more/MoreFragment.kt
@@ -20,6 +20,7 @@ package de.schildbach.wallet.ui.more
 import android.content.Intent
 import android.graphics.drawable.AnimationDrawable
 import android.os.Bundle
+import android.text.format.DateFormat
 import android.view.View
 import androidx.core.os.bundleOf
 import androidx.core.view.isVisible
@@ -60,6 +61,7 @@ import org.dash.wallet.common.ui.viewBinding
 import org.dash.wallet.common.util.observe
 import org.dash.wallet.common.util.safeNavigate
 import org.slf4j.LoggerFactory
+import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -180,6 +182,12 @@ class MoreFragment : Fragment(R.layout.fragment_more) {
                 binding.joinDashpayContainer.visibility = View.GONE
                 binding.requestedUsernameContainer.visibility = View.VISIBLE
                 binding.requestedUsernameTitle.text = mainActivityViewModel.getRequestedUsername()
+                val votingPeriod = it.votingPeriodStart?.let { startTime ->
+                    val endTime = startTime + TimeUnit.MILLISECONDS.toDays(14)
+                    val dateFormat = DateFormat.getMediumDateFormat(requireContext())
+                    String.format("%s - %s", dateFormat.format(startTime), dateFormat.format(endTime))
+                } ?: "Voting Period not found"
+                binding.requestedUsernameSubtitleTwo.text = getString(R.string.requested_voting_duration, votingPeriod)
             } else {
                 binding.joinDashpayContainer.visibility = View.VISIBLE
                 binding.requestedUsernameContainer.visibility = View.GONE
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 41ec3ceee1..e01aa9e79b 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUserNameViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/voting/RequestUserNameViewModel.kt
@@ -21,16 +21,25 @@ import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import de.schildbach.wallet.Constants
 import de.schildbach.wallet.WalletApplication
+import de.schildbach.wallet.database.dao.UsernameRequestDao
 import de.schildbach.wallet.database.entity.BlockchainIdentityConfig
 import de.schildbach.wallet.database.entity.BlockchainIdentityConfig.Companion.CREATION_STATE
-import de.schildbach.wallet.database.entity.BlockchainIdentityConfig.Companion.REQUESTED_USERNAME
+import de.schildbach.wallet.database.entity.BlockchainIdentityConfig.Companion.IDENTITY_ID
+import de.schildbach.wallet.database.entity.BlockchainIdentityConfig.Companion.USERNAME
 import de.schildbach.wallet.database.entity.BlockchainIdentityData
+import de.schildbach.wallet.database.entity.UsernameRequest
 import de.schildbach.wallet.livedata.Status
 import de.schildbach.wallet.ui.dashpay.CreateIdentityService
 import de.schildbach.wallet.ui.dashpay.PlatformRepo
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.filterNot
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import org.bitcoinj.core.Coin
@@ -60,7 +69,8 @@ class RequestUserNameViewModel @Inject constructor(
     val walletApplication: WalletApplication,
     val identityConfig: BlockchainIdentityConfig,
     val walletData: WalletDataProvider,
-    val platformRepo: PlatformRepo
+    val platformRepo: PlatformRepo,
+    val usernameRequestDao: UsernameRequestDao
 ) : ViewModel() {
     private val _uiState = MutableStateFlow(RequestUserNameUIState())
     val uiState: StateFlow<RequestUserNameUIState> = _uiState.asStateFlow()
@@ -73,7 +83,7 @@ class RequestUserNameViewModel @Inject constructor(
     val walletBalance: Coin
         get() = walletData.getWalletBalance()
     suspend fun isUserNameRequested(): Boolean {
-        val hasRequestedName = identityConfig.get(REQUESTED_USERNAME).isNullOrEmpty().not()
+        val hasRequestedName = identityConfig.get(USERNAME).isNullOrEmpty().not()
         val creationState = BlockchainIdentityData.CreationState.valueOf(
             identityConfig.get(CREATION_STATE) ?: BlockchainIdentityData.CreationState.NONE.name
         )
@@ -86,11 +96,25 @@ class RequestUserNameViewModel @Inject constructor(
     fun canAffordNonContestedUsername(): Boolean = walletBalance >= Constants.DASH_PAY_FEE
     fun canAffordContestedUsername(): Boolean = walletBalance >= Constants.DASH_PAY_FEE_CONTESTED
 
-    init {
+    val myUsernameRequest: Flow<UsernameRequest?>
+        get() = _myUsernameRequest
+    private val _myUsernameRequest = MutableStateFlow<UsernameRequest?>(null)
 
+    init {
         viewModelScope.launch {
             _requestedUserNameLink.value = identityConfig.get(BlockchainIdentityConfig.REQUESTED_USERNAME_LINK)
         }
+        identityConfig.observe(IDENTITY_ID)
+            .filterNotNull()
+            .onEach {
+                if (requestedUserName == null) {
+                    requestedUserName = identityConfig.get(USERNAME)
+                }
+            }
+            .flatMapLatest { usernameRequestDao.observeRequest(UsernameRequest.getRequestId(it, requestedUserName!!)) }
+            .onEach { _myUsernameRequest.value = it }
+            .launchIn(viewModelScope)
+
     }
 
     private fun triggerIdentityCreation(reuseTransaction: Boolean) {
@@ -131,7 +155,7 @@ class RequestUserNameViewModel @Inject constructor(
 
     private suspend fun updateConfig() {
         requestedUserName?.let { name ->
-            identityConfig.set(BlockchainIdentityConfig.REQUESTED_USERNAME, name)
+            identityConfig.set(BlockchainIdentityConfig.USERNAME, name)
         }
         _requestedUserNameLink.value.let { link ->
             identityConfig.set(BlockchainIdentityConfig.REQUESTED_USERNAME_LINK, link ?: "")
@@ -185,6 +209,12 @@ class RequestUserNameViewModel @Inject constructor(
     fun verify() {
         viewModelScope.launch {
             identityConfig.set(BlockchainIdentityConfig.REQUESTED_USERNAME_LINK, _requestedUserNameLink.value ?: "")
+            val usernameRequest = usernameRequestDao.getRequest(UsernameRequest.getRequestId(
+                identityConfig.get(IDENTITY_ID)!!,
+                requestedUserName!!
+            ))
+            usernameRequest!!.link = _requestedUserNameLink.value
+            usernameRequestDao.update(usernameRequest)
             _uiState.update {
                 it.copy(
                     usernameVerified = true
@@ -196,7 +226,7 @@ class RequestUserNameViewModel @Inject constructor(
 
     fun cancelRequest() {
         viewModelScope.launch {
-            identityConfig.set(BlockchainIdentityConfig.REQUESTED_USERNAME, "")
+            identityConfig.set(BlockchainIdentityConfig.USERNAME, "")
             identityConfig.set(BlockchainIdentityConfig.REQUESTED_USERNAME_LINK, "")
             identityConfig.set(BlockchainIdentityConfig.CANCELED_REQUESTED_USERNAME_LINK, 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 168b688511..3c2aab2170 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/voting/VerifyIdentityFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/voting/VerifyIdentityFragment.kt
@@ -66,7 +66,22 @@ class VerifyIdentityFragment : Fragment(R.layout.fragment_verfiy_identity) {
             requestUserNameViewModel.setRequestedUserNameLink(binding.linkInput.text.toString())
             requestUserNameViewModel.verify()
             lifecycleScope.launch {
-                checkViewConfirmDialog()
+                val creationState = dashPayViewModel.blockchainIdentity.value?.creationState ?: BlockchainIdentityData.CreationState.NONE
+                if (creationState.ordinal < BlockchainIdentityData.CreationState.VOTING.ordinal) {
+                    checkViewConfirmDialog()
+                    dashPayViewModel.blockchainIdentity.observe(viewLifecycleOwner) {
+                        if (it?.creationStateErrorMessage != null) {
+                            requireActivity().finish()
+                        } else {
+                            val creationState = it?.creationState ?: BlockchainIdentityData.CreationState.NONE
+                            if (creationState.ordinal > BlockchainIdentityData.CreationState.NONE.ordinal) {
+                                safeNavigate(VerifyIdentityFragmentDirections.verifyToUsernameRegistrationFragment())
+                            }
+                        }
+                    }
+                } else {
+                    findNavController().popBackStack()
+                }
             }
             //findNavController().popBackStack()
         }
@@ -88,14 +103,6 @@ class VerifyIdentityFragment : Fragment(R.layout.fragment_verfiy_identity) {
 //                }
 //            }
         }
-
-        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() {
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 9568c284c1..4beaf1d18b 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/voting/VotingRequestDetailsFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/voting/VotingRequestDetailsFragment.kt
@@ -19,12 +19,12 @@ package de.schildbach.wallet.ui.username.voting
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
+import android.text.format.DateFormat
 import android.view.View
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.lifecycleScope
-import androidx.navigation.fragment.findNavController
 import de.schildbach.wallet.database.entity.BlockchainIdentityConfig
 import de.schildbach.wallet_test.R
 import de.schildbach.wallet_test.databinding.FragmentVotingRequestDetailsBinding
@@ -32,6 +32,7 @@ import org.dash.wallet.common.ui.dialogs.AdaptiveDialog
 import org.dash.wallet.common.ui.viewBinding
 import org.dash.wallet.common.util.observe
 import org.dash.wallet.common.util.safeNavigate
+import java.util.concurrent.TimeUnit
 
 
 class VotingRequestDetailsFragment : Fragment(R.layout.fragment_voting_request_details) {
@@ -41,18 +42,18 @@ class VotingRequestDetailsFragment : Fragment(R.layout.fragment_voting_request_d
         super.onResume()
         // Developer Mode Feature
 
-        lifecycleScope.launchWhenResumed {
-            binding.username.text =
-                requestUserNameViewModel.identityConfig.get(BlockchainIdentityConfig.REQUESTED_USERNAME)
-
-            requestUserNameViewModel.requestedUserNameLink.observe(viewLifecycleOwner) {
-                it?.let { link ->
-                    binding.link.text = link
-                    binding.linkLayout.isVisible = link.isEmpty().not()
-                    binding.verfiyNowLayout.isVisible = link.isEmpty()
-                }
-            }
-        }
+//        lifecycleScope.launchWhenResumed {
+//            binding.username.text =
+//                requestUserNameViewModel.identityConfig.get(BlockchainIdentityConfig.USERNAME)
+//
+//            requestUserNameViewModel.requestedUserNameLink.observe(viewLifecycleOwner) {
+//                it?.let { link ->
+//                    binding.link.text = link
+//                    binding.linkLayout.isVisible = link.isEmpty().not()
+//                    binding.verfiyNowLayout.isVisible = link.isEmpty()
+//                }
+//            }
+//        }
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -62,17 +63,34 @@ class VotingRequestDetailsFragment : Fragment(R.layout.fragment_voting_request_d
             requireActivity().finish()
         }
         // TODO Mock identity
-        binding.identity.text = "90f95ff7bc2438a748dc8470255b888b2a9ea6837bf518d018dc3d6cddf698"
-        binding.votingRange.text = "1 Mar – 15 Mar"
-        binding.votesNumber.text = getString(R.string.votes, "10")
 
-        binding.verfiyNow.setOnClickListener {
+
+        binding.verify.setOnClickListener {
             safeNavigate(
                 VotingRequestDetailsFragmentDirections
                     .votingRequestDetailsFragmentToVerifyIdentityFragment(username = binding.username.text.toString())
             )
         }
 
+        requestUserNameViewModel.myUsernameRequest.observe(viewLifecycleOwner) { myUsernameRequest ->
+            binding.username.text = myUsernameRequest?.username
+            binding.identity.text = myUsernameRequest?.identity
+            val votingPeriod = myUsernameRequest?.createdAt?.let { startTime ->
+                val endTime = startTime + TimeUnit.MILLISECONDS.toDays(14)
+                val dateFormat = DateFormat.getMediumDateFormat(requireContext())
+                dateFormat.format(endTime)
+            } ?: "Voting Period not found"
+            binding.votingRange.text = votingPeriod
+            if (myUsernameRequest?.link != null) {
+                binding.link.text = myUsernameRequest.link
+                binding.linkLayout.isVisible = true
+                binding.verfiyNowLayout.isVisible = false
+            } else {
+                binding.linkLayout.isVisible = false
+                binding.verfiyNowLayout.isVisible = true
+            }
+        }
+
 
         binding.linkLayout.setOnClickListener {
             requestUserNameViewModel.requestedUserNameLink.value?.let {
@@ -102,20 +120,20 @@ class VotingRequestDetailsFragment : Fragment(R.layout.fragment_voting_request_d
             )
         }
 
-        binding.cancelRequestButton.setOnClickListener {
-            AdaptiveDialog.create(
-                R.drawable.ic_warning,
-                title = getString(R.string.do_you_really_want_to_cancel),
-                message = getString(R.string.if_you_tap_cancel_request),
-                positiveButtonText = getString(R.string.cancel_request),
-                negativeButtonText = getString(android.R.string.cancel)
-            ).show(requireActivity()) {
-                if (it == true) {
-                    requestUserNameViewModel.cancelRequest()
-                    requireActivity().finish()
-                }
-            }
-            findNavController().popBackStack()
-        }
+//        binding.cancelRequestButton.setOnClickListener {
+//            AdaptiveDialog.create(
+//                R.drawable.ic_warning,
+//                title = getString(R.string.do_you_really_want_to_cancel),
+//                message = getString(R.string.if_you_tap_cancel_request),
+//                positiveButtonText = getString(R.string.cancel_request),
+//                negativeButtonText = getString(android.R.string.cancel)
+//            ).show(requireActivity()) {
+//                if (it == true) {
+//                    requestUserNameViewModel.cancelRequest()
+//                    requireActivity().finish()
+//                }
+//            }
+//            findNavController().popBackStack()
+//        }
     }
 }