From dcc17375b46d6cbc3678c0432cccd61ef707d253 Mon Sep 17 00:00:00 2001
From: SleeplessOne1917 <abias1122@gmail.com>
Date: Fri, 21 Jul 2023 15:20:27 -0400
Subject: [PATCH] Get rid of modal

---
 src/client/index.tsx                        |  1 -
 src/shared/components/community/sidebar.tsx | 58 +--------------------
 src/shared/components/home/login.tsx        |  3 --
 3 files changed, 1 insertion(+), 61 deletions(-)

diff --git a/src/client/index.tsx b/src/client/index.tsx
index ffe52ce8..6978c9c3 100644
--- a/src/client/index.tsx
+++ b/src/client/index.tsx
@@ -6,7 +6,6 @@ import { UserService } from "../shared/services";
 
 import "bootstrap/js/dist/collapse";
 import "bootstrap/js/dist/dropdown";
-import "bootstrap/js/dist/modal";
 
 async function startClient() {
   initializeSite(window.isoData.site_res);
diff --git a/src/shared/components/community/sidebar.tsx b/src/shared/components/community/sidebar.tsx
index bb800342..065377d0 100644
--- a/src/shared/components/community/sidebar.tsx
+++ b/src/shared/components/community/sidebar.tsx
@@ -161,7 +161,6 @@ export class Sidebar extends Component<SidebarProps, SidebarState> {
             </div>
           </section>
         </div>
-        {this.remoteFetchModal}
       </aside>
     );
   }
@@ -257,12 +256,7 @@ export class Sidebar extends Component<SidebarProps, SidebarState> {
 
     if (!UserService.Instance.myUserInfo) {
       return (
-        <button
-          type="button"
-          className="btn btn-secondary d-block mb-2 w-100"
-          data-bs-toggle="modal"
-          data-bs-target="#remoteFetchModal"
-        >
+        <button type="button" className="btn btn-secondary d-block mb-2 w-100">
           {I18NextService.i18n.t("subscribe")}
         </button>
       );
@@ -295,56 +289,6 @@ export class Sidebar extends Component<SidebarProps, SidebarState> {
     );
   }
 
-  get remoteFetchModal() {
-    return (
-      <div
-        className="modal fade"
-        id="remoteFetchModal"
-        tabIndex={-1}
-        aria-hidden={true}
-        aria-labelledby="#remoteFetchModalTitle"
-      >
-        <div className="modal-dialog modal-fullscreen-sm-down">
-          <div className="modal-content">
-            <header className="modal-header">
-              <h3 className="modal-title" id="remoteFetchModalTitle">
-                Subscribe from Remote Instance
-              </h3>
-              <button
-                type="button"
-                className="btn-close"
-                data-bs-dismiss="modal"
-                aria-label="Close"
-              />
-            </header>
-            <form className="modal-body d-flex flex-column justify-content-center">
-              <label className="form-label" htmlFor="remoteFetchInstance">
-                Enter the instance you would like to follow this community from
-              </label>
-              <input
-                type="text"
-                id="remoteFetchInstance"
-                className="form-control"
-              />
-            </form>
-            <footer className="modal-footer">
-              <button
-                type="button"
-                className="btn btn-secondary"
-                data-bs-dismiss="modal"
-              >
-                Close
-              </button>
-              <button type="button" className="btn btn-primary">
-                Save changes
-              </button>
-            </footer>
-          </div>
-        </div>
-      </div>
-    );
-  }
-
   blockCommunity() {
     const { subscribed, blocked } = this.props.community_view;
 
diff --git a/src/shared/components/home/login.tsx b/src/shared/components/home/login.tsx
index 929ed9d0..53a09096 100644
--- a/src/shared/components/home/login.tsx
+++ b/src/shared/components/home/login.tsx
@@ -60,9 +60,6 @@ async function handleLoginSubmit(i: Login, event: any) {
         const { hash, pathname, search } = (i.props.history.location.state ??
           {}) as Location;
 
-        console.log("Login state");
-        console.log(i.props.history.location.state);
-
         i.props.history.location.state
           ? i.props.history.replace({ hash, pathname, search })
           : i.props.history.action === "PUSH"