Merge pull request #624 from mysteriumnetwork/bugfix/Missing-ID

Missing-ID
mysteriumnetwork · Jun 23, 2022 · ecd81f7 · ecd81f7
2 parents a0a9753 + f07ef56
commit ecd81f7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/android/app/src/main/java/updated/mysterium/vpn/ui/top/up/summary/PaymentSummaryActivity.kt b/android/app/src/main/java/updated/mysterium/vpn/ui/top/up/summary/PaymentSummaryActivity.kt
@@ -89,6 +89,10 @@ class PaymentSummaryActivity : BaseActivity() {
         paymentStatusViewModel.getPayment(price).observe(this) {
             it.onSuccess { order ->
                 topUpPriceCardItem = topUpPriceCardItem?.copy(id = order.id)
+                if (topUpPriceCardItem?.id?.isEmpty() == true) {
+                    showNoAmountPopUp { getPayment(price) }
+                    return@onSuccess
+                }
                 inflateOrderData(order)
             }
             it.onFailure { error ->
@@ -111,6 +115,8 @@ class PaymentSummaryActivity : BaseActivity() {
     }
 
     private fun launchPlayBillingPayment() {
+        if (topUpPriceCardItem?.id?.isEmpty() == true) return
+
         topUpPriceCardItem?.let {
             paymentViewModel.billingDataSource.launchBillingFlow(
                 this@PaymentSummaryActivity,

diff --git a/fastlane/android_version_code b/fastlane/android_version_code
@@ -1 +1 @@
-107147
+107148