From 64cce966a2a9535c4eaa1ca3827acef52889407e Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 11 May 2022 14:50:53 -0500
Subject: [PATCH] Simplify signup routing

---
 app/soapbox/containers/soapbox.tsx            | 25 ++++++++++++++++---
 .../public_layout/components/header.tsx       |  2 +-
 .../components/modals/landing-page-modal.tsx  |  2 +-
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/app/soapbox/containers/soapbox.tsx b/app/soapbox/containers/soapbox.tsx
index 500a7b67d..7386db1b6 100644
--- a/app/soapbox/containers/soapbox.tsx
+++ b/app/soapbox/containers/soapbox.tsx
@@ -86,6 +86,7 @@ const SoapboxMount = () => {
   const [isSystemDarkMode, setSystemDarkMode] = useState(colorSchemeQueryList.matches);
   const userTheme = settings.get('themeMode');
   const darkMode = userTheme === 'dark' || (userTheme === 'system' && isSystemDarkMode);
+  const pepeEnabled = soapboxConfig.getIn(['extensions', 'pepe', 'enabled']) === true;
 
   const themeCss = generateThemeCss(soapboxConfig);
 
@@ -171,20 +172,38 @@ const SoapboxMount = () => {
               <Switch>
                 <Redirect from='/v1/verify_email/:token' to='/verify/email/:token' />
 
-                {waitlisted && <Route render={(props) => <WaitlistPage {...props} account={account} />} />}
+                {/* Redirect signup route depending on Pepe enablement. */}
+                {/* We should prefer using /signup in components. */}
+                {pepeEnabled ? (
+                  <Redirect from='/signup' to='/verify' />
+                ): (
+                  <Redirect from='/verify' to='/signup' />
+                )}
+
+                {waitlisted && (
+                  <Route render={(props) => <WaitlistPage {...props} account={account} />} />
+                )}
 
                 {!me && (singleUserMode
                   ? <Redirect exact from='/' to={`/${singleUserMode}`} />
                   : <Route exact path='/' component={PublicLayout} />)}
 
-                {!me && <Route exact path='/' component={PublicLayout} />}
+                {!me && (
+                  <Route exact path='/' component={PublicLayout} />
+                )}
+
                 <Route exact path='/about/:slug?' component={PublicLayout} />
                 <Route exact path='/mobile/:slug?' component={PublicLayout} />
                 <Route path='/login' component={AuthLayout} />
+
                 {(features.accountCreation && instance.registrations) && (
                   <Route exact path='/signup' component={AuthLayout} />
                 )}
-                <Route path='/verify' component={AuthLayout} />
+
+                {pepeEnabled && (
+                  <Route path='/verify' component={AuthLayout} />
+                )}
+
                 <Route path='/reset-password' component={AuthLayout} />
                 <Route path='/edit-password' component={AuthLayout} />
                 <Route path='/invite/:token' component={AuthLayout} />
diff --git a/app/soapbox/features/public_layout/components/header.tsx b/app/soapbox/features/public_layout/components/header.tsx
index 63e03c472..448de77f7 100644
--- a/app/soapbox/features/public_layout/components/header.tsx
+++ b/app/soapbox/features/public_layout/components/header.tsx
@@ -104,7 +104,7 @@ const Header = () => {
 
                 {(isOpen || pepeEnabled && pepeOpen) && (
                   <Button
-                    to={pepeEnabled ? '/verify' : '/signup'}
+                    to='/signup'
                     theme='primary'
                   >
                     {intl.formatMessage(messages.register)}
diff --git a/app/soapbox/features/ui/components/modals/landing-page-modal.tsx b/app/soapbox/features/ui/components/modals/landing-page-modal.tsx
index 583a1a144..78998d476 100644
--- a/app/soapbox/features/ui/components/modals/landing-page-modal.tsx
+++ b/app/soapbox/features/ui/components/modals/landing-page-modal.tsx
@@ -47,7 +47,7 @@ const LandingPageModal: React.FC<ILandingPageModal> = ({ onClose }) => {
           </Button>
 
           {(isOpen || pepeEnabled && pepeOpen) && (
-            <Button to={pepeEnabled ? '/verify' : '/signup'} theme='primary' block>
+            <Button to='/signup' theme='primary' block>
               {intl.formatMessage(messages.register)}
             </Button>
           )}