Merge pull request #11269 from woocommerce/issue/fix-connectivity-too…

…l-issues [Better Errors] Fix troubleshooting banner visibility control
woocommerce · Apr 9, 2024 · 26f1f38 · 26f1f38
2 parents 81cf865 + df7315a
commit 26f1f38
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListFragment.kt
@@ -997,8 +997,12 @@ class OrderListFragment :
                 show = show,
                 title = getString(R.string.orderlist_timeout_error_title),
                 message = getString(R.string.orderlist_timeout_error_message),
-                supportContactClick = { openSupportRequestScreen() },
+                supportContactClick = {
+                    viewModel.changeTroubleshootingBannerVisibility(show = false)
+                    openSupportRequestScreen()
+                },
                 troubleshootingClick = {
+                    viewModel.changeTroubleshootingBannerVisibility(show = false)
                     viewModel.trackConnectivityTroubleshootClicked()
                     openConnectivityTool()
                 }

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/list/OrderListViewModel.kt
@@ -185,7 +185,8 @@ class OrderListViewModel @Inject constructor(
         get() {
             val simplePaymentsAndOrderFeedbackDismissed =
                 simplePaymentsAndOrderCreationFeedbackState == FeatureFeedbackSettings.FeedbackState.DISMISSED
-            return !simplePaymentsAndOrderFeedbackDismissed
+            val isTroubleshootingBannerVisible = viewState.shouldDisplayTroubleshootingBanner
+            return !simplePaymentsAndOrderFeedbackDismissed && !isTroubleshootingBannerVisible
         }
 
     init {
@@ -256,6 +257,13 @@ class OrderListViewModel @Inject constructor(
         activatePagedListWrapper(pagedListWrapper, isFirstInit = true)
     }
 
+    fun changeTroubleshootingBannerVisibility(show: Boolean) {
+        viewState = viewState.copy(
+            shouldDisplayTroubleshootingBanner = show,
+            isSimplePaymentsAndOrderCreationFeedbackVisible = !show
+        )
+    }
+
     /**
      * Removes the `#` from the start of the search keyword, if present.
      *
@@ -449,9 +457,7 @@ class OrderListViewModel @Inject constructor(
                                 triggerEvent(RetryLoadingOrders)
                             }
 
-                            else -> viewState = viewState.copy(
-                                shouldDisplayTroubleshootingBanner = true
-                            )
+                            else -> changeTroubleshootingBannerVisibility(show = true)
                         }
                         noTimeoutHappened = false
                     }