From 1d76976c9829e9d919b2cfea096d7b5bf6c564f2 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Thu, 30 May 2024 12:55:37 +0200
Subject: [PATCH] fix shop display

---
 .../habitrpg/android/habitica/models/shops/Shop.kt   |  2 +-
 .../ui/adapter/inventory/ShopRecyclerAdapter.kt      |  3 +--
 .../ui/fragments/inventory/shops/ShopFragment.kt     |  1 +
 fastlane/changelog.txt                               | 12 +++++-------
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/Shop.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/Shop.kt
index 739cb8f93..57108013e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/Shop.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/Shop.kt
@@ -29,6 +29,6 @@ class Shop {
         const val QUEST_SHOP = "questShop"
         const val TIME_TRAVELERS_SHOP = "timeTravelersShop"
         const val SEASONAL_SHOP = "seasonalShop"
-        const val CUSTOMIZATIONS = "customizationsShop"
+        const val CUSTOMIZATIONS = "customizations"
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt
index 130bc49ec..fd45952ee 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt
@@ -37,7 +37,7 @@ class ShopRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<Vi
     var onShowPurchaseDialog: ((ShopItem, Boolean) -> Unit)? = null
 
     private val items: MutableList<Any> = ArrayList()
-    private var shopIdentifier: String? = null
+    internal var shopIdentifier: String? = null
     private var ownedItems: Map<String, OwnedItem> = HashMap()
     var armoireItem: ShopItem? = null
 
@@ -87,7 +87,6 @@ class ShopRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<Vi
         if (shop == null) {
             return
         }
-        shopIdentifier = shop.identifier
         items.clear()
         items.add(shop)
         for (category in shop.categories) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt
index d4ecff7f8..ef61d48e9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt
@@ -354,6 +354,7 @@ open class ShopFragment : BaseMainFragment<FragmentRefreshRecyclerviewBinding>()
                 }
             }
             shop = newShop
+            adapter?.shopIdentifier = shopIdentifier
             adapter?.setShop(newShop)
             binding?.refreshLayout?.isRefreshing = false
         }
diff --git a/fastlane/changelog.txt b/fastlane/changelog.txt
index 6c308e0bf..c815c65cb 100644
--- a/fastlane/changelog.txt
+++ b/fastlane/changelog.txt
@@ -1,7 +1,5 @@
-New in 4.3.7:
-- Experience and level should update automatically after finishing a Quest
-- Shop banners should now show properly during seasonal events
-- Fixed an issue that would prevent the creation of new Challenges
-- Fixed an issue with Settings not properly displaying selected changes
-- Adjusted the conditions for when a review prompt will show
-- Various other bug fixes and improvements
+New in 4.4:
+- Support for upcoming events and content 
+- Updated avatar customization interface to support new events and content
+- Updated push notification library to work with new standards in Firebase Cloud Messaging
+- Other various bug fixes and interface improvements