From fb38fafd169987c60a5ca210d3d0fb70aac68b96 Mon Sep 17 00:00:00 2001
From: SleeplessOne1917 <28871516+SleeplessOne1917@users.noreply.github.com>
Date: Sat, 13 Apr 2024 20:18:20 -0400
Subject: [PATCH] Fix modal bug

---
 src/shared/components/app/app.tsx             | 20 +++++++++++--------
 .../components/common/adult-consent-modal.tsx |  2 +-
 src/shared/components/home/site-form.tsx      |  2 +-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/shared/components/app/app.tsx b/src/shared/components/app/app.tsx
index c2238e4f..64d4b6b5 100644
--- a/src/shared/components/app/app.tsx
+++ b/src/shared/components/app/app.tsx
@@ -26,6 +26,10 @@ function handleAdultConsent(i: App) {
   i.setState({ showAdultConsentModal: false });
 }
 
+function handleAdultConsentGoBack(i: App) {
+  i.context.router.history.back();
+}
+
 export class App extends Component<any, AppState> {
   private isoData: IsoDataOptionalSite = setIsoData(this.context);
   private readonly mainContentRef: RefObject<HTMLElement>;
@@ -81,6 +85,14 @@ export class App extends Component<any, AppState> {
               <Theme defaultTheme={siteView.local_site.default_theme} />
             )}
             <Navbar siteRes={siteRes} />
+            {siteRes?.site_view.site.content_warning && (
+              <AdultConsentModal
+                contentWarning={siteRes.site_view.site.content_warning}
+                show={this.state.showAdultConsentModal}
+                onBack={linkEvent(this, handleAdultConsentGoBack)}
+                onContinue={linkEvent(this, handleAdultConsent)}
+              />
+            )}
             <div className="mt-4 p-0 fl-1">
               <Switch>
                 {routes.map(
@@ -140,14 +152,6 @@ export class App extends Component<any, AppState> {
             </div>
             <Footer site={siteRes} />
           </div>
-          {siteRes?.site_view.site.content_warning && (
-            <AdultConsentModal
-              contentWarning={siteRes.site_view.site.content_warning}
-              show={this.state.showAdultConsentModal}
-              onBack={history.back}
-              onContinue={linkEvent(this, handleAdultConsent)}
-            />
-          )}
         </Provider>
       </>
     );
diff --git a/src/shared/components/common/adult-consent-modal.tsx b/src/shared/components/common/adult-consent-modal.tsx
index 99a67efe..5a70d9e4 100644
--- a/src/shared/components/common/adult-consent-modal.tsx
+++ b/src/shared/components/common/adult-consent-modal.tsx
@@ -5,7 +5,7 @@ interface AdultConsentModalProps {
   contentWarning: string;
   show: boolean;
   onContinue: LinkedEvent<any, Event> | null;
-  onBack: () => void;
+  onBack: LinkedEvent<any, Event> | null;
 }
 
 @modalMixin
diff --git a/src/shared/components/home/site-form.tsx b/src/shared/components/home/site-form.tsx
index 5d67e078..d485d5f3 100644
--- a/src/shared/components/home/site-form.tsx
+++ b/src/shared/components/home/site-form.tsx
@@ -276,7 +276,7 @@ export class SiteForm extends Component<SiteFormProps, SiteFormState> {
             <div className="alert small alert-info" role="alert">
               <Icon icon="info" classes="icon-inline me-2" />
               Setting a content warning will display a prompt with the content
-              warning asking for their consent to continue.
+              warning asking the user for their consent to continue.
             </div>
             <label className="col-12 col-form-label">Content Warning</label>
             <div className="col-12">