diff --git a/ts/components/session/settings/SessionSettingListItem.tsx b/ts/components/session/settings/SessionSettingListItem.tsx index 4820d3287..517ad205e 100644 --- a/ts/components/session/settings/SessionSettingListItem.tsx +++ b/ts/components/session/settings/SessionSettingListItem.tsx @@ -88,8 +88,7 @@ export class SessionSettingListItem extends React.Component { /> )} - {type === SessionSettingType.Slider && - content.sliderCategory === 'messageTTLSlider' ? ( + {type === SessionSettingType.Slider && (
{ />
-

{`${currentSliderValue} Hours`}

+

{content.info(currentSliderValue)}

- ) : type === SessionSettingType.Slider && - content.sliderCategory === 'zoomFactorSlider' ? ( -
- { - this.handleSlider(sliderValue); - }} - /> - -
-

{`Zoom Level: %${currentSliderValue}`}

-
-
- ) : null} + )} ); diff --git a/ts/components/session/settings/SessionSettings.tsx b/ts/components/session/settings/SessionSettings.tsx index 38bb56b4e..d5f391975 100644 --- a/ts/components/session/settings/SessionSettings.tsx +++ b/ts/components/session/settings/SessionSettings.tsx @@ -236,14 +236,10 @@ export class SettingsView extends React.Component { {shouldRenderPasswordLock ? ( this.renderPasswordLock() ) : ( - //
{this.renderSettingInCategory()} - {/* what gets rendered back from calling renderSettingInCategory */}
)} - - {/* session info is always shown in here */} {this.renderSessionInfo()} @@ -451,6 +447,7 @@ export class SettingsView extends React.Component { max: 96, sliderCategory: 'messageTTLSlider', defaultValue: 24, + info: (value: number) => `${value} Hours`, }, confirmationDialogParams: undefined, }, @@ -471,6 +468,7 @@ export class SettingsView extends React.Component { max: 200, sliderCategory: 'zoomFactorSlider', defaultValue: 100, + info: (value: number) => `Zoom Factor: ${value}%` }, confirmationDialogParams: undefined, },