Skip to content

Commit ffb8980

Browse files
committed
Fix show Givex generic error
1 parent f257d32 commit ffb8980

File tree

2 files changed

+17
-6
lines changed

2 files changed

+17
-6
lines changed

packages/react-components/src/components/payment_source/AdyenPayment.tsx

+12-5
Original file line numberDiff line numberDiff line change
@@ -320,14 +320,21 @@ export function AdyenPayment({
320320
const refusalReasonCode =
321321
// @ts-expect-error no type
322322
firstAuthorization?.payment_response?.refusalReasonCode
323+
// @ts-expect-error no type
324+
const errorCode = firstAuthorization?.payment_response?.errorCode
323325
if (
324-
["Cancelled", "Refused"].includes(resultCode) &&
325-
refusalReasonCode !== "12"
326+
(["Cancelled", "Refused"].includes(resultCode) &&
327+
refusalReasonCode !== "12") ||
328+
errorCode
326329
) {
327-
// @ts-expect-error no type
328-
const message = firstAuthorization?.payment_response?.refusalReason
330+
const message =
331+
// @ts-expect-error no type
332+
firstAuthorization?.payment_response?.refusalReason ??
333+
// @ts-expect-error no type
334+
firstAuthorization?.payment_response?.message
335+
329336
return {
330-
resultCode,
337+
resultCode: errorCode ? "Refused" : resultCode,
331338
message,
332339
}
333340
}

packages/react-components/src/utils/adyen/manageGiftCard.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,14 @@ export function manageGiftCard({ order }: Props): ReturnTypes | null {
2424
? order.payment_source
2525
: null
2626
if (!getPaymentSource) return null
27+
const errorCode =
28+
// @ts-expect-error No type for payment_response errorCode
29+
getPaymentSource?.payment_response?.errorCode
30+
if (errorCode) return null
2731
const refusalReasonCode =
2832
// @ts-expect-error No type for payment_response refusalReasonCode
2933
getPaymentSource?.payment_response?.refusalReasonCode
30-
if (refusalReasonCode === "8") return null
34+
if (refusalReasonCode !== "12") return null
3135
const isGiftCard =
3236
// @ts-expect-error No type for payment_request_data
3337
getPaymentSource?.payment_request_data?.payment_method?.type === "giftcard"

0 commit comments

Comments
 (0)