Fixed login mode change on registration page visit #831 (#871)

bitshares · Dec 15, 2017 · c303100 · c303100
1 parent 0992baf
commit c303100
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/app/components/Account/CreateAccountPassword.jsx b/app/components/Account/CreateAccountPassword.jsx
@@ -49,10 +49,12 @@ class CreateAccountPassword extends React.Component {
     }
 
     componentWillMount() {
-        SettingsActions.changeSetting({
-            setting: "passwordLogin",
-            value: true
-        });
+        if (!WalletDb.getWallet()) {
+            SettingsActions.changeSetting({
+                setting: "passwordLogin",
+                value: true
+            });
+        }
     }
 
     componentDidMount() {
@@ -95,6 +97,12 @@ class CreateAccountPassword extends React.Component {
     }
 
     _unlockAccount(name, password) {
+
+        SettingsActions.changeSetting({
+                setting: "passwordLogin",
+                value: true
+        });
+
         WalletDb.validatePassword(password, true, name);
         WalletUnlockActions.checkLock.defer();
     }