Merged in fix/SW-2890-select-rate-not-updating (pull request #2190)

fix: select-rate didn't update results when switching back to a recent search SW-2890

* fix: select-rate didn't update results when switching back to a recent search


Approved-by: Linus Flood

apps/scandic-web/providers/RatesProvider.tsx

@@ -1,13 +1,13 @@
 "use client"
+
 import { usePathname, useSearchParams } from "next/navigation"
-import { useRef } from "react"
+import { useMemo } from "react"
 import { useIntl } from "react-intl"
 
 import { createRatesStore } from "@/stores/select-rate"
 
 import { RatesContext } from "@/contexts/Rates"
 
-import type { RatesStore } from "@/types/contexts/rates"
 import type { RatesProviderProps } from "@/types/providers/rates"
 
 export default function RatesProvider({
@@ -18,37 +18,43 @@ export default function RatesProvider({
   roomsAvailability,
   vat,
 }: RatesProviderProps) {
-  const storeRef = useRef<RatesStore>()
   const pathname = usePathname()
   const searchParams = useSearchParams()
   const intl = useIntl()
 
-  if (!storeRef.current) {
-    storeRef.current = createRatesStore({
+  const store = useMemo(
+    () =>
+      createRatesStore({
+        booking,
+        hotelType,
+        labels: {
+          accessibilityRoom: intl.formatMessage({
+            defaultMessage: "Accessible room",
+          }),
+          allergyRoom: intl.formatMessage({
+            defaultMessage: "Allergy-friendly room",
+          }),
+          petRoom: intl.formatMessage({
+            defaultMessage: "Pet-friendly room",
+          }),
+        },
+        pathname,
+        roomCategories,
+        roomsAvailability,
+        searchParams: new URLSearchParams(searchParams),
+        vat,
+      }),
+    [
       booking,
       hotelType,
-      labels: {
-        accessibilityRoom: intl.formatMessage({
-          defaultMessage: "Accessible room",
-        }),
-        allergyRoom: intl.formatMessage({
-          defaultMessage: "Allergy-friendly room",
-        }),
-        petRoom: intl.formatMessage({
-          defaultMessage: "Pet-friendly room",
-        }),
-      },
+      intl,
       pathname,
       roomCategories,
       roomsAvailability,
-      searchParams: new URLSearchParams(searchParams),
+      searchParams,
       vat,
-    })
-  }
-
-  return (
-    <RatesContext.Provider value={storeRef.current}>
-      {children}
-    </RatesContext.Provider>
+    ]
   )
+
+  return <RatesContext.Provider value={store}>{children}</RatesContext.Provider>
 }