From 9d6a24d8020eadabe1d56d3aa27d5c735e769218 Mon Sep 17 00:00:00 2001
From: Vincent <vincent@loki.network>
Date: Tue, 14 Jul 2020 11:55:16 +1000
Subject: [PATCH] rm-uipolishmergre

---
 ts/components/session/SessionIdEditable.tsx      | 16 ++--------------
 .../session/settings/SessionSettings.tsx         |  7 +------
 .../session/messages/DeviceLinkMessage_test.ts   |  8 ++++++--
 ts/test/session/messages/ReceiptMessage_test.ts  |  4 +++-
 4 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/ts/components/session/SessionIdEditable.tsx b/ts/components/session/SessionIdEditable.tsx
index 36dbd1843..e2d43024c 100644
--- a/ts/components/session/SessionIdEditable.tsx
+++ b/ts/components/session/SessionIdEditable.tsx
@@ -9,7 +9,6 @@ interface Props {
   onChange?: any;
   onPressEnter?: any;
   maxLength?: number;
-  isGroup?: boolean;
 }
 
 export class SessionIdEditable extends React.PureComponent<Props> {
@@ -29,14 +28,7 @@ export class SessionIdEditable extends React.PureComponent<Props> {
   }
 
   public render() {
-    const {
-      placeholder,
-      editable,
-      text,
-      value,
-      maxLength,
-      isGroup,
-    } = this.props;
+    const { placeholder, editable, text, value, maxLength } = this.props;
 
     return (
       <div
@@ -46,11 +38,7 @@ export class SessionIdEditable extends React.PureComponent<Props> {
         )}
       >
         <textarea
-          className={classNames(
-            isGroup
-              ? 'group-id-editable-textarea'
-              : 'session-id-editable-textarea'
-          )}
+          className="session-id-editable-textarea"
           ref={this.inputRef}
           placeholder={placeholder}
           disabled={!editable}
diff --git a/ts/components/session/settings/SessionSettings.tsx b/ts/components/session/settings/SessionSettings.tsx
index 854d5a39f..9a3933f4d 100644
--- a/ts/components/session/settings/SessionSettings.tsx
+++ b/ts/components/session/settings/SessionSettings.tsx
@@ -10,8 +10,6 @@ import {
 import { UserUtil } from '../../../util';
 import { MultiDeviceProtocol } from '../../../session/protocols';
 import { PubKey } from '../../../session/types';
-import { Constants } from '../../../session';
-import { NumberUtils } from '../../../session/utils';
 
 export enum SessionSettingCategory {
   Appearance = 'appearance',
@@ -454,10 +452,7 @@ export class SettingsView extends React.Component<SettingsViewProps, State> {
           step: 6,
           min: 12,
           max: 96,
-          defaultValue: NumberUtils.msAsUnit(
-            Constants.TTL_DEFAULT.REGULAR_MESSAGE,
-            'hour'
-          ),
+          defaultValue: 24,
           info: (value: number) => `${value} Hours`,
         },
         confirmationDialogParams: undefined,
diff --git a/ts/test/session/messages/DeviceLinkMessage_test.ts b/ts/test/session/messages/DeviceLinkMessage_test.ts
index e3a014cde..785bfa018 100644
--- a/ts/test/session/messages/DeviceLinkMessage_test.ts
+++ b/ts/test/session/messages/DeviceLinkMessage_test.ts
@@ -117,8 +117,12 @@ describe('DeviceLinkMessage', () => {
   });
 
   it('correct ttl', () => {
-    expect(linkRequestMessage.ttl()).to.equal(Constants.TTL_DEFAULT.PAIRING_REQUEST);
-    expect(linkGrantMessage.ttl()).to.equal(Constants.TTL_DEFAULT.PAIRING_REQUEST);
+    expect(linkRequestMessage.ttl()).to.equal(
+      Constants.TTL_DEFAULT.PAIRING_REQUEST
+    );
+    expect(linkGrantMessage.ttl()).to.equal(
+      Constants.TTL_DEFAULT.PAIRING_REQUEST
+    );
   });
 
   it('has an identifier', () => {
diff --git a/ts/test/session/messages/ReceiptMessage_test.ts b/ts/test/session/messages/ReceiptMessage_test.ts
index 12a3a9f80..9643f92a9 100644
--- a/ts/test/session/messages/ReceiptMessage_test.ts
+++ b/ts/test/session/messages/ReceiptMessage_test.ts
@@ -45,7 +45,9 @@ describe('ReceiptMessage', () => {
 
   it('correct ttl', () => {
     expect(readMessage.ttl()).to.equal(Constants.TTL_DEFAULT.REGULAR_MESSAGE);
-    expect(deliveryMessage.ttl()).to.equal(Constants.TTL_DEFAULT.REGULAR_MESSAGE);
+    expect(deliveryMessage.ttl()).to.equal(
+      Constants.TTL_DEFAULT.REGULAR_MESSAGE
+    );
   });
 
   it('has an identifier', () => {