From eb508bb245a4aca864f6659f28c69eb47be04e75 Mon Sep 17 00:00:00 2001
From: wayanrivan <rivanwayan867@gmail.com>
Date: Mon, 12 May 2025 12:14:12 +0700
Subject: [PATCH] update

---
 .../blocks/DetailApprovalTransaction.tsx           | 14 +++++++-------
 .../hooks/ApprovalTransactionContext.tsx           |  2 +-
 .../blocks/DetailTransaction.tsx                   | 12 ++++++------
 .../hooks/TransactionContext.tsx                   |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/pages/transaction/approval-transaction/blocks/DetailApprovalTransaction.tsx b/src/pages/transaction/approval-transaction/blocks/DetailApprovalTransaction.tsx
index eb72ba9..319d75f 100644
--- a/src/pages/transaction/approval-transaction/blocks/DetailApprovalTransaction.tsx
+++ b/src/pages/transaction/approval-transaction/blocks/DetailApprovalTransaction.tsx
@@ -196,8 +196,7 @@ const DetailApprovalTransaction = () => {
                                     <div>
                                         <p className="text-sm text-gray-500">Full Name</p>
                                         <p className="font-medium">
-                                            {transactionDetails?.origin_customer?.fullname ?? "-"}
-                                        </p>
+                                            {transactionDetails?.origin_customer?.fullname ?? transactionDetails?.origin_customer?.origin_name}                                        </p>
                                     </div>
 
                                     <div>
@@ -395,11 +394,12 @@ const DetailApprovalTransaction = () => {
                                                 second: '2-digit',
                                                 hour12: false
                                             })
-                                            : ''}</p>                                    </div>
+                                            : ''}</p>
+                                    </div>
                                     <div>
                                         <p className="text-sm text-gray-500">Full Name</p>
                                         <p className="font-medium">
-                                            {transactionDetails?.origin_customer?.fullname ?? "-"}
+                                            {transactionDetails?.origin_customer?.fullname ?? transactionDetails?.origin_customer?.origin_name}
                                         </p>
                                     </div>
                                     <div>
@@ -479,12 +479,12 @@ const DetailApprovalTransaction = () => {
                                     <div>
                                         <p className="text-sm text-gray-500">Full Name</p>
                                         <p className="font-medium">
-                                            {transactionDetails?.origin_customer?.fullname ?? "-"}
+                                            {transactionDetails?.origin_customer?.fullname ?? transactionDetails?.origin_customer?.origin_name}
                                         </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 ?? transactionDetails?.origin_msisdn}</p>
                                     </div>
                                     <div>
                                         <p className="text-sm text-gray-500">Email</p>
@@ -513,7 +513,7 @@ const DetailApprovalTransaction = () => {
                                         <div>
                                             <p className="text-sm text-gray-500">MSISDN</p>
                                             <p className="font-medium">
-                                                {transactionDetails.transfer.destination_customer.msisdn ?? "-"}
+                                                {transactionDetails.transfer.destination_customer.msisdn ?? transactionDetails.transfer.destination_msisdn}
                                             </p>
                                         </div>
                                         <div>
diff --git a/src/pages/transaction/approval-transaction/hooks/ApprovalTransactionContext.tsx b/src/pages/transaction/approval-transaction/hooks/ApprovalTransactionContext.tsx
index c8de0fa..80ba3b8 100644
--- a/src/pages/transaction/approval-transaction/hooks/ApprovalTransactionContext.tsx
+++ b/src/pages/transaction/approval-transaction/hooks/ApprovalTransactionContext.tsx
@@ -94,7 +94,7 @@ const ApprovalTransactionProvider = ({ children }: { children: React.ReactNode }
         },
       },
       {
-        accessorKey: 'origin_customer.fullname',
+        accessorKey: 'origin_name',
         header: ({ column }) => (
           <DataGridColumnHeader title="Origin Customer Full Name" column={column} />
         ),
diff --git a/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx b/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx
index 976ec28..2862059 100644
--- a/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx
+++ b/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx
@@ -217,7 +217,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 ?? transactionDetails?.origin_customer?.origin_name}</p>
                                     </div>
                                     <div>
                                         <p className="text-sm text-gray-500">Amount</p>
@@ -416,7 +416,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 ?? transactionDetails?.origin_customer?.origin_name}</p>
                                     </div>
                                     <div>
                                         <p className="text-sm text-gray-500">Amount</p>
@@ -492,11 +492,11 @@ 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 ?? transactionDetails?.origin_customer?.origin_name}</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 ?? transactionDetails?.origin_msisdn}</p>
                                     </div>
                                     <div>
                                         <p className="text-sm text-gray-500">Email</p>
@@ -519,13 +519,13 @@ const DetailTransaction = () => {
                                         <div>
                                             <p className="text-sm text-gray-500">Name</p>
                                             <p className="font-medium">
-                                                {transactionDetails.transfer.destination_customer.fullname ?? "-"}
+                                                {transactionDetails.transfer.destination_customer.fullname ?? transactionDetails.transfer.destination_name}
                                             </p>
                                         </div>
                                         <div>
                                             <p className="text-sm text-gray-500">MSISDN</p>
                                             <p className="font-medium">
-                                                {transactionDetails.transfer.destination_customer.msisdn ?? "-"}
+                                                {transactionDetails.transfer.destination_customer.msisdn ?? transactionDetails.transfer.destination_msisdn}
                                             </p>
                                         </div>
                                         <div>
diff --git a/src/pages/transaction/history-transaction/hooks/TransactionContext.tsx b/src/pages/transaction/history-transaction/hooks/TransactionContext.tsx
index 760eec7..5332a60 100644
--- a/src/pages/transaction/history-transaction/hooks/TransactionContext.tsx
+++ b/src/pages/transaction/history-transaction/hooks/TransactionContext.tsx
@@ -112,7 +112,7 @@ const TransactionProvider = ({ children }: { children: React.ReactNode }) => {
         }
       },
       {
-        accessorKey: 'origin_customer.fullname',
+        accessorKey: 'origin_name',
         header: ({ column }) => (
           <DataGridColumnHeader title="Origin Customer Full Name" column={column} />
         ),