From 75f5d5743f5a61d76e040f0d634ba13e52aef16f Mon Sep 17 00:00:00 2001
From: Brian Jian Zhao <jian10au@gmail.com>
Date: Fri, 28 Feb 2020 10:54:21 +1100
Subject: [PATCH] remove all the conditional rendering logic to make code
 cleaner

---
 .../settings/SessionSettingListItem.tsx       | 25 +++----------------
 .../session/settings/SessionSettings.tsx      |  6 ++---
 2 files changed, 5 insertions(+), 26 deletions(-)

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<Props, State> {
             />
           )}
 
-          {type === SessionSettingType.Slider &&
-          content.sliderCategory === 'messageTTLSlider' ? (
+          {type === SessionSettingType.Slider && (
             <div className="slider-wrapper">
               <Slider
                 dots={content.dotsEnable}
@@ -103,28 +102,10 @@ export class SessionSettingListItem extends React.Component<Props, State> {
               />
 
               <div className="slider-info">
-                <p>{`${currentSliderValue} Hours`}</p>
+                <p>{content.info(currentSliderValue)}</p>
               </div>
             </div>
-          ) : type === SessionSettingType.Slider &&
-          content.sliderCategory === 'zoomFactorSlider' ? (
-            <div>
-              <Slider
-                dots={content.dotsEnable}
-                step={content.step}
-                min={content.min}
-                max={content.max}
-                defaultValue={currentSliderValue}
-                onChange={sliderValue => {
-                  this.handleSlider(sliderValue);
-                }}
-              />
-
-              <div className="slider-info">
-                <p>{`Zoom Level:   %${currentSliderValue}`}</p>
-              </div>
-            </div>
-          ) : null}
+          )}
         </div>
       </div>
     );
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<SettingsViewProps, State> {
           {shouldRenderPasswordLock ? (
             this.renderPasswordLock()
           ) : (
-            //
             <div ref={this.settingsViewRef} className="session-settings-list">
               {this.renderSettingInCategory()}
-              {/* what gets rendered back from calling renderSettingInCategory */}
             </div>
           )}
-
-          {/* session info is always shown in here  */}
           {this.renderSessionInfo()}
         </div>
       </div>
@@ -451,6 +447,7 @@ export class SettingsView extends React.Component<SettingsViewProps, State> {
           max: 96,
           sliderCategory: 'messageTTLSlider',
           defaultValue: 24,
+          info: (value: number) => `${value} Hours`,
         },
         confirmationDialogParams: undefined,
       },
@@ -471,6 +468,7 @@ export class SettingsView extends React.Component<SettingsViewProps, State> {
           max: 200,
           sliderCategory: 'zoomFactorSlider',
           defaultValue: 100,
+          info: (value: number) => `Zoom Factor: ${value}%`
         },
         confirmationDialogParams: undefined,
       },