Merge remote-tracking branch 'origin' into feature/tracking

components/HotelReservation/EnterDetails/Payment/PaymentClient.tsx

@@ -218,7 +218,9 @@ export default function PaymentClient({
             bedType: bedTypeMap[parseInt(child.bed.toString())],
           })),
           rateCode:
-            user || join || membershipNo ? room.counterRateCode : room.rateCode,
+            (user || join || membershipNo) && room.counterRateCode
+              ? room.counterRateCode
+              : room.rateCode,
           roomTypeCode: bedType!.roomTypeCode, // A selection has been made in order to get to this step.
           guest: {
             firstName,

components/HotelReservation/EnterDetails/Summary/UI/index.tsx

@@ -67,7 +67,7 @@ export default function SummaryUI({
       }
     : null
 
-  const showMemberPrice = !!(isMember || join || membershipNo)
+  const showMemberPrice = !!(isMember || join || membershipNo) && memberPrice
 
   const diff = dt(booking.toDate).diff(booking.fromDate, "days")