From c56d6ba539d00c737544134cea3cb22f765530ac Mon Sep 17 00:00:00 2001
From: Logan Arnett <logan@loganarnett.com>
Date: Thu, 7 Oct 2021 13:22:43 -0400
Subject: [PATCH 1/2] updating from boolean to object in order to track if more
 than one thing is edited

---
 .../room_settings/RoomProfileSettings.tsx     | 62 ++++++++++++++-----
 1 file changed, 47 insertions(+), 15 deletions(-)

diff --git a/src/components/views/room_settings/RoomProfileSettings.tsx b/src/components/views/room_settings/RoomProfileSettings.tsx
index 6533028e8c..71c0094026 100644
--- a/src/components/views/room_settings/RoomProfileSettings.tsx
+++ b/src/components/views/room_settings/RoomProfileSettings.tsx
@@ -35,7 +35,7 @@ interface IState {
     avatarFile: File;
     originalTopic: string;
     topic: string;
-    enableProfileSave: boolean;
+    profileFieldsTouched: Record<string, boolean>;
     canSetName: boolean;
     canSetTopic: boolean;
     canSetAvatar: boolean;
@@ -71,7 +71,7 @@ export default class RoomProfileSettings extends React.Component<IProps, IState>
             avatarFile: null,
             originalTopic: topic,
             topic: topic,
-            enableProfileSave: false,
+            profileFieldsTouched: {},
             canSetName: room.currentState.maySendStateEvent('m.room.name', client.getUserId()),
             canSetTopic: room.currentState.maySendStateEvent('m.room.topic', client.getUserId()),
             canSetAvatar: room.currentState.maySendStateEvent('m.room.avatar', client.getUserId()),
@@ -88,17 +88,24 @@ export default class RoomProfileSettings extends React.Component<IProps, IState>
         this.setState({
             avatarUrl: null,
             avatarFile: null,
-            enableProfileSave: true,
+            profileFieldsTouched: {
+                ...this.state.profileFieldsTouched,
+                avatar: true
+            },
         });
     };
 
