From 56b8dfacc1a7be1b365beebf4fd914d71bf57c27 Mon Sep 17 00:00:00 2001
From: Warrick Corfe-Tan <warrickct@gmail.com>
Date: Tue, 4 May 2021 12:44:24 +1000
Subject: [PATCH] Revert "Updated formatting."

This reverts commit 6b40428ad9fc7146e21804259479307003a94a48.
---
 .../session/SessionPasswordModal.tsx          | 22 ++++++-------------
 .../conversation/SessionConversation.tsx      |  3 ---
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/ts/components/session/SessionPasswordModal.tsx b/ts/components/session/SessionPasswordModal.tsx
index f35f59f95..fc50b860e 100644
--- a/ts/components/session/SessionPasswordModal.tsx
+++ b/ts/components/session/SessionPasswordModal.tsx
@@ -37,7 +37,7 @@ class SessionPasswordModalInner extends React.Component<Props, State> {
       error: null,
       currentPasswordEntered: null,
       currentPasswordConfirmEntered: null,
-      currentPasswordRetypeEntered: null,
+      currentPasswordRetypeEntered: null
     };
 
     this.showError = this.showError.bind(this);
@@ -61,11 +61,7 @@ class SessionPasswordModalInner extends React.Component<Props, State> {
     const { action, onOk } = this.props;
     const placeholders =
       action === PasswordAction.Change
-        ? [
-            window.i18n('typeInOldPassword'),
-            window.i18n('enterPassword'),
-            window.i18n('confirmPassword'),
-          ]
+        ? [window.i18n('typeInOldPassword'), window.i18n('enterPassword'), window.i18n('confirmPassword')]
         : [window.i18n('enterPassword'), window.i18n('confirmPassword')];
 
     const confirmButtonColor =
@@ -200,11 +196,7 @@ class SessionPasswordModalInner extends React.Component<Props, State> {
     this.closeDialog();
   }
 
-  private async handleActionChange(
-    oldPassword: string,
-    newPassword: string,
-    newConfirmedPassword: string
-  ) {
+  private async handleActionChange(oldPassword: string, newPassword: string, newConfirmedPassword: string) {
     // We don't validate oldPassword on change: this is validate on the validatePasswordHash below
     // we only validate the newPassword here
     if (!this.validatePassword(newPassword)) {
@@ -214,9 +206,9 @@ class SessionPasswordModalInner extends React.Component<Props, State> {
     // Check the retyped password matches the new password
     if (newPassword !== newConfirmedPassword) {
       this.setState({
-        error: window.i18n('passwordsDoNotMatch'),
-      });
-      return;
+        error: window.i18n('passwordsDoNotMatch')
+      })
+      return
     }
 
     const isValidWithStoredInDB = Boolean(
@@ -270,7 +262,7 @@ class SessionPasswordModalInner extends React.Component<Props, State> {
     const {
       currentPasswordEntered,
       currentPasswordConfirmEntered,
-      currentPasswordRetypeEntered,
+      currentPasswordRetypeEntered
     } = this.state;
     const { Set, Remove, Change } = PasswordAction;
 
diff --git a/ts/components/session/conversation/SessionConversation.tsx b/ts/components/session/conversation/SessionConversation.tsx
index 1d3fc17ac..437cc7119 100644
--- a/ts/components/session/conversation/SessionConversation.tsx
+++ b/ts/components/session/conversation/SessionConversation.tsx
@@ -288,9 +288,6 @@ export class SessionConversation extends React.Component<Props, State> {
     const isPublic = selectedConversation.isPublic || false;
 
     const isPrivate = selectedConversation.type === 'direct';
-
-    // debugger;
-
     return (
       <SessionTheme theme={this.props.theme}>
         <div className="conversation-header">{this.renderHeader()}</div>