fix: more screen issues

dashpay · Oct 3, 2024 · f823700 · f823700
1 parent 11dca2a
commit f823700
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/wallet/src/de/schildbach/wallet/ui/more/MoreFragment.kt b/wallet/src/de/schildbach/wallet/ui/more/MoreFragment.kt
@@ -202,22 +202,23 @@ class MoreFragment : Fragment(R.layout.fragment_more) {
 
         mainActivityViewModel.blockchainIdentityDataDao.observeBase().observe(viewLifecycleOwner) {
             if (!it.restoring && it.creationState.ordinal > BlockchainIdentityData.CreationState.NONE.ordinal &&
-                it.creationState.ordinal < BlockchainIdentityData.CreationState.VOTING.ordinal //&&
+                it.creationState.ordinal < BlockchainIdentityData.CreationState.VOTING.ordinal
             ) {
                 val username = it.username
 
                 binding.joinDashpayContainer.visibility = View.GONE
                 binding.requestedUsernameContainer.visibility = View.VISIBLE
                 if (it.creationError) {
                     binding.requestedUsernameTitle.text = getString(R.string.requesting_your_username_error_title)
-                    binding.requestedUsernameSubtitle.text = getString(R.string.requesting_your_username_error_message, mainActivityViewModel.getRequestedUsername())
+                    binding.requestedUsernameSubtitle.text = getString(R.string.requesting_your_username_error_message, username)
                     binding.retryRequestButton.isVisible = true
                     binding.retryRequestButton.text = getString(R.string.retry)
                     binding.requestedUsernameIcon.setImageResource(R.drawable.ic_join_dashpay_red)
                 } else {
                     if (it.usernameRequested == UsernameRequestStatus.NONE) {
                         binding.requestedUsernameTitle.text = getString(R.string.requesting_your_username_title)
                         binding.requestedUsernameSubtitle.text = getString(R.string.creating_your_username_message, username)
+                        binding.requestedUsernameSubtitleTwo.isVisible = false
                         binding.retryRequestButton.isVisible = false
                         binding.requestedUsernameArrow.isVisible = false
                         binding.requestedUsernameContainer.isEnabled = false