From 125343808d4a9cb5854166eaf51c7cf7323d2752 Mon Sep 17 00:00:00 2001
From: Matthew Heller <hellergood@gmail.com>
Date: Wed, 26 Oct 2022 16:35:46 -0500
Subject: [PATCH] Fix display of auth modal. Re #2262. (#2265)

---
 web/components/modals/FediAuthModal/FediAuthModal.tsx   | 7 +------
 web/components/modals/IndieAuthModal/IndieAuthModal.tsx | 9 ++-------
 web/components/ui/Modal/Modal.tsx                       | 2 --
 web/styles/ant-overrides.scss                           | 4 +++-
 4 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/web/components/modals/FediAuthModal/FediAuthModal.tsx b/web/components/modals/FediAuthModal/FediAuthModal.tsx
index c7a06fbce..ec37a8e59 100644
--- a/web/components/modals/FediAuthModal/FediAuthModal.tsx
+++ b/web/components/modals/FediAuthModal/FediAuthModal.tsx
@@ -139,12 +139,7 @@ export const FediAuthModal: FC<FediAuthModalProps> = ({
         value={account}
         placeholder="youraccount@yourserver.com"
         status={!valid && account.length > 0 ? 'error' : undefined}
-        onPressEnter={submitAccountPressed}
-        enterButton={
-          <Button onClick={submitAccountPressed} disabled={!valid}>
-            Authenticate with Fediverse
-          </Button>
-        }
+        onSearch={submitAccountPressed}
       />
     </>
   );
diff --git a/web/components/modals/IndieAuthModal/IndieAuthModal.tsx b/web/components/modals/IndieAuthModal/IndieAuthModal.tsx
index 909447a77..afc7dd85f 100644
--- a/web/components/modals/IndieAuthModal/IndieAuthModal.tsx
+++ b/web/components/modals/IndieAuthModal/IndieAuthModal.tsx
@@ -1,4 +1,4 @@
-import { Alert, Button, Input, Space, Spin, Collapse, Typography } from 'antd';
+import { Alert, Input, Space, Spin, Collapse, Typography } from 'antd';
 import React, { FC, useState } from 'react';
 import isValidURL from '../../../utils/urls';
 
@@ -124,12 +124,7 @@ export const IndieAuthModal: FC<IndieAuthModalProps> = ({
           value={host}
           placeholder="yoursite.com"
           status={!valid && host.length > 0 ? 'error' : undefined}
-          onPressEnter={submitButtonPressed}
-          enterButton={
-            <Button onClick={submitButtonPressed} disabled={!valid}>
-              Authenticate with your domain
-            </Button>
-          }
+          onSearch={submitButtonPressed}
         />
 
         <Collapse ghost>
diff --git a/web/components/ui/Modal/Modal.tsx b/web/components/ui/Modal/Modal.tsx
index 99077e928..6a5d5e2b7 100644
--- a/web/components/ui/Modal/Modal.tsx
+++ b/web/components/ui/Modal/Modal.tsx
@@ -83,6 +83,4 @@ Modal.defaultProps = {
   handleOk: undefined,
   handleCancel: undefined,
   afterClose: undefined,
-  height: '40vh',
-  width: '70%',
 };
diff --git a/web/styles/ant-overrides.scss b/web/styles/ant-overrides.scss
index 08c52b930..84a87c2cd 100644
--- a/web/styles/ant-overrides.scss
+++ b/web/styles/ant-overrides.scss
@@ -118,7 +118,9 @@ DROPDOWN
 .ant-modal-title {
   color: var(--theme-color-components-modal-header-text);
 }
-
+.ant-modal-body {
+  overflow: scroll;
+}
 .ant-modal {
   color: var(--theme-color-components-text-on-light);
   h1 {