diff --git a/src/Components/Modals/PaymentModal.js b/src/Components/Modals/PaymentModal.js
index e0632a5..28ea68c 100644
--- a/src/Components/Modals/PaymentModal.js
+++ b/src/Components/Modals/PaymentModal.js
@@ -23,6 +23,7 @@ const PaymentModal = ({
   isBusy,
   handleChangePaymentInput,
   handleSignup,
+  paymentfields,
   paymentdata,
   setPaymentdata,
 }) => {
@@ -38,12 +39,14 @@ const PaymentModal = ({
           <Col key={`${name}${i + fieldsChunkSize * j}`} className="mb-3">
             <TextInput
               name={name}
-              value={data[name].value}
-              onChange={(e) => handleChangeInput(e, name)}
-              error={data[name].error}
-              message={data[name].message}
+              value={paymentdata[name].value}
+              onChange={(e) => handleChangePaymentInput(e, name)}
+              error={paymentdata[name].error}
+              message={paymentdata[name].message}
               label={
-                data[name].value.length === 0 ? paymentfields[name].label : ""
+                paymentdata[name].value.length === 0
+                  ? paymentfields[name].label
+                  : ""
               }
               type={paymentfields[name].type}
               values={paymentfields[name].values}
@@ -85,16 +88,3 @@ const PaymentModal = ({
 };
 
 export default PaymentModal;
-
-/*
-        <div style={{ marginTop: "16px" }}>
-          <TextInput
-            key={"captionTwo"}
-            name={"captionTwo"}
-            value={"issueText"}
-            message={"data.captionTwo.message"}
-            onChange={(e) => setCardNumber(e.target.value)}
-            label={"Card Number"}
-          />
-        </div>
-        */