revert: "fix(daypicker): change the argument to show the prefooter di…

…sclaimer (#118)" This reverts commit 639fcdb.
qantasairways · Aug 20, 2019 · 705018a · 705018a
1 parent fb52a43
commit 705018a
Showing 1 changed file with 5 additions and 14 deletions.
diff --git 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 (
     <Transition in={showBottomFooter} timeout={300}>
       {wrapperTransition => (
@@ -213,7 +207,9 @@ const Footer = ({
                     }}
                   >
                     <span css={preFooterTextStyle}>{preFooterInfo}</span>
-                    {setPreFooterDisclaimer ? (
+                    {preFooterDisclaimer &&
+                    priceInPoints &&
+                    endDateData.price.isClassic ? (
                       <span css={topDisclaimerStyle()}>
                         {preFooterDisclaimer}
                       </span>
@@ -240,21 +236,16 @@ 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,
                           margin: '0 5px'
                         }}
                       >
                         <span>
-                          {endDateData && endDateData.price && priceInPoints
+                          {endDateData && priceInPoints
                             ? numberWithCommas(endDateData.price.points)
                             : endDateData.currencySymbol +
                               numberWithCommas(