Merge remote-tracking branch 'upstream/clearnet' into make-cheap-translations

stylesheets/_session.scss

@@ -674,17 +674,6 @@ label {
   }
 }
 
-.sealed-sender-toggle {
-  display: flex;
-  padding: 6px;
-}
-
-.sender-keys-description {
-  display: flex;
-  align-items: center;
-  padding-left: 10px;
-}
-
 .session-modal__body {
   display: flex;
   flex-direction: column;

ts/components/session/SessionClosableOverlay.tsx

@@ -37,7 +37,6 @@ interface Props {
 interface State {
   groupName: string;
   selectedMembers: Array<ContactType>;
-  senderKeys: boolean;
 }
 
 export class SessionClosableOverlay extends React.Component<Props, State> {
@@ -49,7 +48,6 @@ export class SessionClosableOverlay extends React.Component<Props, State> {
     this.state = {
       groupName: '',
       selectedMembers: [],
-      senderKeys: false,
     };
 
     this.inputRef = React.createRef();
@@ -160,7 +158,7 @@ export class SessionClosableOverlay extends React.Component<Props, State> {
       default:
     }
 
-    const { groupName, selectedMembers, senderKeys } = this.state;
+    const { groupName, selectedMembers } = this.state;
     const ourSessionID = window.textsecure.storage.user.getNumber();
 
     const contacts = this.getContacts();
@@ -258,33 +256,18 @@ export class SessionClosableOverlay extends React.Component<Props, State> {
           />
         )}
 
-        {isClosedGroupView && window.lokiFeatureFlags.enableSenderKeys && (
-          <div className="sealed-sender-toggle">
-            <SessionToggle
-              active={Boolean(false)}
-              onClick={() => {
-                const value = this.state.senderKeys;
-                this.setState({ senderKeys: !value });
-              }}
-            />
-
-            <span
-              className={classNames(
-                'session-settings-item__description',
-                'sender-keys-description'
-              )}
-            >
-              Use Sender Keys
-            </span>
-          </div>
-        )}
-
         <SessionButton
           buttonColor={SessionButtonColor.Green}
           buttonType={SessionButtonType.BrandOutline}
           text={buttonText}
           disabled={noContactsForClosedGroup}
-          onClick={() => onButtonClick(groupName, selectedMembers, senderKeys)}
+          onClick={() =>
+            onButtonClick(
+              groupName,
+              selectedMembers,
+              window.lokiFeatureFlags.enableSenderKeys
+            )
+          }
         />
       </div>
     );