+    private isSaveEnabled = () => {
+        return Boolean(Object.values(this.state.profileFieldsTouched).length)
+    }
+
     private cancelProfileChanges = async (e: React.MouseEvent): Promise<void> => {
         e.stopPropagation();
         e.preventDefault();
 
-        if (!this.state.enableProfileSave) return;
+        if (!this.isSaveEnabled()) return;
         this.setState({
-            enableProfileSave: false,
+            profileFieldsTouched: {},
             displayName: this.state.originalDisplayName,
             topic: this.state.originalTopic,
             avatarUrl: this.state.originalAvatarUrl,
@@ -110,8 +117,8 @@ export default class RoomProfileSettings extends React.Component<IProps, IState>
         e.stopPropagation();
         e.preventDefault();
 
-        if (!this.state.enableProfileSave) return;
-        this.setState({ enableProfileSave: false });
+        if (!this.isSaveEnabled()) return;
+        this.setState({ profileFieldsTouched: {} });
 
         const client = MatrixClientPeg.get();
 
@@ -156,18 +163,37 @@ export default class RoomProfileSettings extends React.Component<IProps, IState>
     private onDisplayNameChanged = (e: React.ChangeEvent<HTMLInputElement>): void => {
         this.setState({ displayName: e.target.value });
         if (this.state.originalDisplayName === e.target.value) {
-            this.setState({ enableProfileSave: false });
+            this.setState({
+                profileFieldsTouched: {
+                    ...this.state.profileFieldsTouched,
+                    name: false
+            }, });
         } else {
-            this.setState({ enableProfileSave: true });
+            this.setState({
+                profileFieldsTouched: {
+                    ...this.state.profileFieldsTouched,
+                    name: true
+                },
+            });
         }
     };
 
     private onTopicChanged = (e: React.ChangeEvent<HTMLTextAreaElement>): void => {
         this.setState({ topic: e.target.value });
         if (this.state.originalTopic === e.target.value) {
-            this.setState({ enableProfileSave: false });
+            this.setState({
+                profileFieldsTouched: {
+                    ...this.state.profileFieldsTouched,
+                    topic: false
+                },
+            });
         } else {
-            this.setState({ enableProfileSave: true });
+            this.setState({
+                profileFieldsTouched: {
+                    ...this.state.profileFieldsTouched,
+                    topic: true
+                },
+            });
         }
     };
 
@@ -176,7 +202,10 @@ export default class RoomProfileSettings extends React.Component<IProps, IState>
             this.setState({
                 avatarUrl: this.state.originalAvatarUrl,
                 avatarFile: null,
-                enableProfileSave: false,
+                profileFieldsTouched: {
+                    ...this.state.profileFieldsTouched,
+                    avatar: false
+                },
             });
             return;
         }
@@ -187,7 +216,10 @@ export default class RoomProfileSettings extends React.Component<IProps, IState>
             this.setState({
                 avatarUrl: String(ev.target.result),
                 avatarFile: file,
-                enableProfileSave: true,
+                profileFieldsTouched: {
+                    ...this.state.profileFieldsTouched,
+                    avatar: true
+                },
             });
         };
         reader.readAsDataURL(file);
@@ -205,14 +237,14 @@ export default class RoomProfileSettings extends React.Component<IProps, IState>
                     <AccessibleButton
                         onClick={this.cancelProfileChanges}
                         kind="link"
-                        disabled={!this.state.enableProfileSave}
+                        disabled={!this.isSaveEnabled()}
                     >
                         { _t("Cancel") }
                     </AccessibleButton>
                     <AccessibleButton
                         onClick={this.saveProfile}
                         kind="primary"
-                        disabled={!this.state.enableProfileSave}
+                        disabled={!this.isSaveEnabled()}
                     >
                         { _t("Save") }
                     </AccessibleButton>

From 4759b4fb5d7184fa5c34ccf09908b8e24d2c7687 Mon Sep 17 00:00:00 2001
From: Logan Arnett <logan@loganarnett.com>
Date: Thu, 7 Oct 2021 14:58:35 -0400
Subject: [PATCH 2/2] updating for lint issues

---
 .../room_settings/RoomProfileSettings.tsx     | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/components/views/room_settings/RoomProfileSettings.tsx b/src/components/views/room_settings/RoomProfileSettings.tsx
index 71c0094026..8cc7a620f8 100644
--- a/src/components/views/room_settings/RoomProfileSettings.tsx
+++ b/src/components/views/room_settings/RoomProfileSettings.tsx
@@ -90,14 +90,14 @@ export default class RoomProfileSettings extends React.Component<IProps, IState>
             avatarFile: null,
             profileFieldsTouched: {
                 ...this.state.profileFieldsTouched,
-                avatar: true
+                avatar: true,
             },
         });
     };
 
     private isSaveEnabled = () => {
-        return Boolean(Object.values(this.state.profileFieldsTouched).length)
-    }
+        return Boolean(Object.values(this.state.profileFieldsTouched).length);
+    };
 
     private cancelProfileChanges = async (e: React.MouseEvent): Promise<void> => {
         e.stopPropagation();
@@ -166,13 +166,14 @@ export default class RoomProfileSettings extends React.Component<IProps, IState>
             this.setState({
                 profileFieldsTouched: {
                     ...this.state.profileFieldsTouched,
-                    name: false
-            }, });
+                    name: false,
+                },
+            });
         } else {
             this.setState({
                 profileFieldsTouched: {
                     ...this.state.profileFieldsTouched,
-                    name: true
+                    name: true,
                 },
             });
         }
@@ -184,14 +185,14 @@ export default class RoomProfileSettings extends React.Component<IProps, IState>
             this.setState({
                 profileFieldsTouched: {
                     ...this.state.profileFieldsTouched,
-                    topic: false
+                    topic: false,
                 },
             });
         } else {
             this.setState({
                 profileFieldsTouched: {
                     ...this.state.profileFieldsTouched,
-                    topic: true
+                    topic: true,
                 },
             });
         }
@@ -204,7 +205,7 @@ export default class RoomProfileSettings extends React.Component<IProps, IState>
                 avatarFile: null,
                 profileFieldsTouched: {
                     ...this.state.profileFieldsTouched,
-                    avatar: false
+                    avatar: false,
                 },
             });
             return;
@@ -218,7 +219,7 @@ export default class RoomProfileSettings extends React.Component<IProps, IState>
                 avatarFile: file,
                 profileFieldsTouched: {
                     ...this.state.profileFieldsTouched,
-                    avatar: true
+                    avatar: true,
                 },
             });
         };