@akinon/pz-saved-card 2.0.0-beta.9 → 2.0.1

package/CHANGELOG.md

@@ -1,45 +1,153 @@
 # @akinon/pz-saved-card
 
-## 2.0.0-beta.9
+## 2.0.1
+
+## 2.0.0
+
+## 2.0.0-beta.27
+
+## 2.0.0-beta.26
+
+## 2.0.0-beta.25
+
+## 2.0.0-beta.24
+
+## 2.0.0-beta.23
+
+## 2.0.0-beta.22
+
+## 2.0.0-beta.21
+
+## 2.0.0-beta.20
+
+## 1.126.0
+
+## 1.125.2
+
+## 1.125.1
+
+## 1.125.0
+
+## 1.124.0
+
+## 1.123.0
+
+## 1.122.0
+
+## 1.121.0
+
+## 1.120.0
+
+### Minor Changes
+
+- 6ad72e8d: ZERO-4032: Add loading state management for payment submissions across multiple components and add safe guarding
+
+## 1.119.0
+
+## 1.118.0
+
+## 1.117.0
+
+## 1.116.0
+
+## 1.115.0
+
+## 1.114.0
+
+## 1.113.0
+
+## 1.112.0
+
+## 1.111.0
+
+## 1.110.0
+
+## 1.109.0
+
+## 1.108.0
+
+## 1.107.0
 
 ### Minor Changes
 
-- 0fe7711: ZERO-3387: Upgrade nextjs, eslint-config-next
+- 4ca44c78: ZERO-3634: add register_consumer_card
+- 6bfbdc27: ZERO-3653: optimize saved card option
+- 5b500797: ZERO-3634: iyzico saved card
+- 9442cf01: ZERO-3653: make the register_consumer_card option optional
 
-## 2.0.0-beta.8
+## 1.106.0
 
-## 2.0.0-beta.7
+## 1.105.0
 
-## 2.0.0-beta.6
+## 1.104.0
+
+## 1.103.0
+
+## 1.102.0
+
+## 1.101.0
+
+## 1.100.0
+
+## 1.99.0
 
 ### Minor Changes
 
-- 8f05f9b: ZERO-3250: Beta branch synchronized with Main branch
+- d58538b: ZERO-3638: Enhance RC pipeline: add fetch, merge, and pre-release setup with conditional commit
+
+## 1.98.0
+
+## 1.97.0
 
-## 2.0.0-beta.5
+## 1.96.0
 
-## 2.0.0-beta.4
+## 1.95.0
 
-## 2.0.0-beta.3
+## 1.94.0
 
-## 2.0.0-beta.2
+## 1.93.0
+
+## 1.92.0
+
+## 1.91.0
+
+## 1.90.0
+
+## 1.89.0
 
 ### Minor Changes
 
-- a006015: ZERO-3116: Add not-found page and update default middleware.
-- 1eeb3d8: ZERO-3116: Add not found page
+- e2026ec: ZERO-3353: add missing test ids for e2e test
+
+## 1.88.0
+
+## 1.87.0
+
+## 1.86.0
 
-## 2.0.0-beta.1
+## 1.85.0
+
+## 1.84.0
 
 ### Minor Changes
 
-- ZERO-3091: Upgrade Next.js to v15 and React to v19
+- 624a4eb: ZERO-3276: Update installation instructions across multiple README files to standardize format and improve clarity
+
+## 1.83.0
+
+## 1.82.0
+
+## 1.81.0
+
+## 1.80.0
+
+## 1.79.0
 
-## 2.0.0-beta.0
+## 1.78.0
 
-### Major Changes
+## 1.77.0
 
-- be6c09d: ZERO-3114: Create beta version.
+## 1.76.0
 
 ## 1.75.0
 

package/package.json

@@ -1,22 +1,22 @@
 {
   "name": "@akinon/pz-saved-card",
-  "version": "2.0.0-beta.9",
+  "version": "2.0.1",
   "license": "MIT",
   "main": "src/index.tsx",
   "peerDependencies": {
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0"
+    "react": "^18.0.0 || ^19.0.0",
+    "react-dom": "^18.0.0 || ^19.0.0"
   },
   "dependencies": {
     "react-redux": "8.1.3"
   },
   "devDependencies": {
-    "@types/node": "^22.10.2",
-    "@types/react": "^19.0.2",
-    "@types/react-dom": "^19.0.2",
-    "prettier": "^3.4.2",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
-    "typescript": "^5.7.2"
+    "@types/node": "^18.7.8",
+    "@types/react": "^18.0.17",
+    "@types/react-dom": "^18.0.6",
+    "prettier": "^3.0.3",
+    "react": "19.2.5",
+    "react-dom": "19.2.5",
+    "typescript": "^5.2.2"
   }
 }

package/src/components/agreement-and-submit.tsx

@@ -1,22 +1,37 @@
-import React, { cloneElement } from 'react';
+import { cloneElement } from 'react';
 import { Button, Icon } from '@akinon/next/components';
