From f737b24b6fc4d94320f8862f689b70e631ff520d Mon Sep 17 00:00:00 2001
From: Mrugesh Mohapatra <me@raisedadead.com>
Date: Fri, 15 Nov 2019 01:35:21 +0530
Subject: [PATCH] feat(donate): remove themes from donate pages

---
 .../Donation/components/DonateFormChildViewForHOC.js | 12 ++++--------
 client/src/components/layouts/Default.js             | 10 +++++++---
 client/utils/gatsby/layoutSelector.js                |  7 +++++++
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/client/src/components/Donation/components/DonateFormChildViewForHOC.js b/client/src/components/Donation/components/DonateFormChildViewForHOC.js
index 888159ffac..39ab2a896c 100644
--- a/client/src/components/Donation/components/DonateFormChildViewForHOC.js
+++ b/client/src/components/Donation/components/DonateFormChildViewForHOC.js
@@ -26,8 +26,7 @@ const propTypes = {
   isSignedIn: PropTypes.bool,
   stripe: PropTypes.shape({
     createToken: PropTypes.func.isRequired
-  }),
-  theme: PropTypes.string
+  })
 };
 const initialState = {
   donationState: {
@@ -39,7 +38,7 @@ const initialState = {
 
 const mapStateToProps = createSelector(
   userSelector,
-  ({ email, theme }) => ({ email, theme })
+  ({ email }) => ({ email })
 );
 
 class DonateFormChildViewForHOC extends Component {
@@ -176,7 +175,7 @@ class DonateFormChildViewForHOC extends Component {
 
   renderDonateForm() {
     const { isFormValid } = this.state;
-    const { theme, getDonationButtonLabel } = this.props;
+    const { getDonationButtonLabel } = this.props;
     return (
       <Form className='donation-form' onSubmit={this.handleSubmit}>
         <FormGroup className='donation-email-container'>
@@ -191,10 +190,7 @@ class DonateFormChildViewForHOC extends Component {
             value={this.getUserEmail()}
           />
         </FormGroup>
-        <StripeCardForm
-          getValidationState={this.getValidationState}
-          theme={theme}
-        />
+        <StripeCardForm getValidationState={this.getValidationState} />
         <Button
           block={true}
           bsStyle='primary'
diff --git a/client/src/components/layouts/Default.js b/client/src/components/layouts/Default.js
index 9eb6415c41..3fe129b2e6 100644
--- a/client/src/components/layouts/Default.js
+++ b/client/src/components/layouts/Default.js
@@ -81,7 +81,8 @@ const propTypes = {
   pathname: PropTypes.string.isRequired,
   removeFlashMessage: PropTypes.func.isRequired,
   showFooter: PropTypes.bool,
-  theme: PropTypes.string
+  theme: PropTypes.string,
+  useTheme: PropTypes.bool
 };
 
 const mapStateToProps = createSelector(
@@ -145,13 +146,16 @@ class DefaultLayout extends Component {
       isSignedIn,
       removeFlashMessage,
       showFooter = true,
-      theme = 'default'
+      theme = 'default',
+      useTheme = true
     } = this.props;
     return (
       <Fragment>
         <Helmet
           bodyAttributes={{
-            class: `${theme === 'default' ? 'light-palette' : 'dark-palette'}`
+            class: useTheme
+              ? `${theme === 'default' ? 'light-palette' : 'dark-palette'}`
+              : 'light-palette'
           }}
           meta={[
             {
diff --git a/client/utils/gatsby/layoutSelector.js b/client/utils/gatsby/layoutSelector.js
index c2a1d48fdd..455d11c227 100644
--- a/client/utils/gatsby/layoutSelector.js
+++ b/client/utils/gatsby/layoutSelector.js
@@ -27,6 +27,13 @@ export default function layoutSelector({ element, props }) {
       </DefaultLayout>
     );
   }
+  if (/^\/donation(\/.*)*|^\/donate(\/.*)*/.test(pathname)) {
+    return (
+      <DefaultLayout pathname={pathname} useTheme={false}>
+        {element}
+      </DefaultLayout>
+    );
+  }
   return <DefaultLayout pathname={pathname}>{element}</DefaultLayout>;
 }