From 3f6d589e9319814ded11d23e4fd374b6c766f8f7 Mon Sep 17 00:00:00 2001
From: danidfra <danielfilemondev@gmail.com>
Date: Thu, 10 Oct 2024 17:28:56 -0300
Subject: [PATCH] Using captcha_solved

---
 src/api/hooks/captcha/useCaptcha.ts                       | 2 --
 .../ui/components/modals/captcha-modal/captcha-modal.tsx  | 8 +-------
 .../modals/nostr-signup-modal/steps/keygen-step.tsx       | 2 --
 src/init/soapbox-mount.tsx                                | 7 +++++++
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/api/hooks/captcha/useCaptcha.ts b/src/api/hooks/captcha/useCaptcha.ts
index 8f891e6c9..8085376db 100644
--- a/src/api/hooks/captcha/useCaptcha.ts
+++ b/src/api/hooks/captcha/useCaptcha.ts
@@ -3,7 +3,6 @@ import { useEffect, useState } from 'react';
 import { defineMessages, useIntl } from 'react-intl';
 
 import { closeModal } from 'soapbox/actions/modals';
-import { startOnboarding } from 'soapbox/actions/onboarding';
 import { useApi, useAppDispatch, useInstance } from 'soapbox/hooks';
 import { captchaSchema, type CaptchaData } from 'soapbox/schemas/captcha';
 import toast from 'soapbox/toast';
@@ -73,7 +72,6 @@ const useCaptcha = () => {
 
           dispatch(closeModal('CAPTCHA'));
           toast.success(messages.sucessMessage);
-          dispatch(startOnboarding());
         });
       } catch (e) {
         setTryAgain(true);
diff --git a/src/features/ui/components/modals/captcha-modal/captcha-modal.tsx b/src/features/ui/components/modals/captcha-modal/captcha-modal.tsx
index b6d010ad4..b84e78c04 100644
--- a/src/features/ui/components/modals/captcha-modal/captcha-modal.tsx
+++ b/src/features/ui/components/modals/captcha-modal/captcha-modal.tsx
@@ -1,9 +1,7 @@
 import React from 'react';
 import { FormattedMessage } from 'react-intl';
 
-import { startOnboarding } from 'soapbox/actions/onboarding';
 import { Modal, Stack } from 'soapbox/components/ui';
-import { useAppDispatch } from 'soapbox/hooks';
 
 import Captcha from './captcha';
 
@@ -12,13 +10,9 @@ interface ICaptchaModal {
 }
 
 const CaptchaModal: React.FC<ICaptchaModal> = ({ onClose }) => {
-  const dispatch = useAppDispatch();
   return (
     <Modal
-      title={<FormattedMessage id='nostr_signup.captcha_title' defaultMessage='Human Verification' />} onClose={() => {
-        onClose();
-        dispatch(startOnboarding());
-      }} width='sm'
+      title={<FormattedMessage id='nostr_signup.captcha_title' defaultMessage='Human Verification' />} width='sm'
     >
       <Stack justifyContent='center' alignItems='center' space={4}>
         <Captcha />
diff --git a/src/features/ui/components/modals/nostr-signup-modal/steps/keygen-step.tsx b/src/features/ui/components/modals/nostr-signup-modal/steps/keygen-step.tsx
index 9c90a8a98..1d6274ce8 100644
--- a/src/features/ui/components/modals/nostr-signup-modal/steps/keygen-step.tsx
+++ b/src/features/ui/components/modals/nostr-signup-modal/steps/keygen-step.tsx
@@ -3,7 +3,6 @@ import React, { useEffect, useMemo, useState } from 'react';
 import { FormattedMessage } from 'react-intl';
 
 import { fetchAccount } from 'soapbox/actions/accounts';
-import { openModal } from 'soapbox/actions/modals';
 import { logInNostr } from 'soapbox/actions/nostr';
 import { closeSidebar } from 'soapbox/actions/sidebar';
 import CopyableInput from 'soapbox/components/copyable-input';
@@ -72,7 +71,6 @@ const KeygenStep: React.FC<IKeygenStep> = ({ onClose }) => {
       dispatch(closeSidebar());
     }
 
-    await dispatch(openModal('CAPTCHA'));
   };
 
   return (
diff --git a/src/init/soapbox-mount.tsx b/src/init/soapbox-mount.tsx
index 1b7ba320e..49bed38cc 100644
--- a/src/init/soapbox-mount.tsx
+++ b/src/init/soapbox-mount.tsx
@@ -35,11 +35,18 @@ const SoapboxMount = () => {
 
   const soapboxConfig = useSoapboxConfig();
 
+  const showCaptcha = account && !account?.source?.ditto.captcha_solved;
   const needsOnboarding = useAppSelector(state => state.onboarding.needsOnboarding);
   const showOnboarding = account && needsOnboarding;
+
+  if (showCaptcha) {
+    dispatch(openModal('CAPTCHA'));
+  }
+
   if (showOnboarding) {
     dispatch(openModal('ONBOARDING_FLOW'));
   }
+  
   const { redirectRootNoLogin, gdpr } = soapboxConfig;
 
   // @ts-ignore: I don't actually know what these should be, lol