diff --git a/src/components/promos/November2023ShopUser.js b/src/components/promos/November2023ShopUser.js index 78d1c6e5..a87c1d20 100644 --- a/src/components/promos/November2023ShopUser.js +++ b/src/components/promos/November2023ShopUser.js @@ -47,8 +47,16 @@ const imageGroupStyles = { const November2023ShopUser = ({ user }) => { const [show, setShow] = useState(false) const [batch, setBatch] = useState(1) + const [userType, setUserType] = useState('') useEffect(() => { + // Detect user type + if (user.shopSignupTimestamp) { + setUserType('shop-user') + } else { + setUserType('non-shop-user') + } + // Function to update the state function updateState() { const now = new Date().getTime() @@ -85,7 +93,7 @@ const November2023ShopUser = ({ user }) => { // Call the function on component mount updateState() - }, []) + }, [user]) const getNotifDismissKey = (code) => `${NOTIF_DISMISS_PREFIX}.${code}` @@ -143,20 +151,40 @@ const November2023ShopUser = ({ user }) => { Give back during your Holiday Shopping - - Raise money for {user.cause.nameForShop || 'Charity'} when you - shop these Black Friday deals–you can earn up to 10% back! As a - bonus for activating an offer, you’ll be entered into a drawing - for one of two $100 Visa gift cards ( - - promo details - - ). - + {userType === 'non-shop-user' && ( + + Raise money for {user.cause.nameForShop || 'Charity'} when you + shop these Black Friday deals! Just click the links below + before to shop through our partner stores and they’ll give up + to 5% back for your cause. Or, you can download{' '} + + Shop for a Cause + {' '} + which will automatically help you raise money from over 10,000 + stores. + + )} + + {userType === 'shop-user' && ( + + Raise money for {user.cause.nameForShop || 'Charity'} when you + shop these Black Friday deals–you can earn up to 10% back! As + a bonus for activating an offer, you’ll be entered into a + drawing for one of two $100 Visa gift cards ( + + promo details + + ). + + )} {batch === 1 && ( @@ -314,6 +342,7 @@ November2023ShopUser.displayName = 'November2023ShopUserComponent' November2023ShopUser.propTypes = { user: PropTypes.shape({ userId: PropTypes.string, + shopSignupTimestamp: PropTypes.string, cause: PropTypes.shape({ nameForShop: PropTypes.string, }), diff --git a/src/pages/index.js b/src/pages/index.js index 32ddd3e5..9b27ab34 100644 --- a/src/pages/index.js +++ b/src/pages/index.js @@ -109,7 +109,6 @@ import Modal from '@material-ui/core/Modal' import { Box } from '@material-ui/core' import November2023ShopUser from 'src/components/promos/November2023ShopUser' -import November2023NoShopUser from 'src/components/promos/November2023NoShopUser' const getNotifDismissKey = (code) => `${NOTIF_DISMISS_PREFIX}.${code}` @@ -1121,15 +1120,8 @@ const Index = ({ data: fallbackData, userAgent }) => { {/* Prime day 2023 Promo */} {/* {user.userId && notif && } */} - {/* November No Shop User 2023 Promo */} - {user.userId && !user.shopSignupTimestamp && ( - - )} - {/* November Shop User 2023 Promo */} - {user.userId && user.shopSignupTimestamp && ( - - )} + {user.userId && }