Skip to content

Commit d957d16

Browse files
fix(condo): DOMA-12838 fix linked cards display (#7181)
1 parent 6429afe commit d957d16

1 file changed

Lines changed: 13 additions & 1 deletion

File tree

apps/condo/domains/subscription/components/SubscriptionSettingsContent/SubscriptionPlanCard/SubscriptionPlanCard.tsx

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,19 @@ export const SubscriptionPlanCard: React.FC<SubscriptionPlanCardProps> = ({ plan
248248
pricingRuleId: price?.id || '',
249249
})
250250

251-
const contextPaymentMethodId = activeSubscriptionContext?.meta?.paymentMethod?.id
251+
const contextPaymentMethodId = useMemo(() => {
252+
const contextsWithSamePlan = activatedSubscriptions
253+
.filter(ctx => ctx?.subscriptionPlan?.id === plan?.id)
254+
.sort((a, b) => {
255+
const aEndAt = a?.endAt ? dayjs(a.endAt) : dayjs(0)
256+
const bEndAt = b?.endAt ? dayjs(b.endAt) : dayjs(0)
257+
return bEndAt.diff(aEndAt)
258+
})
259+
260+
const lastContext = contextsWithSamePlan[0]
261+
return lastContext?.meta?.paymentMethod?.id || null
262+
}, [activatedSubscriptions, plan?.id])
263+
252264
const { LinkedCardsModal, openModal: openLinkedCardsModal, hasPaymentMethod } = useLinkedCardsModal({
253265
activePaymentMethodId: contextPaymentMethodId,
254266
})

0 commit comments

Comments
 (0)