Merge pull request #501 from gini/fix(health-sdk)-Fixes-for-IPC-304

Fix(health sdk) fixes for ipc 304
gini · Jul 23, 2024 · 35ff8cb · 35ff8cb
2 parents 58f3fdc + 54cfb77
commit 35ff8cb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/review/ReviewFragment.kt b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/review/ReviewFragment.kt
@@ -614,8 +614,15 @@ class ReviewFragment private constructor(
                     viewModel.onPayment()
                 }
             }
-            ReviewViewModel.PaymentNextStep.ShowOpenWithSheet -> viewModel.paymentProviderApp.value?.let { showOpenWithDialog(it) }
-            ReviewViewModel.PaymentNextStep.ShowInstallApp -> viewModel.paymentProviderApp.value?.let { showInstallAppDialog(it) }
+            ReviewViewModel.PaymentNextStep.ShowOpenWithSheet -> {
+                if (viewModel.validatePaymentDetails()) {
+                    viewModel.paymentProviderApp.value?.let { showOpenWithDialog(it) }
+                }
+            }
+            ReviewViewModel.PaymentNextStep.ShowInstallApp ->
+                if (viewModel.validatePaymentDetails()) {
+                    viewModel.paymentProviderApp.value?.let { showInstallAppDialog(it) }
+                }
             is ReviewViewModel.PaymentNextStep.OpenSharePdf -> {
                 binding.loading.isVisible = false
                 startSharePdfIntent(paymentNextStep.file)

diff --git a/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/review/ReviewViewModel.kt b/health-sdk/sdk/src/main/java/net/gini/android/health/sdk/review/ReviewViewModel.kt
@@ -176,6 +176,8 @@ internal class ReviewViewModel(
         _paymentDetails.value = paymentDetails.value.copy(purpose = purpose)
     }
 
+    fun validatePaymentDetails(): Boolean = validatePaymentDetails(paymentDetails.value)
+
     private fun validatePaymentDetails(paymentDetails: PaymentDetails): Boolean {
         val items = paymentDetails.validate()
         _paymentValidation.tryEmit(items)

diff --git a/health-sdk/sdk/src/test/java/net/gini/android/health/sdk/review/ReviewFragmentTest.kt b/health-sdk/sdk/src/test/java/net/gini/android/health/sdk/review/ReviewFragmentTest.kt
@@ -25,7 +25,6 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.test.advanceTimeBy
 import kotlinx.coroutines.test.runTest
 import net.gini.android.health.api.models.PaymentProvider
 import net.gini.android.health.sdk.GiniHealth
@@ -212,6 +211,7 @@ class ReviewFragmentTest {
         every { viewModel.isPaymentButtonEnabled } returns flowOf(true)
         every { viewModel.paymentProviderApp } returns MutableStateFlow(paymentProviderApp)
         every { viewModel.paymentNextStep } returns paymentNextStepSharedFlow
+        every { viewModel.validatePaymentDetails() } returns true
 
         val listener = mockk<ReviewFragmentListener>(relaxed = true)
 
@@ -256,6 +256,7 @@ class ReviewFragmentTest {
         every { viewModel.paymentProviderApp } returns MutableStateFlow(paymentProviderApp)
         every { viewModel.isPaymentButtonEnabled } returns flowOf(true)
         every { viewModel.paymentNextStep } returns paymentNextStepSharedFlow
+        every { viewModel.validatePaymentDetails() } returns true
 
         launchFragmentInContainer(themeResId = R.style.GiniHealthTheme) {
             ReviewFragment.newInstance(