Revert "update frontend to work with new api return (#1830)" (#1831)

This reverts commit a2a795ae77.
This commit is contained in:
mayeaux 2022-07-12 17:54:15 +02:00 committed by GitHub
parent dde9f07ed9
commit 4bc5d25d5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -526,35 +526,31 @@ const OdyseeMembershipPage = (props: Props) => {
<> <>
{/* dont show a monthly Premium membership option (yearly only) */} {/* dont show a monthly Premium membership option (yearly only) */}
{!( {!(
price.StripePrice.recurring.interval === 'month' && price.recurring.interval === 'month' &&
membershipOption.Membership.name === 'Premium' membershipOption.Membership.name === 'Premium'
) && ( ) && (
<> <>
{price.StripePrice.currency === currencyToUse && ( {price.currency === currencyToUse && (
<div> <div>
<h4 className="membership_info"> <h4 className="membership_info">
<b>{__('Interval')}:</b>{' '} <b>{__('Interval')}:</b> {convertIntervalVariableToString(price)}
{convertIntervalVariableToString(price.StripePrice)}
</h4> </h4>
<h4 className="membership_info"> <h4 className="membership_info">
<b>{__('Price')}:</b> {buildCurrencyDisplay(price.StripePrice)} <b>{__('Price')}:</b> {buildCurrencyDisplay(price)}
{price.StripePrice.unit_amount / 100}/ {price.unit_amount / 100}/{capitalizedInterval(price.recurring.interval)}
{capitalizedInterval(price.StripePrice.recurring.interval)}
</h4> </h4>
<Button <Button
button="primary" button="primary"
onClick={(e) => onClick={(e) => purchaseMembership(e, membershipOption, price)}
purchaseMembership(e, membershipOption, price.StripePrice)
}
membership-id={membershipOption.Membership.id} membership-id={membershipOption.Membership.id}
membership-subscription-period={membershipOption.Membership.type} membership-subscription-period={membershipOption.Membership.type}
price-id={price.StripePrice.id} price-id={price.id}
className="membership_button" className="membership_button"
label={__('Join via %interval% membership', { label={__('Join via %interval% membership', {
interval: price.StripePrice.recurring.interval, interval: price.recurring.interval,
})} })}
icon={ICONS.FINANCE} icon={ICONS.FINANCE}
interval={price.StripePrice.recurring.interval} interval={price.recurring.interval}
plan={membershipOption.Membership.name} plan={membershipOption.Membership.name}
/> />
</div> </div>