From 869856df2d92c215f5f0aa296ffb5913197cdd54 Mon Sep 17 00:00:00 2001
From: Suguru Hirahara <luixxiul@users.noreply.github.com>
Date: Tue, 18 Apr 2023 20:59:18 +0000
Subject: [PATCH] Remove obsolete class name and declarations on `General` user
 settings tab (#10659)

* Remove an obsolete class name: `mx_EmailAddresses_new`

The class name was added by aa7afe819f5fedad0d21c534906c7c64d3f4dd0e for an initial implementation and became obsolete thanks to 1090b7d9124b3e0d51dc14d07325443a144bb48d.

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Remove obsolete declarations: `mx_ExistingPhoneNumber_delete`

The declarations have been obsolete since 11f2b4320d7c1cf4ed852e74f26e7cb110b38ef4.

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Remove obsolete declarations: `mx_ExistingEmailAddress_delete`

The declarations have also been deprecated by 11f2b4320d7c1cf4ed852e74f26e7cb110b38ef4.

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

---------

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
---
 res/css/views/settings/_EmailAddresses.pcss              | 6 ------
 res/css/views/settings/_PhoneNumbers.pcss                | 6 ------
 src/components/views/settings/account/EmailAddresses.tsx | 2 +-
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/res/css/views/settings/_EmailAddresses.pcss b/res/css/views/settings/_EmailAddresses.pcss
index 1c9ce724d1..f401c64484 100644
--- a/res/css/views/settings/_EmailAddresses.pcss
+++ b/res/css/views/settings/_EmailAddresses.pcss
@@ -21,12 +21,6 @@ limitations under the License.
     margin-bottom: 5px;
 }
 
-.mx_ExistingEmailAddress_delete {
-    margin-right: 5px;
-    cursor: pointer;
-    vertical-align: middle;
-}
-
 .mx_ExistingEmailAddress_email,
 .mx_ExistingEmailAddress_promptText {
     flex: 1;
diff --git a/res/css/views/settings/_PhoneNumbers.pcss b/res/css/views/settings/_PhoneNumbers.pcss
index 507b07334e..d64d1a6333 100644
--- a/res/css/views/settings/_PhoneNumbers.pcss
+++ b/res/css/views/settings/_PhoneNumbers.pcss
@@ -21,12 +21,6 @@ limitations under the License.
     margin-bottom: 5px;
 }
 
-.mx_ExistingPhoneNumber_delete {
-    margin-right: 5px;
-    cursor: pointer;
-    vertical-align: middle;
-}
-
 .mx_ExistingPhoneNumber_address,
 .mx_ExistingPhoneNumber_promptText {
     flex: 1;
diff --git a/src/components/views/settings/account/EmailAddresses.tsx b/src/components/views/settings/account/EmailAddresses.tsx
index 5605bfacb6..3d3cb8fb18 100644
--- a/src/components/views/settings/account/EmailAddresses.tsx
+++ b/src/components/views/settings/account/EmailAddresses.tsx
@@ -276,7 +276,7 @@ export default class EmailAddresses extends React.Component<IProps, IState> {
         return (
             <div className="mx_EmailAddresses">
                 {existingEmailElements}
-                <form onSubmit={this.onAddClick} autoComplete="off" noValidate={true} className="mx_EmailAddresses_new">
+                <form onSubmit={this.onAddClick} autoComplete="off" noValidate={true}>
                     <Field
                         type="text"
                         label={_t("Email Address")}