Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export function PaymentMethodManagement({
useState(false);
const [isNonCardSelected, setIsNonCardSelected] = useState(false);
const [hideOverflow, setHideOverflow] = useState(true);
const [hasPaymentMethod, setHasPaymentMethod] = useState(false);

const handleReady = () => {
setIsReady(true);
Expand All @@ -62,11 +63,19 @@ export function PaymentMethodManagement({
) => {
setIsComplete(event.complete);
setError(null);
setHasPaymentMethod(!!event.value.payment_method);

if (event.value.type !== 'card') {
setIsNonCardSelected(true);
setIsInputNewCardDetails(false);
setHasFullNameError(false);
if (!!event.value.payment_method) {
if (event.value.payment_method.id !== defaultPaymentMethodId) {
setIsNonDefaultCardSelected(true);
} else {
setIsNonDefaultCardSelected(false);
}
}
return;
}
setIsNonCardSelected(false);
Expand Down Expand Up @@ -271,7 +280,7 @@ export function PaymentMethodManagement({
</Form.Message>
)}
</Form.Field>
{(isInputNewCardDetails || isNonCardSelected) && (
{(isInputNewCardDetails || (isNonCardSelected && !hasPaymentMethod)) && (
<div className="flex flex-row justify-center pt-4">
<Form.Submit asChild>
<BaseButton
Expand Down