fix e2e tests

dzonidoo · Sep 9, 2024 · afca42c · afca42c
1 parent e42dde0
commit afca42c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/assets/ui/components/ToolTip.tsx b/assets/ui/components/ToolTip.tsx
@@ -32,7 +32,7 @@ export class ToolTip extends React.PureComponent<any, any> {
                 const options: Partial<Tooltip.Options> = {
                     trigger: 'hover',
                     placement: this.props.placement || 'top',
-                    title: this.props.title,
+                    title: this.props.title ?? '',
                 };
 
                 if (this.props.title) {

diff --git a/assets/users/components/EditUser.tsx b/assets/users/components/EditUser.tsx
@@ -461,15 +461,18 @@ const EditUserComponent: React.ComponentType<IProps> = (props: IProps) => {
                     </div>
 
                     <div className='list-item__preview-footer'>
-                        {!user.is_validated || isCompanyAdmin ? null : (
-                            <Button
-                                value={gettext('Reset Password')}
-                                variant='secondary'
-                                id='resetPassword'
-                                onClick={onResetPassword}
-                                data-test-id='reset-password-btn'
-                            />
-                        )}
+                        {!user.is_validated || isCompanyAdmin || userAuthProviderFeatures.verify_email === false
+                            ? null
+                            : (
+                                <Button
+                                    value={gettext('Reset Password')}
+                                    variant='secondary'
+                                    id='resetPassword'
+                                    onClick={onResetPassword}
+                                    data-test-id='reset-password-btn'
+                                />
+                            )
+                        }
                         {user._id && (currentUserIsAdmin || isCompanyAdmin) && user._id !== currentUser._id && (
                             <Button
                                 value={gettext('Delete')}