Check if shop is null before refreshing shop inventory

HabitRPG · Sep 25, 2023 · f34514e · f34514e
1 parent e1fcc7e
commit f34514e
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/.../src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt b/.../src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt
@@ -293,7 +293,9 @@ open class ShopFragment : BaseMainFragment<FragmentRefreshRecyclerviewBinding>()
 
     override fun onResume() {
         super.onResume()
-        loadShopInventory()
+        if (shop == null) {
+            loadShopInventory()
+        }
     }
 
     private fun loadShopInventory() {
@@ -325,11 +327,13 @@ open class ShopFragment : BaseMainFragment<FragmentRefreshRecyclerviewBinding>()
                 }
                 Shop.TIME_TRAVELERS_SHOP -> {
                     formatTimeTravelersShop(shop1)
-                    activity?.let { activity ->
-                        val subscriptionBottomSheet = EventOutcomeSubscriptionBottomSheetFragment().apply {
-                            eventType = EventOutcomeSubscriptionBottomSheetFragment.EVENT_HOURGLASS_SHOP_OPENED
+                    if (userViewModel.user.value?.isSubscribed == false) {
+                        activity?.let { activity ->
+                            val subscriptionBottomSheet = EventOutcomeSubscriptionBottomSheetFragment().apply {
+                                eventType = EventOutcomeSubscriptionBottomSheetFragment.EVENT_HOURGLASS_SHOP_OPENED
+                            }
+                            subscriptionBottomSheet.show(activity.supportFragmentManager, SubscriptionBottomSheetFragment.TAG)
                         }
-                        subscriptionBottomSheet.show(activity.supportFragmentManager, SubscriptionBottomSheetFragment.TAG)
                     }
                 }
                 Shop.SEASONAL_SHOP -> {