From 705018a779263852413a0cb27bf88e5bf86c5432 Mon Sep 17 00:00:00 2001 From: Rachel Mulvey Date: Tue, 20 Aug 2019 16:15:16 +1000 Subject: [PATCH] revert: "fix(daypicker): change the argument to show the prefooter disclaimer (#118)" This reverts commit 639fcdb983c76258950389274ae67383ee0e68b3. --- src/components/DayPicker/components/Footer.js | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/components/DayPicker/components/Footer.js b/src/components/DayPicker/components/Footer.js index 25834346..9bfe289e 100644 --- a/src/components/DayPicker/components/Footer.js +++ b/src/components/DayPicker/components/Footer.js @@ -175,12 +175,6 @@ const Footer = ({ endDateData.price && endDateData.price.value; - const setPreFooterDisclaimer = - preFooterDisclaimer && - priceInPoints && - (!endDateData || - (endDateData && endDateData.price && endDateData.price.isClassic)); - return ( {wrapperTransition => ( @@ -213,7 +207,9 @@ const Footer = ({ }} > {preFooterInfo} - {setPreFooterDisclaimer ? ( + {preFooterDisclaimer && + priceInPoints && + endDateData.price.isClassic ? ( {preFooterDisclaimer} @@ -240,13 +236,8 @@ const Footer = ({ css={{ color: (!priceInPoints && - endDateData && - endDateData.price && endDateData.price.isLowestPrice) || - (priceInPoints && - endDateData && - endDateData.price && - endDateData.price.isLowestPoints) + (priceInPoints && endDateData.price.isLowestPoints) ? '#009400' : colours.darkerGrey, fontWeight: fontWeight.bold, @@ -254,7 +245,7 @@ const Footer = ({ }} > - {endDateData && endDateData.price && priceInPoints + {endDateData && priceInPoints ? numberWithCommas(endDateData.price.points) : endDateData.currencySymbol + numberWithCommas(