Merge pull request #1665 from novasamatech/fix/swipe-gov-update-refer…

…enda-state Awaite while all voted referenda update their state to voted
novasamatech · Sep 19, 2024 · fccb326 · fccb326
2 parents 4ff73cd + 997dadf
commit fccb326
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 14 deletions.
diff --git a/...on/src/main/java/io/novafoundation/nova/common/utils/multiResult/PartialRetriableMixin.kt b/...on/src/main/java/io/novafoundation/nova/common/utils/multiResult/PartialRetriableMixin.kt
@@ -13,9 +13,9 @@ interface PartialRetriableMixin : Retriable {
 
     interface Presentation : PartialRetriableMixin {
 
-        fun <T> handleMultiResult(
+        suspend fun <T> handleMultiResult(
             multiResult: RetriableMultiResult<T>,
-            onSuccess: (List<T>) -> Unit,
+            onSuccess: suspend (List<T>) -> Unit,
             progressConsumer: ProgressConsumer? = null,
             onRetryCancelled: () -> Unit
         )

diff --git a/...rc/main/java/io/novafoundation/nova/common/utils/multiResult/PartialRetriableMixinImpl.kt b/...rc/main/java/io/novafoundation/nova/common/utils/multiResult/PartialRetriableMixinImpl.kt
@@ -27,9 +27,9 @@ private class PartialRetriableMixinImpl(
     coroutineScope: CoroutineScope
 ) : PartialRetriableMixin.Presentation, CoroutineScope by coroutineScope {
 
-    override fun <T> handleMultiResult(
+    override suspend fun <T> handleMultiResult(
         multiResult: RetriableMultiResult<T>,
-        onSuccess: (List<T>) -> Unit,
+        onSuccess: suspend (List<T>) -> Unit,
         progressConsumer: ProgressConsumer?,
         onRetryCancelled: () -> Unit
     ) {
@@ -44,7 +44,7 @@ private class PartialRetriableMixinImpl(
 
     private fun <T> submissionFailed(
         failure: RetriableMultiResult.RetriableFailure<T>,
-        onSuccess: (List<T>) -> Unit,
+        onSuccess: suspend (List<T>) -> Unit,
         progressConsumer: ProgressConsumer?,
         onRetryCancelled: () -> Unit,
     ) {
@@ -62,7 +62,7 @@ private class PartialRetriableMixinImpl(
 
     private fun <T> retrySubmission(
         failure: RetriableMultiResult.RetriableFailure<T>,
-        onSuccess: (List<T>) -> Unit,
+        onSuccess: suspend (List<T>) -> Unit,
         progressConsumer: ProgressConsumer?,
         onRetryCancelled: () -> Unit
     ) {

diff --git a/common/src/main/java/io/novafoundation/nova/common/utils/multiResult/RetriableMultiResult.kt b/common/src/main/java/io/novafoundation/nova/common/utils/multiResult/RetriableMultiResult.kt
@@ -17,7 +17,7 @@ class RetriableMultiResult<T>(val succeeded: List<T>, val failed: RetriableFailu
 
 fun <T> RetriableMultiResult.Companion.allFailed(failed: RetriableFailure<T>) = RetriableMultiResult(emptyList(), failed)
 
-inline fun <T> RetriableMultiResult<T>.onFullSuccess(action: (successResults: List<T>) -> Unit): RetriableMultiResult<T> {
+suspend inline fun <T> RetriableMultiResult<T>.onFullSuccess(action: suspend (successResults: List<T>) -> Unit): RetriableMultiResult<T> {
     if (failed == null) {
         action(succeeded)
     }

diff --git a/...ava/io/novafoundation/nova/feature_governance_api/domain/tindergov/TinderGovInteractor.kt b/...ava/io/novafoundation/nova/feature_governance_api/domain/tindergov/TinderGovInteractor.kt
@@ -51,4 +51,6 @@ interface TinderGovInteractor {
     suspend fun clearBasket()
 
     suspend fun getBasketItemsToRemove(coroutineScope: CoroutineScope): List<TinderGovBasketItem>
+
+    suspend fun awaitAllItemsVoted(coroutineScope: CoroutineScope, basket: List<TinderGovBasketItem>)
 }
diff --git a/...ation/nova/feature_governance_impl/domain/referendum/tindergov/RealTinderGovInteractor.kt b/...ation/nova/feature_governance_impl/domain/referendum/tindergov/RealTinderGovInteractor.kt
@@ -35,6 +35,7 @@ import io.novafoundation.nova.runtime.state.selectedOption
 import java.math.BigInteger
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
 
@@ -180,6 +181,19 @@ class RealTinderGovInteractor(
         return basket.filter { it.isItemNotAvailableToVote(availableToVoteReferenda, asset) }
     }
 
+    override suspend fun awaitAllItemsVoted(coroutineScope: CoroutineScope, basket: List<TinderGovBasketItem>) {
+        observeReferendaState(coroutineScope)
+            .filter { referendaState ->
+                val referenda = referendaState.referenda.associateBy { it.id }
+                val allBasketItemsVoted = basket.all {
+                    val referendum = referenda[it.referendumId]
+                    referendum?.referendumVote != null
+                }
+
+                allBasketItemsVoted
+            }.first()
+    }
+
     private fun TinderGovBasketItem.isItemNotAvailableToVote(
         availableToVoteReferenda: Set<ReferendumId>,
         asset: Asset

diff --git a/...a/feature_governance_impl/presentation/tindergov/confirm/ConfirmTinderGovVoteViewModel.kt b/...a/feature_governance_impl/presentation/tindergov/confirm/ConfirmTinderGovVoteViewModel.kt
@@ -10,6 +10,7 @@ import io.novafoundation.nova.common.validation.progressConsumer
 import io.novafoundation.nova.feature_account_api.domain.interfaces.SelectedAccountUseCase
 import io.novafoundation.nova.feature_account_api.presenatation.account.wallet.WalletUiUseCase
 import io.novafoundation.nova.feature_account_api.presenatation.actions.ExternalActions
+import io.novafoundation.nova.feature_governance_api.data.model.TinderGovBasketItem
 import io.novafoundation.nova.feature_governance_api.data.model.accountVote
 import io.novafoundation.nova.feature_governance_api.domain.referendum.vote.VoteReferendumInteractor
 import io.novafoundation.nova.feature_governance_api.domain.tindergov.TinderGovInteractor
@@ -149,19 +150,23 @@ class ConfirmTinderGovVoteViewModel(
         partialRetriableMixin.handleMultiResult(
             multiResult = result,
             onSuccess = {
-                onVoteSuccess(accountVotes.size)
+                onVoteSuccess(payload.basket)
             },
             progressConsumer = _showNextProgress.progressConsumer(),
             onRetryCancelled = { router.back() }
         )
     }
 
-    private fun onVoteSuccess(voteSize: Int) {
-        launch {
-            showMessage(resourceManager.getString(R.string.swipe_gov_convirm_votes_success_message, voteSize))
-            tinderGovInteractor.clearBasket()
-            router.backToTinderGovCards()
-        }
+    private suspend fun onVoteSuccess(basket: List<TinderGovBasketItem>) {
+        awaitVotedReferendaStateUpdate(basket)
+
+        showMessage(resourceManager.getString(R.string.swipe_gov_convirm_votes_success_message, basket.size))
+        tinderGovInteractor.clearBasket()
+        router.backToTinderGovCards()
+    }
+
+    private suspend fun awaitVotedReferendaStateUpdate(basket: List<TinderGovBasketItem>) {
+        tinderGovInteractor.awaitAllItemsVoted(coroutineScope, basket)
     }
 
     private suspend fun getValidationPayload(): VoteTinderGovValidationPayload {