diff --git a/src/common/components/ManageSettingsDropdown.tsx b/src/common/components/ManageSettingsDropdown.tsx index cf5fd58fed..9d5c6a872d 100644 --- a/src/common/components/ManageSettingsDropdown.tsx +++ b/src/common/components/ManageSettingsDropdown.tsx @@ -6,6 +6,7 @@ import InputSlider from 'components/reusables/sliders/InputSlider'; import RangeSlider from 'components/reusables/sliders/RangeSlider'; import { UserSetting } from 'helpers/channel/types'; +import { css } from 'styled-components'; type NotificationSettingsDropdownProps = { userSetting: UserSetting[]; @@ -20,7 +21,7 @@ const ManageSettingsDropdown: FC = ({ updateNotificationSettings, updatingNotificationSettings, unsubscribing, - unsubscribe + unsubscribe, }) => { const [modifiedSettings, setModifiedSettings] = useState([...userSetting]); @@ -72,11 +73,21 @@ const ManageSettingsDropdown: FC = ({ - + {modifiedSettings.map((setting, index) => { return ( @@ -88,8 +99,17 @@ const ManageSettingsDropdown: FC = ({ alignSelf="stretch" alignItems="flex-start" > - - + + {setting.description} = ({ alignItems="flex-start" alignSelf="stretch" > - + {setting.user || setting.default} = ({ alignItems="flex-start" alignSelf="stretch" > - + {setting.user.lower || setting.default.lower} - {setting.user.upper || setting.default.upper} = ({ alignItems="center" justifyContent="flex-end" flexDirection="column" + padding="spacing-none spacing-xs" > - + You will receive all important updates from this channel. - + - - + + {unsubscribing ? 'Unsubscribing' : 'Unsubscribe'} diff --git a/src/common/components/NotificationSettingsDropdown.tsx b/src/common/components/NotificationSettingsDropdown.tsx index ff85ca9d24..f40f700756 100644 --- a/src/common/components/NotificationSettingsDropdown.tsx +++ b/src/common/components/NotificationSettingsDropdown.tsx @@ -6,6 +6,7 @@ import InputSlider from 'components/reusables/sliders/InputSlider'; import RangeSlider from 'components/reusables/sliders/RangeSlider'; import { ChannelSetting } from 'helpers/channel/types'; +import { css } from 'styled-components'; type NotificationSettingsDropdownProps = { // TODO: Change this to the new channel Settings type @@ -19,7 +20,7 @@ const NotificationSettingsDropdown: FC = ({ optInHandler, channelSettings, loading, - onClose + onClose, }) => { const [modifiedSettings, setModifiedSettings] = useState([...channelSettings]); @@ -62,25 +63,45 @@ const NotificationSettingsDropdown: FC = ({ - + {modifiedSettings.map((setting, index) => { return ( - - + + {setting.description} = ({ alignItems="flex-start" alignSelf="stretch" > - + {setting.default} = ({ alignItems="flex-start" alignSelf="stretch" > - + {setting.default.lower} - {setting.default.upper} = ({ alignItems="center" justifyContent="flex-end" flexDirection="column" + padding="spacing-none spacing-xs" > - + You will receive all important updates from this channel. - - - - + + Cancel