diff --git a/src/app/[locale]/faucet/_components/FaucetRequestButton.tsx b/src/app/[locale]/faucet/_components/FaucetRequestButton.tsx index 9effbaa..84301ef 100644 --- a/src/app/[locale]/faucet/_components/FaucetRequestButton.tsx +++ b/src/app/[locale]/faucet/_components/FaucetRequestButton.tsx @@ -15,8 +15,8 @@ import { useAccount } from "wagmi"; import { Backdrop } from "@/components/Backdrop"; import { ColoredText } from "@/components/ColoredText"; +import { useCaptcha } from "@/contexts/CaptchaProvider"; import { clientEnv } from "@/env-client"; -import { useFaucetInfoAndCaptcha } from "@/hooks/useFaucetInfoAndHCaptcha"; interface FaucetRequestButtonProps { onClick?: () => void; @@ -140,7 +140,7 @@ export const FaucetRequestButton: React.FC = ({ const [requestLoading, setRequestLoading] = useState(false); const [waitingForConnection, setWaitingForConnection] = useState(false); const hasAutoRequested = useRef(false); - const { hcaptchaLoaded, executeHCaptcha } = useFaucetInfoAndCaptcha(chainId); + const { isReady, executeHCaptcha } = useCaptcha(); const { isConnected } = useAccount(); const { openConnectModal } = useConnectModal(); const [tweetUrl, setTweetUrl] = useState(""); @@ -277,7 +277,7 @@ export const FaucetRequestButton: React.FC = ({ // If not rate limited, proceed with captcha verification let hcaptchaToken = undefined; - if (hcaptchaLoaded) { + if (isReady) { try { setIsHCaptchaVisible(true); @@ -351,7 +351,7 @@ export const FaucetRequestButton: React.FC = ({ isConnected, openConnectModal, onChange, - hcaptchaLoaded, + isReady, executeHCaptcha, tweetUrl, skipTweetPrompt, diff --git a/src/app/[locale]/layout.tsx b/src/app/[locale]/layout.tsx index 1c39013..d73f886 100644 --- a/src/app/[locale]/layout.tsx +++ b/src/app/[locale]/layout.tsx @@ -68,19 +68,6 @@ export default async function LocaleLayout({ /> -
diff --git a/src/app/[locale]/testnet-bridge/_components/Bridge.tsx b/src/app/[locale]/testnet-bridge/_components/Bridge.tsx index 74eba34..3a6f965 100644 --- a/src/app/[locale]/testnet-bridge/_components/Bridge.tsx +++ b/src/app/[locale]/testnet-bridge/_components/Bridge.tsx @@ -269,7 +269,7 @@ export function Bridge() { const renderNetworkError = () => { if (networkError) { return ( -
+
{networkError}
); @@ -482,7 +482,9 @@ export function Bridge() { )}
{error && ( - {error} + + {error} + )}
diff --git a/src/components/ConnectWalletButton.tsx b/src/components/ConnectWalletButton.tsx index 965c525..27b013f 100644 --- a/src/components/ConnectWalletButton.tsx +++ b/src/components/ConnectWalletButton.tsx @@ -78,7 +78,7 @@ export const ConnectWalletButton: React.FC = ({ } className={classNames( chain.unsupported && - "bg-red-500/15 hover:bg-red-500/25 dark:text-red-400", + "ink:text-status-error ink:bg-status-error-bg", shrinkOnMobile ? "sm:hidden" : "hidden", className )} @@ -94,7 +94,7 @@ export const ConnectWalletButton: React.FC = ({ } className={classNames( chain.unsupported && - "bg-red-500/15 hover:bg-red-500/25 dark:text-red-400", + "ink:text-status-error ink:bg-status-error-bg", shrinkOnMobile ? "hidden sm:block" : "", className )} diff --git a/src/components/ContactUsPrivacyButton.tsx b/src/components/ContactUsPrivacyButton.tsx index 6cc672e..3a912a0 100644 --- a/src/components/ContactUsPrivacyButton.tsx +++ b/src/components/ContactUsPrivacyButton.tsx @@ -1,7 +1,7 @@ "use client"; import React from "react"; -import { Button, useModalContext } from "@inkonchain/ink-kit"; +import { useModalContext } from "@inkonchain/ink-kit"; import { CONTACT_US_MODAL_KEY } from "./Modals/ContactUsModal"; diff --git a/src/components/FormStatus.tsx b/src/components/FormStatus.tsx index 3cc66d7..2847631 100644 --- a/src/components/FormStatus.tsx +++ b/src/components/FormStatus.tsx @@ -22,7 +22,7 @@ export const FormStatus: React.FC = ({
-

{errorMessage}

+
{errorMessage}
 )} diff --git a/src/components/Modals/AppSubmissionModal/_components/AppSubmissionForm.tsx b/src/components/Modals/AppSubmissionModal/_components/AppSubmissionForm.tsx index 0dd71bb..1d9906a 100644 --- a/src/components/Modals/AppSubmissionModal/_components/AppSubmissionForm.tsx +++ b/src/components/Modals/AppSubmissionModal/_components/AppSubmissionForm.tsx @@ -20,7 +20,6 @@ import { CategoryValue, TagValue, } from "@/schemas/app-submission-schema"; -import { classNames } from "@/util/classes"; interface AppSubmissionFormProps { form: UseFormReturn>; @@ -42,10 +41,10 @@ export const AppSubmissionForm: React.FC = ({ return ( {state?.message !== "" && !state.issues && ( -
{state.message}
+
{state.message}
)} {state?.issues && ( -
+
    {state.issues.map((issue, index) => (
  • @@ -189,18 +188,16 @@ export const AppSubmissionForm: React.FC = ({ ); }; -const SubmitButton: React.FC<{ isSubmitting: boolean }> = ({ - isSubmitting, -}) => ( +const SubmitButton: React.FC<{ + isSubmitting: boolean; +}> = ({ isSubmitting }) => ( // Not using "disabled" property as it seems to mess up the scroll position when submitting... // TODO: Figure out root cause of this weird behavior