feat: disable default setup option if no proxies set, remove extension help on OK

This commit is contained in:
qtchaos 2024-02-26 13:48:45 +02:00
parent 0a86c59cfb
commit 1df0ac000d
No known key found for this signature in database
GPG Key ID: 7DA98B2B9EF06A90
2 changed files with 29 additions and 25 deletions

View File

@ -13,6 +13,7 @@ import {
} from "@/pages/onboarding/onboardingHooks";
import { Card, CardContent, Link } from "@/pages/onboarding/utils";
import { PageTitle } from "@/pages/parts/util/PageTitle";
import { getProxyUrls } from "@/utils/proxyUrls";
function VerticalLine(props: { className?: string }) {
return (
@ -27,6 +28,7 @@ export function OnboardingPage() {
const skipModal = useModal("skip");
const { completeAndRedirect } = useRedirectBack();
const { t } = useTranslation();
const noProxies = getProxyUrls().length === 0;
return (
<MinimalPageLayout>
@ -85,32 +87,34 @@ export function OnboardingPage() {
</CardContent>
</Card>
</div>
<p className="text-center hidden md:block mt-12">
<Trans i18nKey="onboarding.start.options.default.text">
<br />
<a
onClick={skipModal.show}
type="button"
className="text-onboarding-link hover:opacity-75 cursor-pointer"
/>
</Trans>
</p>
<div className=" max-w-[300px] mx-auto md:hidden mt-12 ">
<Button
className="!text-type-text !bg-opacity-50"
theme="secondary"
onClick={skipModal.show}
>
<span>
{noProxies ? null : (
<>
<p className="text-center hidden md:block mt-12">
<Trans i18nKey="onboarding.start.options.default.text">
<span />
<span />
<br />
<a
onClick={skipModal.show}
type="button"
className="text-onboarding-link hover:opacity-75 cursor-pointer"
/>
</Trans>
</span>
</Button>
</div>
</p>
<div className=" max-w-[300px] mx-auto md:hidden mt-12 ">
<Button
className="!text-type-text !bg-opacity-50"
theme="secondary"
onClick={skipModal.show}
>
<span>
<Trans i18nKey="onboarding.start.options.default.text">
<span />
<span />
</Trans>
</span>
</Button>
</div>
</>
)}
</CenterContainer>
</MinimalPageLayout>
);

View File

@ -115,7 +115,7 @@ export function ExtensionStatus(props: {
</div>
</Card>
{lastKnownStatus === "unknown" ? <RefreshBar /> : null}
{props.showHelp ? (
{props.showHelp && props.status !== "success" ? (
<Card className="mt-4">
<div className="flex items-center space-x-7">
<Icon icon={Icons.WARNING} className="text-type-danger text-2xl" />