diff --git a/dapp/src/pages/AccessPage/index.tsx b/dapp/src/pages/AccessPage/index.tsx index 41acf7020..ec53dfbcf 100644 --- a/dapp/src/pages/AccessPage/index.tsx +++ b/dapp/src/pages/AccessPage/index.tsx @@ -1,15 +1,19 @@ import React from "react" import { useAppNavigate } from "#/hooks" import GateModal from "#/components/GateModal" +import { featureFlags } from "#/constants" +import { Navigate } from "react-router-dom" export default function AccessPage() { const navigate = useAppNavigate() - return ( + return featureFlags.GATING_DAPP_ENABLED ? ( { navigate("/dashboard") }} /> + ) : ( + ) } diff --git a/dapp/src/pages/AccessPage/loader.ts b/dapp/src/pages/AccessPage/loader.ts index 339818370..4710f722d 100644 --- a/dapp/src/pages/AccessPage/loader.ts +++ b/dapp/src/pages/AccessPage/loader.ts @@ -1,12 +1,26 @@ +import { featureFlags } from "#/constants" import { getAccessCodeFromLocalStorage } from "#/hooks/useAccessCode" import { acreApi, router, shouldDisplayWelcomeModal } from "#/utils" import { LoaderFunction } from "react-router-dom" +const resolveSuccessRedirect = ( + url: string, + redirectToOnSuccess: null | string = null, +) => + shouldDisplayWelcomeModal() + ? router.redirectWithSearchParams(url, "/welcome") + : !redirectToOnSuccess || + router.redirectWithSearchParams(url, redirectToOnSuccess) + export const redirectToAccessPageLoader = async ( url: string, redirectToOnSuccess: null | string = null, redirectToOnFail: null | string = null, ) => { + if (!featureFlags.GATING_DAPP_ENABLED) { + return resolveSuccessRedirect(url, redirectToOnSuccess) + } + try { const encodedCode = getAccessCodeFromLocalStorage() @@ -15,12 +29,7 @@ export const redirectToAccessPageLoader = async ( : false if (isValid) { - const shouldRedirectToWelcomeModal = shouldDisplayWelcomeModal() - - return shouldRedirectToWelcomeModal - ? router.redirectWithSearchParams(url, "/welcome") - : !redirectToOnSuccess || - router.redirectWithSearchParams(url, redirectToOnSuccess) + return resolveSuccessRedirect(url, redirectToOnSuccess) } return redirectToOnFail diff --git a/dapp/src/router/index.tsx b/dapp/src/router/index.tsx index ead4161cb..ef9b42bf5 100644 --- a/dapp/src/router/index.tsx +++ b/dapp/src/router/index.tsx @@ -20,9 +20,7 @@ const mainLayoutLoader: LoaderFunction = ({ request }) => { const embedApp = referralProgram.getEmbeddedApp(request.url) if (referralProgram.isEmbedApp(embedApp)) { - const shouldRedirectToWelcomeModal = !shouldDisplayWelcomeModal() - - return shouldRedirectToWelcomeModal + return shouldDisplayWelcomeModal() ? routerUtils.redirectWithSearchParams(request.url, "/welcome") : routerUtils.redirectWithSearchParams(request.url, "/dashboard") }