Skip to content

[NO QA] fix: Payment card authentication issues. #67290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blimpich merged 9 commits into from
Aug 12, 2025
Merged

[NO QA] fix: Payment card authentication issues. #67290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6e3febc
fix: Payment card authentication issues.
Krishna2323 Jul 28, 2025
737a095
add unit tests for CardSectionTest.tsx.
Krishna2323 Jul 31, 2025
ed5a196
fix ESLint.
Krishna2323 Jul 31, 2025
8069f1b
Merge branch 'Expensify:main' into krishna2323/issue/65681
Krishna2323 Aug 4, 2025
d6cd4b4
create separate files for platform-specific logic.
Krishna2323 Aug 4, 2025
dbf83bb
fix failing tests.
Krishna2323 Aug 4, 2025
398d349
add separate files for card section buttons.
Krishna2323 Aug 5, 2025
12d0968
remove CardSectionTest.
Krishna2323 Aug 6, 2025
6194a01
fix crash.
Krishna2323 Aug 8, 2025
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
6 changes: 3 additions & 3 deletions src/pages/settings/Subscription/CardSection/CardSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React, {useCallback, useEffect, useMemo, useState} from 'react';
import {View} from 'react-native';
import Button from '@components/Button';
import ConfirmModal from '@components/ConfirmModal';
import Icon from '@components/Icon';
import * as Expensicons from '@components/Icon/Expensicons';
Expand Down Expand Up @@ -33,6 +32,7 @@ import SubscriptionBillingBanner from './BillingBanner/SubscriptionBillingBanner
import TrialEndedBillingBanner from './BillingBanner/TrialEndedBillingBanner';
import TrialStartedBillingBanner from './BillingBanner/TrialStartedBillingBanner';
import CardSectionActions from './CardSectionActions';
import CardSectionButton from './CardSectionButton';
import CardSectionDataEmpty from './CardSectionDataEmpty';
import RequestEarlyCancellationMenuItem from './RequestEarlyCancellationMenuItem';
import type {BillingStatusResult} from './utils';
Expand Down Expand Up @@ -175,7 +175,7 @@ function CardSection() {

<View style={styles.mb3}>{isEmptyObject(defaultCard?.accountData) && <CardSectionDataEmpty />}</View>
{billingStatus?.isRetryAvailable !== undefined && (
<Button
<CardSectionButton
text={translate('subscription.cardSection.retryPaymentButton')}
isDisabled={isOffline || !billingStatus?.isRetryAvailable}
isLoading={subscriptionRetryBillingStatusPending}
Expand All @@ -185,7 +185,7 @@ function CardSection() {
/>
)}
{hasCardAuthenticatedError() && (
<Button
<CardSectionButton
text={translate('subscription.cardSection.authenticatePayment')}
isDisabled={isOffline || !billingStatus?.isAuthenticationRequired}
isLoading={subscriptionRetryBillingStatusPending}
Expand Down
8 changes: 8 additions & 0 deletions src/pages/settings/Subscription/CardSection/CardSectionButton/index.native.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import type {ButtonProps} from '@components/Button';

// eslint-disable-next-line @typescript-eslint/no-unused-vars
function CardSectionButton(_props: ButtonProps) {

@ZhenjaHorbach ZhenjaHorbach Aug 5, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will work too.

function CardSectionButton() {
    return null;
}

export default CardSectionButton;

return null;
}

export default CardSectionButton;
10 changes: 10 additions & 0 deletions src/pages/settings/Subscription/CardSection/CardSectionButton/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import React from 'react';
import type {ButtonProps} from '@components/Button';
import Button from '@components/Button';

function CardSectionButton(props: ButtonProps) {
// eslint-disable-next-line react/jsx-props-no-spreading
return <Button {...props} />;
}

export default CardSectionButton;
Loading