fix(receive): refresh geoblock state on each receive sheet open

Author: ovitrif

app/src/main/java/to/bitkit/ui/screens/wallets/receive/ReceiveSheet.kt

@@ -14,11 +14,8 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.rememberNavController
-import kotlinx.coroutines.coroutineScope
-import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
 import to.bitkit.repositories.LightningState
-import to.bitkit.ui.blocktankViewModel
 import to.bitkit.ui.screens.wallets.send.AddTagScreen
 import to.bitkit.ui.shared.modifiers.sheetHeight
 import to.bitkit.ui.utils.composableWithDefaultTransitions
@@ -34,8 +31,6 @@ fun ReceiveSheet(
     editInvoiceAmountViewModel: AmountInputViewModel = hiltViewModel(),
 ) {
     val wallet = requireNotNull(walletViewModel)
-    val blocktank = requireNotNull(blocktankViewModel)
-
     val navController = rememberNavController()
     LaunchedEffect(Unit) { editInvoiceAmountViewModel.clearInput() }
 
@@ -45,13 +40,7 @@ fun ReceiveSheet(
     val lightningState: LightningState by wallet.lightningState.collectAsStateWithLifecycle()
 
     LaunchedEffect(Unit) {
-        runCatching {
-            // TODO move to viewModel
-            coroutineScope {
-                launch { wallet.refreshBip21() }
-                launch { blocktank.refreshInfo() }
-            }
-        }
+        wallet.refreshReceiveState()
     }
 
     Column(

app/src/main/java/to/bitkit/viewmodels/BlocktankViewModel.kt

@@ -41,12 +41,6 @@ class BlocktankViewModel @Inject constructor(
         .distinctUntilChanged()
         .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), null)
 
-    fun refreshInfo() {
-        viewModelScope.launch {
-            blocktankRepo.refreshInfo()
-        }
-    }
-
     fun refreshOrders() {
         viewModelScope.launch {
             blocktankRepo.refreshOrders()

app/src/main/java/to/bitkit/viewmodels/WalletViewModel.kt

@@ -26,6 +26,7 @@ import to.bitkit.models.LnPeer
 import to.bitkit.models.NodeLifecycleState
 import to.bitkit.models.Toast
 import to.bitkit.repositories.BackupRepo
+import to.bitkit.repositories.BlocktankRepo
 import to.bitkit.repositories.LightningRepo
 import to.bitkit.repositories.WalletRepo
 import to.bitkit.ui.onboarding.LOADING_MS
@@ -42,6 +43,7 @@ class WalletViewModel @Inject constructor(
     private val lightningRepo: LightningRepo,
     private val settingsStore: SettingsStore,
     private val backupRepo: BackupRepo,
+    private val blocktankRepo: BlocktankRepo,
 ) : ViewModel() {
 
     val lightningState = lightningRepo.lightningState
@@ -240,6 +242,12 @@ class WalletViewModel @Inject constructor(
         }
     }
 
+    fun refreshReceiveState() = viewModelScope.launch(bgDispatcher) {
+        launch { lightningRepo.updateGeoBlockState() }
+        launch { walletRepo.refreshBip21() }
+        launch { blocktankRepo.refreshInfo() }
+    }
+
     fun refreshBip21() {
         viewModelScope.launch {
             walletRepo.refreshBip21()

app/src/test/java/to/bitkit/ui/WalletViewModelTest.kt

@@ -1,34 +1,29 @@
 package to.bitkit.ui
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.test.advanceUntilIdle
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.kotlin.any
 import org.mockito.kotlin.anyOrNull
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.never
 import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
-import org.robolectric.annotation.Config
 import to.bitkit.data.SettingsStore
 import to.bitkit.models.LnPeer
 import to.bitkit.repositories.BackupRepo
+import to.bitkit.repositories.BlocktankRepo
 import to.bitkit.repositories.LightningRepo
 import to.bitkit.repositories.LightningState
 import to.bitkit.repositories.WalletRepo
 import to.bitkit.repositories.WalletState
 import to.bitkit.test.BaseUnitTest
-import to.bitkit.test.TestApp
 import to.bitkit.viewmodels.RestoreState
 import to.bitkit.viewmodels.WalletViewModel
 
-@RunWith(AndroidJUnit4::class)
-@Config(application = TestApp::class)
 class WalletViewModelTest : BaseUnitTest() {
 
     private lateinit var sut: WalletViewModel
@@ -37,6 +32,7 @@ class WalletViewModelTest : BaseUnitTest() {
     private val lightningRepo: LightningRepo = mock()
     private val settingsStore: SettingsStore = mock()
     private val backupRepo: BackupRepo = mock()
+    private val blocktankRepo: BlocktankRepo = mock()
     private val mockLightningState = MutableStateFlow(LightningState())
     private val mockWalletState = MutableStateFlow(WalletState())
 
@@ -51,6 +47,7 @@ class WalletViewModelTest : BaseUnitTest() {
             lightningRepo = lightningRepo,
             settingsStore = settingsStore,
             backupRepo = backupRepo,
+            blocktankRepo = blocktankRepo,
         )
     }
 
@@ -67,6 +64,15 @@ class WalletViewModelTest : BaseUnitTest() {
         verify(walletRepo).syncNodeAndWallet()
     }
 
+    @Test
+    fun `refreshReceiveState should refresh receive state`() = test {
+        sut.refreshReceiveState()
+
+        verify(lightningRepo).updateGeoBlockState()
+        verify(walletRepo).refreshBip21()
+        verify(blocktankRepo).refreshInfo()
+    }
+
     @Test
     fun `onPullToRefresh should sync wallet`() = test {
         sut.onPullToRefresh()