Skip to content

Revert "fix(payment): fix issue with Stripe OCS and store credits" #2720

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

Draft
animesh1987 wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Revert "fix(payment): fix issue with Stripe OCS and store credits" #2720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 0 additions & 9 deletions packages/stripe-integration/src/stripe-ocs/StripeOCSPaymentMethod.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,15 +263,6 @@ describe('when using Stripe OCS payment', () => {
expect(hidePaymentSubmitButtonMock).toHaveBeenCalledWith(method, false);
});

it('should not initialize method if payment not required', () => {
jest.spyOn(checkoutState.data, 'isPaymentDataRequired').mockReturnValue(false);

render(<PaymentMethodTest {...defaultProps} method={method} />);

expect(screen.queryByTestId('stripe-accordion-skeleton')).not.toBeInTheDocument();
expect(checkoutService.initializePayment).not.toHaveBeenCalled();
});

describe('# Stripe OCS accordion layout', () => {
it('should initialize with auto layout when isCustomChecklistItem is false', () => {
method = {
Expand Down
24 changes: 10 additions & 14 deletions packages/stripe-integration/src/stripe-ocs/StripeOCSPaymentMethod.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ const StripeOCSPaymentMethod: FunctionComponent<PaymentMethodProps> = ({
setValidationSchema,
} = paymentForm;
const instruments = checkoutState.data.getInstruments(method) || [];

const {
data: { getCheckout, isPaymentDataRequired },
statuses: { isLoadingInstruments },
Expand Down Expand Up @@ -149,20 +150,6 @@ const StripeOCSPaymentMethod: FunctionComponent<PaymentMethodProps> = ({
],
);

const initializeStripeCustomer = useCallback(
(options: CustomerInitializeOptions) => {
return checkoutService.initializeCustomer({
...options,
integrations: [createStripeLinkV2CustomerStrategy],
});
},
[checkoutService],
);

if (!isPaymentDataRequired()) {
return null;
}

const renderCustomOCSSectionStyles = () => (
<style>
{`
Expand All @@ -175,6 +162,15 @@ const StripeOCSPaymentMethod: FunctionComponent<PaymentMethodProps> = ({
`}
</style>
);
const initializeStripeCustomer = useCallback(
(options: CustomerInitializeOptions) => {
return checkoutService.initializeCustomer({
...options,
integrations: [createStripeLinkV2CustomerStrategy],
});
},
[checkoutService],
);

const renderCheckoutElementsForStripeOCSStyling = () => (
<div style={{ display: 'none' }}>
Expand Down