From 19a94d30398c59dccf3fbee208c2f1344ed95bab Mon Sep 17 00:00:00 2001
From: infiinte-persistence <inf.persistence@gmail.com>
Date: Tue, 7 Jul 2020 15:16:26 +0800
Subject: [PATCH] Revert "Add password reset ... (4468)" to redo using redirect
 page method.

---
 CHANGELOG.md                                 |  1 -
 static/app-strings.json                      |  4 --
 ui/component/settingAccountPassword/view.jsx | 63 ++++++++------------
 ui/component/userPasswordReset/view.jsx      |  9 +--
 4 files changed, 27 insertions(+), 50 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f2fbb547..1b9303c5b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,7 +17,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Option to remove abandoned claims from Blocked Channels page _community pr!_ ([#4433](https://github.com/lbryio/lbry-desktop/pull/4433))
 - New channel create/edit page ([#4445](https://github.com/lbryio/lbry-desktop/pull/4445))
 - Add dialog to copy various types of links for a claim _community pr!_ ([#4474](https://github.com/lbryio/lbry-desktop/pull/4474))
-- Add password reset link to settings page for logged in users _community pr!_ ([#4473](https://github.com/lbryio/lbry-desktop/pull/4473))
 
 ### Changed
 
diff --git a/static/app-strings.json b/static/app-strings.json
index d8ee1f53a..99eb2f49c 100644
--- a/static/app-strings.json
+++ b/static/app-strings.json
@@ -1252,10 +1252,6 @@
   "Old Password": "Old Password",
   "New Password": "New Password",
   "Set Password": "Set Password",
-  "Reset Your Password": "Reset Your Password",
-  "Reset Password": "Reset Password",
-  "Check your email for a link to reset your password.": "Check your email for a link to reset your password.",
-  "Email sent!": "Email sent!",  
   "App Notifications": "App Notifications",
   "Notification settings for the desktop app.": "Notification settings for the desktop app.",
   "Get notified when a publish or channel is confirmed.": "Get notified when a publish or channel is confirmed.",
diff --git a/ui/component/settingAccountPassword/view.jsx b/ui/component/settingAccountPassword/view.jsx
index 2a6b656bf..adf8a752d 100644
--- a/ui/component/settingAccountPassword/view.jsx
+++ b/ui/component/settingAccountPassword/view.jsx
@@ -4,7 +4,6 @@ import { FormField, Form } from 'component/common/form';
 import Button from 'component/button';
 import ErrorText from 'component/common/error-text';
 import Card from 'component/common/card';
-import UserPasswordReset from 'component/userPasswordReset';
 
 type Props = {
   user: ?User,
@@ -20,7 +19,6 @@ export default function SettingAccountPassword(props: Props) {
   const [oldPassword, setOldPassword] = useState('');
   const [newPassword, setNewPassword] = useState('');
   const [isAddingPassword, setIsAddingPassword] = useState(false);
-  const [forgotPassword, setForgotPassword] = useState(false);
   const hasPassword = user && user.password_set;
 
   function handleSubmit() {
@@ -46,44 +44,35 @@ export default function SettingAccountPassword(props: Props) {
       actions={
         isAddingPassword ? (
           <div>
-            {forgotPassword ? (
+            <Form onSubmit={handleSubmit} className="section">
+              {hasPassword && (
+                <FormField
+                  type="password"
+                  name="setting_set_old_password"
+                  label={__('Old Password')}
+                  value={oldPassword}
+                  onChange={e => setOldPassword(e.target.value)}
+                />
+              )}
+              <FormField
+                type="password"
+                name="setting_set_new_password"
+                label={__('New Password')}
+                value={newPassword}
+                onChange={e => setNewPassword(e.target.value)}
+              />
+
               <div className="section__actions">
-                <UserPasswordReset onCancel={() => setForgotPassword(false)} />
-              </div>
-            ) : (
-              <div>
-                <Form onSubmit={handleSubmit} className="section">
-                  {hasPassword && (
-                    <FormField
-                      type="password"
-                      name="setting_set_old_password"
-                      label={__('Old Password')}
-                      value={oldPassword}
-                      onChange={e => setOldPassword(e.target.value)}
-                    />
-                  )}
-                  <FormField
-                    type="password"
-                    name="setting_set_new_password"
-                    label={__('New Password')}
-                    value={newPassword}
-                    onChange={e => setNewPassword(e.target.value)}
-                  />
-                  <div className="section__actions">
-                    <Button button="primary" type="submit" label={__('Set Password')} disabled={!newPassword} />
-                    {hasPassword ? (
-                      <Button button="link" label={__('Forgot Password?')} onClick={() => setForgotPassword(true)} />
-                    ) : (
-                      <Button button="link" label={__('Cancel')} onClick={() => setIsAddingPassword(false)} />
-                    )}
-                  </div>
-                </Form>
-                {passwordSetError && (
-                  <div className="section">
-                    <ErrorText>{passwordSetError}</ErrorText>
-                  </div>
+                <Button button="primary" type="submit" label={__('Set Password')} disabled={!newPassword} />
+                {!hasPassword && (
+                  <Button button="link" label={__('Cancel')} onClick={() => setIsAddingPassword(false)} />
                 )}
               </div>
+            </Form>
+            {passwordSetError && (
+              <div className="section">
+                <ErrorText>{passwordSetError}</ErrorText>
+              </div>
             )}
           </div>
         ) : (
diff --git a/ui/component/userPasswordReset/view.jsx b/ui/component/userPasswordReset/view.jsx
index 11e72e923..626110ea6 100644
--- a/ui/component/userPasswordReset/view.jsx
+++ b/ui/component/userPasswordReset/view.jsx
@@ -20,7 +20,6 @@ type Props = {
   passwordResetSuccess: boolean,
   passwordResetError: ?string,
   emailToVerify: ?string,
-  onCancel?: () => void,
 };
 
 function UserPasswordReset(props: Props) {
@@ -33,7 +32,6 @@ function UserPasswordReset(props: Props) {
     doClearPasswordEntry,
     doClearEmailEntry,
     emailToVerify,
-    onCancel,
   } = props;
   const { push } = useHistory();
   const [email, setEmail] = React.useState(emailToVerify || '');
@@ -49,12 +47,7 @@ function UserPasswordReset(props: Props) {
     setEmail('');
     doClearPasswordEntry();
     doClearEmailEntry();
-
-    if (onCancel) {
-      onCancel();
-    } else {
-      push(`/$/${PAGES.AUTH_SIGNIN}`);
-    }
+    push(`/$/${PAGES.AUTH_SIGNIN}`);
   }
 
   React.useEffect(() => {