+import { AgreementAndSubmitProps } from '../types';
 
 export const AgreementAndSubmit = ({
   agreementCheckbox,
   control,
   errors,
-  buttonText
-}) => (
+  buttonText,
+  formError,
+  isSubmitting
+}: AgreementAndSubmitProps) => (
   <div className="flex flex-col text-xs pb-4 px-4 sm:px-6">
     {agreementCheckbox &&
-      cloneElement(agreementCheckbox, {
-        control,
+      cloneElement(agreementCheckbox as any, {
+        control: control as any,
         error: errors.agreement,
         fieldId: 'agreement'
       })}
+    {formError?.non_field_errors && (
+      <div className="w-full text-xs text-start px-1 mt-3 text-error">
+        {formError.non_field_errors}
+      </div>
+    )}
+    {formError?.status && (
+      <div className="w-full text-xs text-start px-1 mt-3 text-error">
+        {formError.status}
+      </div>
+    )}
     <Button
       type="submit"
       className="group uppercase mt-4 inline-flex items-center justify-center"
+      disabled={isSubmitting}
+      data-testid="saved-card-submit-button"
     >
       <span>{buttonText}</span>
       <Icon name="chevron-end" size={12} className="ml-2 h-3" />

package/src/components/card-form-section.tsx

@@ -0,0 +1,127 @@
+import React from 'react';
+import { Input, Select, Icon, Image } from '@akinon/next/components';
+import { Control, UseFormRegister, FieldErrors } from 'react-hook-form';
+
+export interface CardFormSectionProps {
+  register: UseFormRegister<any>;
+  control: Control<any>;
+  errors: FieldErrors;
+  months: Array<{ label: string; value: string }>;
+  years: Array<{ label: string; value: string }>;
+  translations?: {
+    cardHolder?: string;
+    cardNumber?: string;
+    expiryDate?: string;
+    cvv?: string;
+    cvvTooltip?: string;
+    saveCardForFuture?: string;
+  };
+}
+
+export const CardFormSection = ({
+  register,
+  control,
+  errors,
+  months,
+  years,
+  translations = {},
+}: CardFormSectionProps) => {
+  return (
+    <div className="w-full bg-white">
+      <div className="px-4 my-2 w-full flex justify-between flex-wrap">
+        <div className="my-2 w-full sm:px-4">
+          <Input
+            label={translations.cardHolder}
+            {...register('card_holder')}
+            error={errors.card_holder}
+          />
+        </div>
+
+        <div className="my-2 w-full flex flex-col sm:px-4">
+          <div className="text-xs text-gray-800 mb-2 w-full flex justify-between items-center">
+            <span>{translations.cardNumber}</span>
+          </div>
+
+          <Input
+            format="#### #### #### ####"
+            mask="_"
+            allowEmptyFormatting={true}
+            control={control}
+            {...register('card_number')}
+            error={errors.card_number}
+          />
+        </div>
+
+        <div className="w-full my-2 sm:flex">
+          <div className="sm:w-2/3 sm:px-4">
+            <label
+              className="flex w-full text-xs text-start text-black-400 mb-1.5"
+              htmlFor="card_month"
+            >
+              {translations.expiryDate}
+            </label>
+
+            <div className="flex w-full h-10 space-x-2.5">
+              <div className="w-2/4">
+                <Select
+                  className="w-full text-xs border-gray-400 sm:text-sm"
+                  options={months}
+                  {...register('card_month')}
+                  error={errors.card_month}
+                />
+              </div>
+
+              <div className="w-2/4">
+                <Select
+                  className="w-full text-xs border-gray-400 sm:text-sm"
+                  options={years}
+                  {...register('card_year')}
+                  error={errors.card_year}
+                />
+              </div>
+            </div>
+          </div>
+
+          <div className="my-2 sm:w-1/3 sm:px-4 sm:my-0">
+            <label
+              className="flex w-full text-xs text-start text-black-400 mb-1.5"
+              htmlFor="card_cvv"
+            >
+              {translations.cvv}
+            </label>
+            <Input
+              format="###"
+              mask="_"
+              control={control}
+              allowEmptyFormatting={true}
+              {...register('card_cvv')}
+              error={errors.card_cvv}
+            />
+            <div className="group relative flex items-center justify-start text-gray-600 cursor-pointer mt-2 transition-all hover:text-secondary">
+              <span className="text-xs underline">
+                {translations.cvv}
+              </span>
+              <Icon name="cvc" size={16} className="leading-none ml-2" />
+              <div className="hidden group-hover:block absolute right-0 bottom-5 w-[11rem] lg:w-[21rem] lg:left-auto lg:right-auto border-2">
+                <Image src="/cvv.jpg" alt="Cvv" width={385} height={264} />
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div className="my-2 w-full flex flex-col sm:px-4">
+          <label className="flex items-center space-x-2">
+            <input
+              type="checkbox"
+              {...register('register_consumer_card')}
+              className="h-4 w-4 text-primary focus:ring-primary border-gray-300 rounded"
+            />
+            <span className="text-sm text-gray-700">
+              {translations.saveCardForFuture}
+            </span>
+          </label>
+        </div>
+      </div>
+    </div>
+  );
+};

package/src/components/card-selection-section.tsx

@@ -1,5 +1,4 @@
 import { setDeletionModalId, setDeletionModalVisible } from '../redux/reducer';
-import React from 'react';
 import { ErrorText } from './error-text';
 import { CardLabel } from './card-label';
 import { DeleteIcon } from './delete-icon';
@@ -16,7 +15,7 @@ export const CardSelectionSection = ({
   <div className="border-solid border-gray-400 px-4 py-2">
     <span className="text-black-800 text-lg font-medium">{title}</span>
     <ul className="mt-4 text-xs w-full">
-      {cards?.map((card) => (
+      {cards?.map((card, index) => (
         <li
           key={card.token}
           className="p-4 mb-2 border-2 border-gray-200 flex justify-between items-center cursor-pointer"
@@ -24,6 +23,7 @@ export const CardSelectionSection = ({
             e.preventDefault();
             onSelect(card);
           }}
+          data-testid={`saved-card-item-${index}`}
         >
           <input
             name="card"

package/src/components/installment-section.tsx

@@ -1,19 +1,17 @@
 import SavedCardInstallments from './installments';
-import React from 'react';
+import { InstallmentSectionProps } from '../types';
 
 export const InstallmentSection = ({
   title,
-  selectedCard,
   installmentOptions,
   translations,
   errors
-}) => (
+}: InstallmentSectionProps) => (
   <div className="border-solid border-gray-400 bg-white">
     <div className="px-4 py-2">
       <span className="text-black-800 text-lg font-medium">{title}</span>
     </div>
     <SavedCardInstallments
-      selectedCard={selectedCard}
       installmentOptions={installmentOptions}
       translations={translations}
       error={errors}

package/src/components/installments.tsx

@@ -12,14 +12,12 @@ const defaultTranslations = {
 };
 
 type SavedCardInstallmentsProps = {
-  selectedCard: SavedCard;
   installmentOptions: any[];
   translations?: InstallmentTexts;
   error: any;
 };
 
 const SavedCardInstallments = ({
-  selectedCard,
   installmentOptions = [],
   translations,
   error
@@ -30,7 +28,6 @@ const SavedCardInstallments = ({
 
   useEffect(() => {
     if (
-      selectedCard &&
       installmentOptions.length > 0 &&
       installmentOptions[0]?.pk !== installmentOption
     ) {
@@ -40,7 +37,7 @@ const SavedCardInstallments = ({
       });
       setInstallmentOption(firstOptionPk);
     }
-  }, [installmentOptions, installmentOption, setInstallment, selectedCard]);
+  }, [installmentOptions, installmentOption, setInstallment]);
 
   if (installmentOptions.length === 0) {
     return (
@@ -68,7 +65,7 @@ const SavedCardInstallments = ({
             </tr>
           </thead>
           <tbody>
-            {installmentOptions.map((option) => (
+            {installmentOptions.map((option, index) => (
               <tr
                 key={`installment-${option.pk}`}
                 className="border-t border-solid border-gray-400"
@@ -84,6 +81,7 @@ const SavedCardInstallments = ({
                       });
                       setInstallmentOption(option.pk);
                     }}
+                    data-testid={`saved-card-installment-${index}`}
                   >
                     <span className="w-full flex items-center justify-start pl-2">
                       <span className="text-xs text-black-800 transition-all">
@@ -104,7 +102,7 @@ const SavedCardInstallments = ({
         </table>
       </div>
       {error && (
-        <div className="px-6 mt-4 text-sm text-error">{error.message}</div>
+        <div className="px-6 mt-4 text-sm text-error">{String(error.message)}</div>
       )}
     </div>
   );

package/src/index.tsx

@@ -1,5 +1,11 @@
 import savedCardReducer from './redux/reducer';
 import savedCardMiddleware from './redux/middleware';
 import SavedCardOption from './views/saved-card-option';
+import IyzicoSavedCardOption from './views/iyzico-saved-card-option';
 
-export { savedCardReducer, savedCardMiddleware, SavedCardOption };
+export {
+  savedCardReducer,
+  savedCardMiddleware,
+  SavedCardOption,
+  IyzicoSavedCardOption
+};

package/src/redux/api.ts

@@ -21,20 +21,49 @@ interface GetResponse<T> {
   results: T[];
 }
 
-type SetSavedCardRequest = {
+type DefaultSetSavedCardRequest = {
   card: SavedCard;
 };
 
+type IyzicoSetSavedCardRequest = {
+  card: string;
+};
+
+type SetSavedCardRequest =
+  | DefaultSetSavedCardRequest
+  | IyzicoSetSavedCardRequest;
+
 type DeleteSavedCardRequest = number;
 
 type SetInstallmentRequest = {
   installment: string;
 };
 
-type CompleteSavedCardRequest = {
+type DefaultCompleteSavedCardRequest = {
   agreement: boolean;
 };
 
+type IyzicoCompleteSavedCardRequest =
+  | {
+      agreement: boolean;
+      register_consumer_card: boolean;
+      consumer_token: string;
+      card_token: string;
+    }
+  | {
+      agreement: boolean;
+      card_holder: string;
+      card_number: string;
+      card_cvv: string;
+      card_month: string;
+      card_year: string;
+      register_consumer_card: boolean;
+    };
+
+type CompleteSavedCardRequest =
+  | DefaultCompleteSavedCardRequest
+  | IyzicoCompleteSavedCardRequest;
+
 export const savedCardApi = api.injectEndpoints({
   endpoints: (build) => ({
     getSavedCards: build.query<GetResponse<SavedCard>, void>({
@@ -71,7 +100,7 @@ export const savedCardApi = api.injectEndpoints({
         ),
         method: 'POST',
         body: {
-          card: card.token
+          card: typeof card === 'string' ? card : card.token
         }
       }),
       async onQueryStarted({ card }, { dispatch, queryFulfilled }) {
@@ -106,7 +135,7 @@ export const savedCardApi = api.injectEndpoints({
       CheckoutResponse,
       CompleteSavedCardRequest
     >({
-      query: ({ agreement }) => ({
+      query: (body) => ({
         url: buildClientRequestUrl(
           `/orders/checkout?page=CompleteSavedCardRequest`,
           {
@@ -114,9 +143,7 @@ export const savedCardApi = api.injectEndpoints({
           }
         ),
         method: 'POST',
-        body: {
-          agreement
-        }
+        body
       }),
       async onQueryStarted(arg, { dispatch, queryFulfilled }) {
         dispatch(setPaymentStepBusy(true));

package/src/redux/middleware.ts

@@ -1,22 +1,28 @@
 import { Middleware } from '@reduxjs/toolkit';
-import { setCards } from './reducer';
+import { CheckoutResult } from '@akinon/next/types';
+import { setCards, setUcs } from './reducer';
 
 const savedCardMiddleware: Middleware = ({ dispatch }) => {
   return (next) => (action) => {
-    const result = next(action);
+    const result = next(action) as CheckoutResult;
 
     const savedCardContext = result.payload?.context_list?.find(
-      (context) =>
-        context.page_slug === 'savedcardselectionpage' &&
-        context.page_context.cards
+      (context) => context.page_slug === 'savedcardselectionpage'
     );
 
-    if (savedCardContext) {
+    if (savedCardContext && savedCardContext.page_context?.cards) {
       const cards = JSON.parse(
         JSON.stringify(savedCardContext.page_context.cards)
       );
 
       dispatch(setCards(cards));
+    } else if (savedCardContext && savedCardContext.page_context?.ucs) {
+      const ucs = JSON.parse(JSON.stringify(savedCardContext.page_context.ucs));
+
+      const match = ucs.script.match(/<script\b[^>]*>([\s\S]*?)<\/script>/);
+      ucs.script = match ? match[1] : ucs.script;
+
+      dispatch(setUcs(ucs));
     }
 
     return result;

package/src/redux/reducer.ts

@@ -7,12 +7,20 @@ export type SavedCard = {
   token: string;
 };
 
+export type IyzicoUcs = {
+  maskedGsmNumber?: string;
+  script?: string;
+  scriptType?: string;
+  ucsToken?: string;
+};
+
 export interface SavedCardState {
   cards?: Array<SavedCard>;
   deletion: {
     id: number;
     isModalVisible: boolean;
   };
+  ucs?: IyzicoUcs;
 }
 
 const initialState: SavedCardState = {
@@ -35,11 +43,22 @@ const savedCardSlice = createSlice({
     },
     setDeletionModalVisible(state, { payload }) {
       state.deletion.isModalVisible = payload;
+    },
+    setUcs(state, action: { payload: IyzicoUcs }) {
+      state.ucs = action.payload;
+    },
+    resetUcs() {
+      return initialState;
     }
   }
 });
 
-export const { setCards, setDeletionModalId, setDeletionModalVisible } =
-  savedCardSlice.actions;
+export const {
+  setCards,
+  setDeletionModalId,
+  setDeletionModalVisible,
+  setUcs,
+  resetUcs
+} = savedCardSlice.actions;
 
 export default savedCardSlice.reducer;

package/src/types/index.ts

@@ -1,4 +1,5 @@
 import { ReactElement } from 'react';
+import { Control, FieldErrors } from 'react-hook-form';
 
 export type InstallmentTexts = {
   title?: string;
@@ -15,6 +16,9 @@ export type DeletePopupTexts = {
 
 export type ErrorTexts = {
   required?: string;
+  cardNumberLength?: string;
+  cvvLength?: string;
+  cardHolderMatches?: string;
 };
 
 export type SavedCardOptionTexts = {
@@ -25,6 +29,29 @@ export type SavedCardOptionTexts = {
   errors?: ErrorTexts;
 };
 
+export type IyzicoSavedCardOptionTexts = {
+  title?: string;
+  button?: string;
+  installment?: InstallmentTexts;
+  errors?: ErrorTexts & {
+    saveCardRequired?: string;
+  };
+  label?: {
+    cardHolder?: string;
+    cardNumber?: string;
+    expiryDate?: string;
+    cvv?: string;
+    saveCardForFuture?: string;
+  };
+  placeholder?: {
+    cardHolder?: string;
+    cardMonth?: string;
+    cardYear?: string;
+  };
+  savedCardsTitle?: string;
+  paymentErrorMessage?: string;
+};
+
 export type CardSelectionSectionProps = {
   title: string;
   cards: any[];
@@ -37,15 +64,35 @@ export type CardSelectionSectionProps = {
 
 export type InstallmentSectionProps = {
   title: string;
-  selectedCard: any;
   installmentOptions: any;
   translations: InstallmentTexts;
   errors: any;
+  setFormValue?: any;
 };
 
-export type AgreementAndSubmitProps = {
-  agreementCheckbox: ReactElement | undefined;
+export interface AgreementAndSubmitProps {
+  agreementCheckbox?: ReactElement;
+  control: Control<any>;
+  errors: FieldErrors;
+  buttonText: string;
+  formError?: {
+    non_field_errors?: string;
+    status?: string;
+    [key: string]: any;
+  };
+  isSubmitting?: boolean;
+}
+
+export type CardFormSectionProps = {
+  register: any;
   control: any;
   errors: any;
-  buttonText: string;
+  months: Array<{ label: string; value: string }>;
+  years: Array<{ label: string; value: string }>;
+  translations?: IyzicoSavedCardOptionTexts['label'];
+  setFormValue?: any;
+};
+
+export type IyzicoSavedCardsProps = {
+  title?: string;
 };

package/src/views/iyzico-saved-card-option.tsx

@@ -0,0 +1,429 @@
+'use client';
+
+import * as yup from 'yup';
+import { ObjectSchema } from 'yup';
+import { yupResolver } from '@hookform/resolvers/yup';
+import { useForm } from 'react-hook-form';
+import {
+  FormHTMLAttributes,
+  HTMLAttributes,
+  ReactElement,
+  useEffect,
+  useMemo,
+  useState
+} from 'react';
+import { useAppSelector } from '@akinon/next/redux/hooks';
+import {
+  useCompleteSavedCardMutation,
+  useSetSavedCardMutation
+} from '../redux/api';
+
+import {
+  AgreementAndSubmitProps,
+  CardFormSectionProps,
+  ErrorTexts,
+  InstallmentSectionProps,
+  IyzicoSavedCardOptionTexts,
+  IyzicoSavedCardsProps
+} from '../types';
+import { InstallmentSection } from '../components/installment-section';
+import { AgreementAndSubmit } from '../components/agreement-and-submit';
+import { CardFormSection } from '../components/card-form-section';
+import Script from 'next/script';
+
+type IyzicoSavedCardOptionProps = {
+  texts?: IyzicoSavedCardOptionTexts;
+  agreementCheckbox?: ReactElement;
+  customFormSchema?: {
+    'new-card'?: ObjectSchema<any>;
+    'existing-card'?: ObjectSchema<any>;
+  };
+  customRender?: {
+    cardFormSection?: (props: CardFormSectionProps) => ReactElement;
+    savedCardsSection?: (props: IyzicoSavedCardsProps) => ReactElement;
+    installmentSection?: (props: InstallmentSectionProps) => ReactElement;
+    agreementAndSubmit?: (props: AgreementAndSubmitProps) => ReactElement;
+  };
+  formWrapperClassName?: string;
+  cardSelectionWrapperClassName?: string;
+  installmentWrapperClassName?: string;
+  formProps?: FormHTMLAttributes<HTMLFormElement>;
+  cardSelectionWrapperProps?: HTMLAttributes<HTMLDivElement>;
+  installmentWrapperProps?: HTMLAttributes<HTMLDivElement>;
+};
+
+const defaultTranslations: IyzicoSavedCardOptionTexts = {
+  title: 'Pay with Iyzico',
+  button: 'Complete Payment',
+  installment: {
+    title: 'Installment Options'
+  },
+  errors: {
+    required: 'This field is required',
+    cardNumberLength: 'Card number must be 16 digits long.',
+    cvvLength: 'CVV must be 3 digits long.',
+    cardHolderMatches: 'Please enter a valid name',
+    saveCardRequired: 'Please select the Save My Card option'
+  },
+  label: {
+    cardHolder: 'Cardholder Name',
+    cardNumber: 'Card Number',
+    expiryDate: 'Expiration Date',
+    cvv: 'CVV',
+    saveCardForFuture: 'Save this card for future payments'
+  },
+  placeholder: {
+    cardHolder: 'Name on Card',
+    cardMonth: 'Month',
+    cardYear: 'Year'
+  },
+  savedCardsTitle: 'Select from your saved cards:',
+  paymentErrorMessage: 'An error occurred while processing your payment'
+};
+
+const mergeTranslations = (
+  customTranslations: IyzicoSavedCardOptionTexts,
+  defaultTranslations: IyzicoSavedCardOptionTexts
+) => {
+  return {
+    ...defaultTranslations,
+    ...customTranslations,
+    installment: {
+      ...defaultTranslations.installment,
+      ...customTranslations.installment
+    },
+    errors: {
+      ...defaultTranslations.errors,
+      ...customTranslations.errors
+    },
+    label: {
+      ...defaultTranslations.label,
+      ...customTranslations.label
+    },
+    placeholder: {
+      ...defaultTranslations.placeholder,
+      ...customTranslations.placeholder
+    }
+  };
+};
+
+const createFormSchema = (
+  errors: ErrorTexts,
+  type: 'existing-card' | 'new-card'
+) => {
+  const baseSchema = {
+    agreement: yup
+      .boolean()
+      .oneOf([true], errors?.required ?? defaultTranslations.errors.required),
+    register_consumer_card: yup.boolean().default(false)
+  };
+
+  if (type === 'new-card') {
+    return yup.object().shape({
+      ...baseSchema,
+      card_holder: yup
+        .string()
+        .required(errors?.required ?? defaultTranslations.errors.required)
+        .matches(
+          /^[a-zA-ZğüşöçıİĞÜŞÖÇ\s]+$/,
+          errors?.cardHolderMatches ??
+            defaultTranslations.errors.cardHolderMatches
+        ),
+      card_number: yup
+        .string()
+        .transform((value: string) => value.replace(/_/g, '').replace(/ /g, ''))
+        .length(
+          16,
+          errors?.cardNumberLength ??
+            defaultTranslations.errors.cardNumberLength
+        )
+        .required(errors?.required ?? defaultTranslations.errors.required),
+      card_month: yup
+        .string()
+        .required(errors?.required ?? defaultTranslations.errors.required),
+      card_year: yup
+        .string()
+        .required(errors?.required ?? defaultTranslations.errors.required),
+      card_cvv: yup
+        .string()
+        .transform((value: string) => value.replace(/_/g, '').replace(/ /g, ''))
+        .length(3, errors?.cvvLength ?? defaultTranslations.errors.cvvLength)
+        .required(errors?.required ?? defaultTranslations.errors.required)
+    });
+  }
+
+  return yup.object().shape(baseSchema);
+};
+
+const IyzicoSavedCardOption = ({
+  texts = defaultTranslations,
+  agreementCheckbox,
+  customFormSchema,
+  customRender,
+  formWrapperClassName = 'flex flex-wrap w-full',
+  cardSelectionWrapperClassName = 'w-full flex flex-col xl:w-6/10',
+  installmentWrapperClassName = 'w-full xl:w-4/10 xl:border-l xl:border-t-0',
+  formProps = {},
+  cardSelectionWrapperProps = {},
+  installmentWrapperProps = {}
+}: IyzicoSavedCardOptionProps) => {
+  const mergedTexts = useMemo(
+    () => mergeTranslations(texts, defaultTranslations),
+    [texts]
+  );
+  const [completeSavedCard] = useCompleteSavedCardMutation();
+  const [setSavedCard] = useSetSavedCardMutation();
+  const installmentOptions = useAppSelector(
+    (state) => state.checkout.installmentOptions
+  );
+  const ucs = useAppSelector((state) => state.savedCard.ucs);
+  const [type, setType] = useState<'new-card' | 'existing-card'>('new-card');
+  const [months, setMonths] = useState([]);
+  const [years, setYears] = useState([]);
+  const [formError, setFormError] = useState(null);
+
+  const getFormSchema = () => {
+    if (customFormSchema?.[type]) {
+      return customFormSchema[type];
+    }
+    return createFormSchema(mergedTexts.errors, type);
+  };
+
+  const {
+    register,
+    handleSubmit,
+    control,
+    formState: { errors, isSubmitting },
+    setValue: setFormValue
+  } = useForm({
+    resolver: yupResolver(getFormSchema()) as any
+  });
+
+  const onSubmit = async (data) => {
+    if (isSubmitting) return;
+
+    if (!window.iyziUcsInit) {
+      return;
+    }
+
+    setFormError(null);
+
+    try {
+      if (type === 'existing-card') {
+        const res = await completeSavedCard({
+          agreement: data.agreement,
+          consumer_token: window.universalCardStorage.consumerToken,
+          card_token: window.universalCardStorage.cardToken,
+          register_consumer_card: true
+        });
+
+        if ('data' in res && res.data?.errors) {
+          setFormError(res.data.errors);
+        }
+      } else {
+        const res = await completeSavedCard({
+          agreement: data.agreement,
+          card_holder: data.card_holder,
+          card_number: data.card_number.replaceAll(' ', ''),
+          card_month: data.card_month,
+          card_year: data.card_year,
+          card_cvv: data.card_cvv,
+          register_consumer_card: data.register_consumer_card || false
+        });
+
+        if ('data' in res && res.data?.errors) {
+          setFormError(res.data.errors);
+        }
+      }
+    } catch (error) {
+      console.error('Error completing saved card:', error);
+      setFormError({
+        non_field_errors:
+          mergedTexts.paymentErrorMessage ??
+          defaultTranslations.paymentErrorMessage
+      });
+    }
+  };
+
+  const ucsScript = ucs?.script && (
+    <Script
+      id="saved_card"
+      strategy="afterInteractive"
+      dangerouslySetInnerHTML={{ __html: ucs.script }}
+    />
+  );
+
+  useEffect(() => {
+    window.iyziUcsInit?.createTag();
+
+    const monthsList = [
+      {
+        label:
+          mergedTexts.placeholder?.cardMonth ??
+          defaultTranslations.placeholder.cardMonth,
+        value: ''
+      }
+    ];
+    const yearsList = [
+      {
+        label:
+          mergedTexts.placeholder?.cardYear ??
+          defaultTranslations.placeholder.cardYear,
+        value: ''
+      }
+    ];
+    const date = new Date();
+    const currentYear = date.getFullYear();
+
+    for (let i = 1; i <= 12; i++) {
+      monthsList.push({ label: i.toString(), value: i.toString() });
+    }
+
+    for (let i = currentYear; i < currentYear + 13; i++) {
+      yearsList.push({ label: i.toString(), value: i.toString() });
+    }
+
+    setMonths(monthsList);
+    setYears(yearsList);
+
+    if (window.iyziUcsInit?.ucsToken) {
+      setSavedCard({
+        card: window.iyziUcsInit.ucsToken
+      });
+    }
+  }, []);
+
+  useEffect(() => {
+    if (window.iyziUcsInit?.scriptType === 'CONSUMER_WITH_CARD_EXIST') {
+      if (window.universalCardStorage?.cardToken) {
+        setType('existing-card');
+      } else {
+        setType('new-card');
+      }
+    } else {
+      setType('new-card');
+    }
+
+    const checkboxInterval = setInterval(() => {
+      if (window.universalCardStorage?.cardToken !== undefined) {
+        setType('existing-card');
+      } else {
+        setType('new-card');
+      }
+    }, 100);
+
+    return () => clearInterval(checkboxInterval);
+  }, [type]);
+
+  return (
+    <>
+      <form
+        className={formWrapperClassName}
+        onSubmit={handleSubmit(onSubmit)}
+        {...formProps}
+      >
+        <div
+          className={cardSelectionWrapperClassName}
+          {...cardSelectionWrapperProps}
+        >
+          {mergedTexts.title && (
+            <div className="border-solid border-gray-400 px-4 py-2">
+              <span className="text-black-800 text-lg font-medium">
+                {mergedTexts.title}
+              </span>
+            </div>
+          )}
+
+          {window.iyziUcsInit?.scriptType === 'CONSUMER_WITH_CARD_EXIST' && (
+            <>
+              {customRender?.savedCardsSection ? (
+                customRender.savedCardsSection({
+                  title: mergedTexts.savedCardsTitle
+                })
+              ) : (
+                <div>
+                  <h3 className="text-sm font-medium text-gray-800 mb-3 px-4 sm:px-6">
+                    {mergedTexts.savedCardsTitle}
+                  </h3>
+                  <div id="ucs-cards" className="mb-3 px-4 sm:px-6"></div>
+                </div>
+              )}
+            </>
+          )}
+
+          {type === 'new-card' && (
+            <>
+              {customRender?.cardFormSection ? (
+                customRender.cardFormSection({
+                  register,
+                  control,
+                  errors,
+                  months,
+                  years,
+                  translations: mergedTexts.label,
+                  setFormValue
+                })
+              ) : (
+                <CardFormSection
+                  register={register}
+                  control={control}
+                  errors={errors}
+                  months={months}
+                  years={years}
+                  translations={mergedTexts.label}
+                />
+              )}
+            </>
+          )}
+        </div>
+
+        <div
+          className={installmentWrapperClassName}
+          {...installmentWrapperProps}
+        >
+          {customRender?.installmentSection ? (
+            customRender.installmentSection({
+              title: mergedTexts.installment?.title,
+              installmentOptions,
+              translations: mergedTexts.installment,
+              errors: errors.installment,
+              setFormValue
+            })
+          ) : (
+            <InstallmentSection
+              title={mergedTexts.installment?.title}
+              installmentOptions={installmentOptions}
+              translations={mergedTexts.installment}
+              errors={errors.installment}
+            />
+          )}
+
+          <div className="flex flex-col text-xs">
+            {customRender?.agreementAndSubmit ? (
+              customRender.agreementAndSubmit({
+                agreementCheckbox,
+                control,
+                errors,
+                buttonText: mergedTexts.button,
+                formError,
+                isSubmitting
+              })
+            ) : (
+              <AgreementAndSubmit
+                agreementCheckbox={agreementCheckbox}
+                control={control}
+                errors={errors}
+                buttonText={mergedTexts.button}
+                formError={formError}
+                isSubmitting={isSubmitting}
+              />
+            )}
+          </div>
+        </div>
+      </form>
+      {ucsScript}
+    </>
+  );
+};
+
+export default IyzicoSavedCardOption;

package/src/views/saved-card-option.tsx

@@ -3,8 +3,9 @@
 import * as yup from 'yup';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { useForm } from 'react-hook-form';
-import React, { ReactElement, useMemo } from 'react';
+import React, { ReactElement, useMemo, useState } from 'react';
 import { useAppDispatch, useAppSelector } from '@akinon/next/redux/hooks';
+import { checkPaymentWillRedirect } from '@akinon/next/utils';
 import {
   useCompleteSavedCardMutation,
   useSetSavedCardMutation
@@ -95,7 +96,7 @@ const SavedCardOption = ({
   customRender,
   formWrapperClassName = 'flex flex-wrap w-full',
   cardSelectionWrapperClassName = 'w-full flex flex-col xl:w-6/10',
-  installmentWrapperClassName = 'w-full xl:w-4/10 xl:border-l xl:border-t-0 xl:border-gray-200',
+  installmentWrapperClassName = 'w-full xl:w-4/10 xl:border-l xl:border-t-0',
   formProps = {},
   cardSelectionWrapperProps = {},
   installmentWrapperProps = {}
@@ -105,7 +106,9 @@ const SavedCardOption = ({
     [texts]
   );
   const dispatch = useAppDispatch();
-  const [completeSavedCard] = useCompleteSavedCardMutation();
+  const [isProcessing, setIsProcessing] = useState(false);
+  const [completeSavedCard, { isLoading: isCompleting }] =
+    useCompleteSavedCardMutation();
   const [setSavedCard] = useSetSavedCardMutation();
   const installmentOptions = useAppSelector(
     (state) => state.checkout.installmentOptions
@@ -116,11 +119,11 @@ const SavedCardOption = ({
     register,
     handleSubmit,
     control,
-    formState: { errors },
+    formState: { errors, isSubmitting },
     setValue,
     watch
   } = useForm({
-    resolver: yupResolver(createFormSchema(mergedTexts.errors))
+    resolver: yupResolver(createFormSchema(mergedTexts.errors)) as any
   });
 
   const selectedCardToken = watch('card');
@@ -129,15 +132,26 @@ const SavedCardOption = ({
     [cards, selectedCardToken]
   );
 
+  const isButtonDisabled = isSubmitting || isCompleting || isProcessing;
+
   const handleCardSelection = async (card) => {
     await setSavedCard({ card }).unwrap();
     setValue('card', card.token, { shouldValidate: true });
   };
 
   const onSubmit = async () => {
+    if (isButtonDisabled) return;
+
+    setIsProcessing(true);
+
     try {
-      await completeSavedCard({ agreement: true });
+      const response = await completeSavedCard({ agreement: true }).unwrap();
+
+      if (response?.errors || !checkPaymentWillRedirect(response)) {
+        setIsProcessing(false);
+      }
     } catch (error) {
+      setIsProcessing(false);
       console.error('Error completing saved card:', error);
     }
   };
@@ -183,7 +197,6 @@ const SavedCardOption = ({
           {customRender?.installmentSection ? (
             customRender.installmentSection({
               title: mergedTexts.installment?.title,
-              selectedCard,
               installmentOptions,
               translations: mergedTexts.installment,
               errors: errors.installment
@@ -191,7 +204,6 @@ const SavedCardOption = ({
           ) : (
             <InstallmentSection
               title={mergedTexts.installment?.title}
-              selectedCard={selectedCard}
               installmentOptions={installmentOptions}
               translations={mergedTexts.installment}
               errors={errors.installment}
@@ -203,7 +215,8 @@ const SavedCardOption = ({
               agreementCheckbox,
               control,
               errors,
-              buttonText: mergedTexts.button
+              buttonText: mergedTexts.button,
+              isSubmitting: isButtonDisabled
             })
           ) : (
             <AgreementAndSubmit
@@ -211,6 +224,7 @@ const SavedCardOption = ({
               control={control}
               errors={errors}
               buttonText={mergedTexts.button}
+              isSubmitting={isButtonDisabled}
             />
           )}
         </div>