From c3334d09e4b76d2c76a52d414b2089c430c6bd5a Mon Sep 17 00:00:00 2001
From: William Grant <willmgrant@gmail.com>
Date: Wed, 17 Apr 2024 16:43:14 +1000
Subject: [PATCH] fix: improved check for disabling continue button

more human readable
---
 .../registration/stages/CreateAccount.tsx          |  5 +++--
 .../registration/stages/RestoreAccount.tsx         | 14 +++++++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/ts/components/registration/stages/CreateAccount.tsx b/ts/components/registration/stages/CreateAccount.tsx
index 79660badd..2b9bc6992 100644
--- a/ts/components/registration/stages/CreateAccount.tsx
+++ b/ts/components/registration/stages/CreateAccount.tsx
@@ -1,3 +1,4 @@
+import { isEmpty } from 'lodash';
 import { useDispatch } from 'react-redux';
 import { useMount } from 'react-use';
 import { SettingsKey } from '../../../data/settings-key';
@@ -86,7 +87,7 @@ export const CreateAccount = () => {
   });
 
   const signUpWithDetails = async () => {
-    if (!(!!displayName && !displayNameError)) {
+    if (isEmpty(displayName) || !isEmpty(displayNameError)) {
       return;
     }
 
@@ -145,7 +146,7 @@ export const CreateAccount = () => {
           buttonColor={SessionButtonColor.White}
           onClick={signUpWithDetails}
           text={window.i18n('continue')}
-          disabled={!(!!displayName && !displayNameError)}
+          disabled={isEmpty(displayName) || !isEmpty(displayNameError)}
           dataTestId="continue-button"
         />
       </Flex>
diff --git a/ts/components/registration/stages/RestoreAccount.tsx b/ts/components/registration/stages/RestoreAccount.tsx
index 503924885..1c1e45b48 100644
--- a/ts/components/registration/stages/RestoreAccount.tsx
+++ b/ts/components/registration/stages/RestoreAccount.tsx
@@ -1,4 +1,5 @@
 import { Dispatch } from '@reduxjs/toolkit';
+import { isEmpty } from 'lodash';
 import { useDispatch } from 'react-redux';
 import { ONBOARDING_TIMES } from '../../../session/constants';
 import { InvalidWordsError, NotEnoughWordsError } from '../../../session/crypto/mnemonic';
@@ -165,7 +166,12 @@ export const RestoreAccount = () => {
   };
 
   const recoverAndEnterDisplayName = async () => {
-    if (!(!!recoveryPassword && !recoveryPasswordError) || !(!!displayName && !displayNameError)) {
+    if (
+      isEmpty(recoveryPassword) ||
+      !isEmpty(recoveryPasswordError) ||
+      isEmpty(displayName) ||
+      !isEmpty(displayNameError)
+    ) {
       return;
     }
 
@@ -277,8 +283,10 @@ export const RestoreAccount = () => {
                   onClick={recoverAndEnterDisplayName}
                   text={window.i18n('continue')}
                   disabled={
-                    !(!!recoveryPassword && !recoveryPasswordError) ||
-                    !(!!displayName && !displayNameError)
+                    isEmpty(recoveryPassword) ||
+                    !isEmpty(recoveryPasswordError) ||
+                    isEmpty(displayName) ||
+                    !isEmpty(displayNameError)
                   }
                   dataTestId="continue-button"
                 />