diff --git a/clients/banking/src/components/CardItemPhysicalDeliveryWizard.tsx b/clients/banking/src/components/CardItemPhysicalDeliveryWizard.tsx index 26311e344..901a8d69a 100644 --- a/clients/banking/src/components/CardItemPhysicalDeliveryWizard.tsx +++ b/clients/banking/src/components/CardItemPhysicalDeliveryWizard.tsx @@ -7,7 +7,6 @@ import { useRef, useState } from "react"; import { match } from "ts-pattern"; import { CompleteAddressInput } from "../graphql/partner"; import { t } from "../utils/i18n"; -import { useTgglFlag } from "../utils/tggl"; import { CardItemPhysicalChoosePinForm, CardItemPhysicalChoosePinFormRef, @@ -43,11 +42,7 @@ export const CardItemPhysicalDeliveryWizard = ({ const choosePinRef = useRef(null); const deliveryAddressRef = useRef(null); - const isChoosePinActive = useTgglFlag("account_contract_choose_pin_code_enabled").getOr(false); - const [step, setStep] = useState( - // if flag is inactive, default to not choosing PIN code - isChoosePinActive ? { name: "ChoosePin" } : { name: "Address", choosePin: false }, - ); + const [step, setStep] = useState({ name: "ChoosePin" }); return ( - - - - - )} + + + onPressClose()) .with({ name: "Address" }, () => { - if (isChoosePinActive) { - setStep({ name: "ChoosePin" }); - } else { - onPressClose(); - } + setStep({ name: "ChoosePin" }); }) .exhaustive(); }} diff --git a/clients/banking/src/components/CardWizardIndividualDelivery.tsx b/clients/banking/src/components/CardWizardIndividualDelivery.tsx index 0ee904da4..ab49a0180 100644 --- a/clients/banking/src/components/CardWizardIndividualDelivery.tsx +++ b/clients/banking/src/components/CardWizardIndividualDelivery.tsx @@ -22,7 +22,6 @@ import { } from "../graphql/partner"; import { getMemberName } from "../utils/accountMembership"; import { t } from "../utils/i18n"; -import { useTgglFlag } from "../utils/tggl"; import { validateAddressLine } from "../utils/validations"; import { Address, CardWizardAddressForm } from "./CardWizardAddressForm"; import { CardWizardChoosePinModal } from "./CardWizardChoosePinModal"; @@ -195,8 +194,6 @@ const CardWizardIndividualDeliveryWithAddress = forwardRef< export const CardWizardIndividualDelivery = forwardRef( ({ members, address, onSubmit }: Props, ref) => { - const isChoosePinActive = useTgglFlag("account_contract_choose_pin_code_enabled").getOr(false); - const [choosePinModal, setChoosePinModal] = useState>( Option.None(), ); @@ -209,11 +206,7 @@ export const CardWizardIndividualDelivery = forwardRef { - if (isChoosePinActive) { - setChoosePinModal(Option.Some(value)); - } else { - onSubmit(value); - } + setChoosePinModal(Option.Some(value)); }} /> ) : ( @@ -233,11 +226,7 @@ export const CardWizardIndividualDelivery = forwardRef