UI fixes (#244)

* Fix token details screen

* Fix migration

* Fix update belances

* Fix incorrect update balances

* Remove redundant

Author: zaiatsartem

app/src/main/java/com/concordium/wallet/data/model/Token.kt

@@ -84,6 +84,7 @@ data class Token(
                 display = null,
             ),
             balance = account.balance,
+            isEarning = account.isBaking() || account.isDelegating(),
             denominator = denominator,
             numerator = numerator
         )

app/src/main/java/com/concordium/wallet/data/room/migrations/MIGRATION_10_11.kt

@@ -14,7 +14,7 @@ val MIGRATION_10_11 = object : Migration(10, 11) {
             WHERE `id` = (
                 SELECT `id` 
                 FROM `account_table`
-                ORDER BY `id` ASC
+                ORDER BY `id` DESC
                 LIMIT 1
             )
         """)

app/src/main/java/com/concordium/wallet/ui/account/accountdetails/AccountDetailsFragment.kt

@@ -45,6 +45,7 @@ import com.concordium.wallet.ui.cis2.TokenDetailsActivity
 import com.concordium.wallet.ui.cis2.TokensViewModel
 import com.concordium.wallet.ui.common.delegates.EarnDelegate
 import com.concordium.wallet.ui.common.delegates.EarnDelegateImpl
+import com.concordium.wallet.ui.multiwallet.WalletsActivity
 import com.concordium.wallet.ui.onboarding.OnboardingFragment
 import com.concordium.wallet.ui.onboarding.OnboardingSharedViewModel
 import com.concordium.wallet.ui.onboarding.OnboardingState
@@ -64,6 +65,7 @@ class AccountDetailsFragment : BaseFragment(), EarnDelegate by EarnDelegateImpl(
     private lateinit var onboardingViewModel: OnboardingSharedViewModel
     private lateinit var onboardingStatusCard: OnboardingFragment
     private lateinit var onboardingBinding: FragmentOnboardingBinding
+
     // parameter for dynamic calculation of tokensFragmentContainer height
     private var isFileWallet: Boolean = false
 
@@ -184,13 +186,13 @@ class AccountDetailsFragment : BaseFragment(), EarnDelegate by EarnDelegateImpl(
             })
         viewModelAccountDetails.totalBalanceLiveData.observe(viewLifecycleOwner) {
             showTotalBalance(it)
-            viewModelTokens.reloadCCDBalance()
+            viewModelTokens.loadTokensBalances()
         }
 
         viewModelAccountDetails.activeAccount.collectWhenStarted(viewLifecycleOwner) { account ->
+            updateViews(account)
             viewModelTokens.tokenData.account = account
             viewModelTokens.loadTokens(account.address)
-            updateViews(account)
             (requireActivity() as BaseActivity).hideAccountSelector(
                 isVisible = true,
                 text = account.getAccountName(),
@@ -200,16 +202,16 @@ class AccountDetailsFragment : BaseFragment(), EarnDelegate by EarnDelegateImpl(
             }
         }
 
-        viewModelAccountDetails.accountUpdatedLiveData.observe(viewLifecycleOwner) {
-            if (it)
+        viewModelAccountDetails.accountUpdatedFlow.collectWhenStarted(viewLifecycleOwner) {
+            if (it) {
                 viewModelTokens.loadTokensBalances()
+            }
         }
 
         viewModelAccountDetails.newFinalizedAccountFlow.collectWhenStarted(viewLifecycleOwner) {
             if (it.isNotEmpty()) {
-                viewModelTokens.loadTokens(viewModelAccountDetails.activeAccount.first().address)
-                viewModelTokens.loadTokensBalances()
                 updateViews(viewModelAccountDetails.activeAccount.first())
+                viewModelTokens.loadTokens(viewModelAccountDetails.activeAccount.first().address)
             }
         }
 
@@ -279,6 +281,9 @@ class AccountDetailsFragment : BaseFragment(), EarnDelegate by EarnDelegateImpl(
         binding.accountRemoveButton.setOnClickListener {
             viewModelAccountDetails.deleteAccountAndFinish()
         }
+        binding.fileWalletMigrationDisclaimerLayout.setOnClickListener {
+            startActivity(Intent(requireActivity(), WalletsActivity::class.java))
+        }
     }
 
     private fun updateViews(account: Account) {
@@ -412,8 +417,8 @@ class AccountDetailsFragment : BaseFragment(), EarnDelegate by EarnDelegateImpl(
     }
 
     private fun updateWhenResumed() {
-        viewModelAccountDetails.populateTransferList()
         viewModelAccountDetails.updateState()
+        viewModelAccountDetails.populateTransferList()
         viewModelAccountDetails.initiateFrequentUpdater()
         viewModelTokens.chooseToken.postValue(null) //prevent auto open TokenDetailsActivity
     }

app/src/main/java/com/concordium/wallet/ui/account/accountdetails/AccountDetailsViewModel.kt

@@ -77,17 +77,12 @@ class AccountDetailsViewModel(application: Application) : AndroidViewModel(appli
     val finishLiveData: LiveData<Event<Boolean>>
         get() = _finishLiveData
 
-    private val _showPadLockLiveData = MutableLiveData<Boolean>()
-    val showPadLockLiveData: LiveData<Boolean>
-        get() = _showPadLockLiveData
-
     private var _totalBalanceLiveData = MutableLiveData<BigInteger>()
     val totalBalanceLiveData: LiveData<BigInteger>
         get() = _totalBalanceLiveData
 
-    private var _accountUpdatedLiveData = MutableLiveData<Boolean>()
-    val accountUpdatedLiveData: LiveData<Boolean>
-        get() = _accountUpdatedLiveData
+    private var _accountUpdatedFlow = MutableStateFlow(false)
+    val accountUpdatedFlow = _accountUpdatedFlow.asStateFlow()
 
     private val _showDialogLiveData = MutableLiveData<Event<DialogToShow>>()
     val showDialogLiveData: LiveData<Event<DialogToShow>>
@@ -166,7 +161,6 @@ class AccountDetailsViewModel(application: Application) : AndroidViewModel(appli
                     _waitingLiveData.value = true
                 }
                 viewModelScope.launch {
-                    updateAccountFromRepository()
                     accountUpdater.updateForAccount(account)
                     val type =
                         if (account.delegation != null) ProxyRepository.UPDATE_DELEGATION else ProxyRepository.REGISTER_BAKER
@@ -193,15 +187,15 @@ class AccountDetailsViewModel(application: Application) : AndroidViewModel(appli
                     if (::account.isInitialized) {
                         _totalBalanceLiveData.value = account.balance
                     }
-                    _accountUpdatedLiveData.value = true
+                    _accountUpdatedFlow.emit(true)
                 }
             }
 
             override fun onNewAccountFinalized(accountName: String) {
                 viewModelScope.launch {
-                    postState(OnboardingState.DONE)
+                    getActiveAccount()
                     updateAccountFromRepository()
-                    updateAccount()
+                    postState(OnboardingState.DONE)
                     restartUpdater(BuildConfig.ACCOUNT_UPDATE_FREQUENCY_SEC)
                     _newFinalizedAccountFlow.value = accountName
                 }
@@ -223,7 +217,6 @@ class AccountDetailsViewModel(application: Application) : AndroidViewModel(appli
     private suspend fun updateAccountFromRepository() {
         if (::account.isInitialized) {
             accountRepository.findById(account.id)?.let { accountCandidate ->
-                _activeAccount.emit(accountCandidate)
                 account = accountCandidate
             }
         }
@@ -316,9 +309,9 @@ class AccountDetailsViewModel(application: Application) : AndroidViewModel(appli
         val allAccounts = accountRepository.getAll()
         if (allAccounts.any { it.transactionStatus == TransactionStatus.FINALIZED }) {
             App.appCore.session.walletStorage.setupPreferences.setHasCompletedOnboarding(true)
+            getActiveAccount()
             postState(OnboardingState.DONE)
             showSingleDialogIfNeeded()
-            getActiveAccount()
         } else {
             postState(state = OnboardingState.FINALIZING_ACCOUNT)
             _waitingLiveData.postValue(false)

app/src/main/java/com/concordium/wallet/ui/cis2/SendTokenReceiptActivity.kt

@@ -77,7 +77,10 @@ class SendTokenReceiptActivity : BaseActivity(
                 showPageAsSendPrompt()
             }
         }
-        binding.statusAmount.text = CurrencyUtil.formatGTU(viewModel.sendTokenData.amount)
+        binding.statusAmount.text = CurrencyUtil.formatGTU(
+            viewModel.sendTokenData.amount,
+            viewModel.sendTokenData.token
+        )
         binding.transactionSymbol.text =
             if (viewModel.sendTokenData.token?.isUnique == true)
                 getString(R.string.cis_token_quantity)

app/src/main/java/com/concordium/wallet/ui/cis2/TokensFragment.kt

@@ -79,18 +79,7 @@ class TokensFragment : Fragment() {
             showLoading(ready.not())
             if (ready) {
                 binding.noItemsLayout.isVisible = viewModel.tokens.isEmpty()
-                tokensAccountDetailsAdapter.setData(
-                    viewModel.tokens.map { token ->
-                        if (token.isCcd) {
-                            token.copy(
-                                isEarning = viewModel.tokenData.account?.isDelegating()!! ||
-                                        viewModel.tokenData.account?.isBaking()!!
-                            )
-                        } else {
-                            token
-                        }
-                    }
-                )
+                tokensAccountDetailsAdapter.setData(viewModel.tokens)
             }
         }
     }

app/src/main/java/com/concordium/wallet/ui/cis2/TokensViewModel.kt

@@ -70,6 +70,7 @@ class TokensViewModel(application: Application) : AndroidViewModel(application)
     val tokenBalances: MutableLiveData<Boolean> by lazy { MutableLiveData<Boolean>() }
     val selectedTokensChanged: MutableLiveData<Boolean> by lazy { MutableLiveData<Boolean>(false) }
 
+    private var loadTokensJob: Job? = null
     private val proxyRepository = ProxyRepository()
     private val contractTokensRepository: ContractTokensRepository by lazy {
         ContractTokensRepository(
@@ -84,8 +85,11 @@ class TokensViewModel(application: Application) : AndroidViewModel(application)
         accountAddress: String,
         isFungible: Boolean? = null,
     ) {
-        waiting.postValue(true)
-        viewModelScope.launch(Dispatchers.IO) {
+        loadTokensJob?.cancel()
+        loadTokensJob = null
+
+        loadTokensJob = viewModelScope.launch(Dispatchers.IO) {
+            waiting.postValue(true)
             val ccdToken = getCCDDefaultToken(accountAddress)
             val contractTokens = contractTokensRepository.getTokens(
                 accountAddress = accountAddress,
@@ -102,30 +106,11 @@ class TokensViewModel(application: Application) : AndroidViewModel(application)
                     )
                 })
             }
+            loadTokensBalances()
             waiting.postValue(false)
         }
     }
 
-    fun reloadCCDBalance() {
-        viewModelScope.launch(Dispatchers.IO) {
-            tokenData.account?.address?.let {
-                val ccdToken = getCCDDefaultToken(it)
-                withContext(Dispatchers.Main) {
-                    val updatedTokens = tokens.map { token ->
-                        if (token.isCcd) {
-                            token.copy(balance = ccdToken.balance)
-                        } else {
-                            token
-                        }
-                    }
-                    tokens.clear()
-                    tokens.addAll(updatedTokens)
-                    tokenBalances.postValue(true)
-                }
-            }
-        }
-    }
-
     fun lookForTokens(
         accountAddress: String,
         from: String? = null,
@@ -509,6 +494,12 @@ class TokensViewModel(application: Application) : AndroidViewModel(application)
         viewModelScope.launch(Dispatchers.IO) {
             tokenBalances.postValue(false)
             try {
+                val ccdToken = getCCDDefaultToken(tokenData.account!!.address)
+                tokens.find { it.isCcd }?.apply {
+                    balance = ccdToken.balance
+                    isEarning = ccdToken.isEarning
+                }
+
                 loadTokensBalances(
                     tokensToUpdate = tokens,
                     accountAddress = tokenData.account!!.address,

app/src/main/res/layout/wallet_info_card.xml

@@ -55,7 +55,6 @@
             android:id="@+id/at_disposal_label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
             android:text="@string/accounts_overview_total_details_disposal"
             android:visibility="gone"
             android:textAppearance="@style/MW24_Typography_Main_Capture_Small"

app/src/main/res/values/strings.xml

@@ -394,7 +394,7 @@
     <string name="accounts_overview_total_details_disposal">At disposal:</string>
     <string name="accounts_overview_total_details_disposal_amount">at disposal</string>
     <string name="accounts_overview_total_details_staked">Staked:</string>
-    <string name="accounts_overview_total_details_delegating">Delegating:</string>
+    <string name="accounts_overview_total_details_delegating">Earning:</string>
     <string name="accounts_overview_total_details_cooldown">Cooldown:</string>
     <string name="accounts_overview_balance_placeholder">0.00 CCD</string>
     <string name="accounts_overview_balance_suffix">CCD</string>