diff --git a/src/components/SingleChoiceQuestion.tsx b/src/components/SingleChoiceQuestion.tsx
index c2dc72438e43..e52007850475 100644
--- a/src/components/SingleChoiceQuestion.tsx
+++ b/src/components/SingleChoiceQuestion.tsx
@@ -22,7 +22,7 @@ function SingleChoiceQuestion({prompt, errorText, possibleAnswers, currentQuesti
<>
{prompt}
diff --git a/src/pages/EnablePayments/EnablePayments.tsx b/src/pages/EnablePayments/EnablePayments.tsx
index 8bbf4d83726b..b8501551204a 100644
--- a/src/pages/EnablePayments/EnablePayments.tsx
+++ b/src/pages/EnablePayments/EnablePayments.tsx
@@ -40,7 +40,7 @@ function EnablePaymentsPage() {
return (
<>
Navigation.goBack(ROUTES.SETTINGS_WALLET)}
/>
diff --git a/src/pages/EnablePayments/IdologyQuestions.tsx b/src/pages/EnablePayments/IdologyQuestions.tsx
index 756965e961c8..b9b0ac4eca34 100644
--- a/src/pages/EnablePayments/IdologyQuestions.tsx
+++ b/src/pages/EnablePayments/IdologyQuestions.tsx
@@ -3,11 +3,14 @@ import {View} from 'react-native';
import FormProvider from '@components/Form/FormProvider';
import InputWrapper from '@components/Form/InputWrapper';
import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
+import Icon from '@components/Icon';
+import * as Expensicons from '@components/Icon/Expensicons';
import type {Choice} from '@components/RadioButtons';
import SingleChoiceQuestion from '@components/SingleChoiceQuestion';
import Text from '@components/Text';
import TextLink from '@components/TextLink';
import useLocalize from '@hooks/useLocalize';
+import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
import * as BankAccounts from '@userActions/BankAccounts';
import CONST from '@src/CONST';
@@ -34,6 +37,7 @@ type Answer = {
function IdologyQuestions({questions, idNumber}: IdologyQuestionsProps) {
const styles = useThemeStyles();
+ const theme = useTheme();
const {translate} = useLocalize();
const [currentQuestionIndex, setCurrentQuestionIndex] = useState(0);
@@ -103,13 +107,7 @@ function IdologyQuestions({questions, idNumber}: IdologyQuestionsProps) {
return (
- {translate('additionalDetailsStep.helpTextIdologyQuestions')}
-
- {translate('additionalDetailsStep.helpLink')}
-
+ {translate('additionalDetailsStep.helpTextIdologyQuestions')}
- {
- chooseAnswer(String(value));
- }}
- onInputChange={() => {}}
- />
+ <>
+ {
+ chooseAnswer(String(value));
+ }}
+ onInputChange={() => {}}
+ />
+
+
+
+ {translate('additionalDetailsStep.helpLink')}
+
+
+ >
);
diff --git a/src/pages/EnablePayments/PersonalInfo/PersonalInfo.tsx b/src/pages/EnablePayments/PersonalInfo/PersonalInfo.tsx
index 0162fb311a19..55d369b4a2c5 100644
--- a/src/pages/EnablePayments/PersonalInfo/PersonalInfo.tsx
+++ b/src/pages/EnablePayments/PersonalInfo/PersonalInfo.tsx
@@ -10,6 +10,7 @@ import useSubStep from '@hooks/useSubStep';
import type {SubStepProps} from '@hooks/useSubStep/types';
import useThemeStyles from '@hooks/useThemeStyles';
import {parsePhoneNumber} from '@libs/PhoneNumber';
+import IdologyQuestions from '@pages/EnablePayments/IdologyQuestions';
import getInitialSubstepForPersonalInfo from '@pages/EnablePayments/utils/getInitialSubstepForPersonalInfo';
import getSubstepValues from '@pages/EnablePayments/utils/getSubstepValues';
import * as Wallet from '@userActions/Wallet';
@@ -41,6 +42,7 @@ const bodyContent: Array> = [FullName, DateOfB
function PersonalInfoPage({walletAdditionalDetails, walletAdditionalDetailsDraft}: PersonalInfoPageProps) {
const {translate} = useLocalize();
const styles = useThemeStyles();
+ const showIdologyQuestions = walletAdditionalDetails?.questions && walletAdditionalDetails?.questions.length > 0;
const values = useMemo(() => getSubstepValues(PERSONAL_INFO_STEP_KEYS, walletAdditionalDetailsDraft, walletAdditionalDetails), [walletAdditionalDetails, walletAdditionalDetailsDraft]);
const submit = () => {
@@ -84,6 +86,10 @@ function PersonalInfoPage({walletAdditionalDetails, walletAdditionalDetailsDraft
Wallet.updateCurrentStep(CONST.WALLET.STEP.ADD_BANK_ACCOUNT);
return;
}
+ if (showIdologyQuestions) {
+ Wallet.setAdditionalDetailsQuestions(null, '');
+ return;
+ }
prevScreen();
};
@@ -102,11 +108,18 @@ function PersonalInfoPage({walletAdditionalDetails, walletAdditionalDetailsDraft
stepNames={CONST.WALLET.STEP_NAMES}
/>
-
+ {showIdologyQuestions ? (
+
+ ) : (
+
+ )}
);
}