diff --git a/src/pages/transaction/approval-transaction/blocks/DetailApprovalTransaction.tsx b/src/pages/transaction/approval-transaction/blocks/DetailApprovalTransaction.tsx
index 848eb7c..1e56268 100644
--- a/src/pages/transaction/approval-transaction/blocks/DetailApprovalTransaction.tsx
+++ b/src/pages/transaction/approval-transaction/blocks/DetailApprovalTransaction.tsx
@@ -30,7 +30,6 @@ const DetailApprovalTransaction = () => {
                     const response = await GetData(`${API_URL}/transaction/history/detail/${selectedTransactionId}`, {
                         id: selectedTransactionId
                     });
-                    console.log(response?.data);
                     setTransactionDetails(response?.data);
                 } catch (error) {
                     console.error('Error fetching transaction', error);
@@ -121,11 +120,14 @@ const DetailApprovalTransaction = () => {
                                     </div>
                                     <div>
                                         <p className="text-sm text-gray-500">Full Name</p>
-                                        <p className="font-medium">{transactionDetails?.origin_customer.fullname}</p>
+                                        <p className="font-medium">
+                                            {transactionDetails?.origin_customer?.fullname ?? "-"}
+                                        </p>
                                     </div>
+
                                     <div>
                                         <p className="text-sm text-gray-500">Amount</p>
-                                        <p className="font-medium">{new Intl.NumberFormat('en-US', { style: 'currency', currency: 'USD' }).format(transactionDetails?.purchase.amount)}</p>
+                                        <p className="font-medium">{new Intl.NumberFormat('en-US', { style: 'currency', currency: 'USD' }).format(transactionDetails?.purchase?.amount) ?? new Intl.NumberFormat('en-US', { style: 'currency', currency: 'USD' }).format(transactionDetails?.transfer.amount)}</p>
                                     </div>
                                     <div>
                                         <p className="text-sm text-gray-500">Fee</p>
@@ -292,7 +294,9 @@ const DetailApprovalTransaction = () => {
                                     </div>
                                     <div>
                                         <p className="text-sm text-gray-500">Full Name</p>
-                                        <p className="font-medium">{transactionDetails?.origin_customer.fullname}</p>
+                                        <p className="font-medium">
+                                            {transactionDetails?.origin_customer?.fullname ?? "-"}
+                                        </p>
                                     </div>
                                     <div>
                                         <p className="text-sm text-gray-500">Amount</p>
@@ -347,10 +351,10 @@ const DetailApprovalTransaction = () => {
                                         <p className="font-medium">{transactionDetails?.description}</p>
                                     </div>
                                     <div>
-                                    <div>
-                                        <p className="text-sm text-gray-500">Name</p>
-                                        <p className="font-medium">{transactionDetails?.type?.name || '-'}</p>
-                                    </div>
+                                        <div>
+                                            <p className="text-sm text-gray-500">Name</p>
+                                            <p className="font-medium">{transactionDetails?.type?.name || '-'}</p>
+                                        </div>
                                     </div>
                                     <div>
                                         <p className="text-sm text-gray-500">Reference</p>
@@ -370,19 +374,21 @@ const DetailApprovalTransaction = () => {
                                 <div className="grid grid-cols-2 gap-4">
                                     <div>
                                         <p className="text-sm text-gray-500">Full Name</p>
-                                        <p className="font-medium">{transactionDetails?.origin_customer.fullname}</p>
+                                        <p className="font-medium">
+                                            {transactionDetails?.origin_customer?.fullname ?? "-"}
+                                        </p>
                                     </div>
                                     <div>
                                         <p className="text-sm text-gray-500">Phone Number</p>
-                                        <p className="font-medium">{transactionDetails?.origin_customer.msisdn}</p>
+                                        <p className="font-medium">{transactionDetails?.origin_customer?.msisdn ?? "-"}</p>
                                     </div>
                                     <div>
                                         <p className="text-sm text-gray-500">Email</p>
-                                        <p className="font-medium">{transactionDetails?.origin_customer.email}</p>
+                                        <p className="font-medium">{transactionDetails?.origin_customer?.email ?? "-"}</p>
                                     </div>
                                     <div>
                                         <p className="text-sm text-gray-500">Username</p>
-                                        <p className="font-medium">{transactionDetails?.origin_customer.username}</p>
+                                        <p className="font-medium">{transactionDetails?.origin_customer?.username ?? "-"}</p>
                                     </div>
                                 </div>
                             </div>
diff --git a/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx b/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx
index 6d774d7..b9cc2fa 100644
--- a/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx
+++ b/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx
@@ -120,11 +120,11 @@ const DetailTransaction = () => {
                                     </div>
                                     <div>
                                         <p className="text-sm text-gray-500">Full Name</p>
-                                        <p className="font-medium">{transactionDetails?.origin_customer.fullname}</p>
+                                        <p className="font-medium">{transactionDetails?.origin_customer?.fullname ?? "-"}</p>
                                     </div>
                                     <div>
                                         <p className="text-sm text-gray-500">Amount</p>
-                                        <p className="font-medium">{new Intl.NumberFormat('en-US', { style: 'currency', currency: 'USD' }).format(transactionDetails?.purchase.amount)}</p>
+                                        <p className="font-medium">{new Intl.NumberFormat('en-US', { style: 'currency', currency: 'USD' }).format(transactionDetails?.purchase?.amount) ?? new Intl.NumberFormat('en-US', { style: 'currency', currency: 'USD' }).format(transactionDetails?.transfer.amount)}</p>
                                     </div>
                                     <div>
                                         <p className="text-sm text-gray-500">Fee</p>
@@ -291,7 +291,7 @@ const DetailTransaction = () => {
                                     </div>
                                     <div>
                                         <p className="text-sm text-gray-500">Full Name</p>
-                                        <p className="font-medium">{transactionDetails?.origin_customer.fullname}</p>
+                                        <p className="font-medium">{transactionDetails?.origin_customer?.fullname ?? "-"}</p>
                                     </div>
                                     <div>
                                         <p className="text-sm text-gray-500">Amount</p>
@@ -367,19 +367,19 @@ const DetailTransaction = () => {
                                 <div className="grid grid-cols-2 gap-4">
                                     <div>
                                         <p className="text-sm text-gray-500">Full Name</p>
-                                        <p className="font-medium">{transactionDetails?.origin_customer.fullname}</p>
+                                        <p className="font-medium">{transactionDetails?.origin_customer?.fullname ?? "-"}</p>
                                     </div>
                                     <div>
                                         <p className="text-sm text-gray-500">Phone Number</p>
-                                        <p className="font-medium">{transactionDetails?.origin_customer.msisdn}</p>
+                                        <p className="font-medium">{transactionDetails?.origin_customer?.msisdn ?? "-"}</p>
                                     </div>
                                     <div>
                                         <p className="text-sm text-gray-500">Email</p>
-                                        <p className="font-medium">{transactionDetails?.origin_customer.email}</p>
+                                        <p className="font-medium">{transactionDetails?.origin_customer?.email ?? "-"}</p>
                                     </div>
                                     <div>
                                         <p className="text-sm text-gray-500">Username</p>
-                                        <p className="font-medium">{transactionDetails?.origin_customer.username}</p>
+                                        <p className="font-medium">{transactionDetails?.origin_customer?.username ?? "-"}</p>
                                     </div>
                                 </div>
                             </div>