diff --git a/src/pages/transaction/history-transaction/Transaction.tsx b/src/pages/transaction/history-transaction/Transaction.tsx
index ee0aeff..e0bc691 100644
--- a/src/pages/transaction/history-transaction/Transaction.tsx
+++ b/src/pages/transaction/history-transaction/Transaction.tsx
@@ -2,7 +2,6 @@ import { Container, DataGridInner } from '@/components';
 import { TransactionProvider } from './hooks/TransactionContext';
 import { Breadcrumbs, Link } from '@mui/material';
 import { Helmet } from 'react-helmet';
-import ResendTransaction from './blocks/ResendTransaction';
 
 const Transaction = () => {
   return (
@@ -29,7 +28,6 @@ const Transaction = () => {
           <div className="grid gap-5 lg:gap-7.5">
             <DataGridInner />
           </div>
-          {/* <ResendTransaction /> */}
         </Container>
       </TransactionProvider>
     </>
diff --git a/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx b/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx
index 46a9acc..72596b7 100644
--- a/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx
+++ b/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx
@@ -12,11 +12,13 @@ import {
     DialogHeader,
     DialogTitle
 } from '@/components/ui/dialog';
+import { useDataGrid } from '@/components';
 
 const API_URL = apiConfig.transaction;
 
 const DetailTransaction = () => {
     const { GetData } = useCallApi();
+    // const { reload } = useDataGrid();
     const {
         showDetailDialog,
         setShowDetailDialog,
diff --git a/src/pages/transaction/history-transaction/blocks/ResendTransaction.tsx b/src/pages/transaction/history-transaction/blocks/ResendTransaction.tsx
index 3da5a09..9ec262b 100644
--- a/src/pages/transaction/history-transaction/blocks/ResendTransaction.tsx
+++ b/src/pages/transaction/history-transaction/blocks/ResendTransaction.tsx
@@ -11,7 +11,6 @@ import {
     DialogHeader,
     DialogTitle
 } from '@/components/ui/dialog';
-import { Button } from '@/components/ui/button';
 import { Alert, useDataGrid } from '@/components';
 import { doSaveLogActivity } from '@/actions/GlobalActions';
 import { toast } from 'sonner';
@@ -27,10 +26,14 @@ interface ResendTransactionProps {
 
 const ResendTransaction = ({ isOpen, onClose, selectedTransactionForResend }: ResendTransactionProps) => {
 
-
     // const { showResendDialog, handleResendDialog, selectedTransactionForResend } = useTransactionContext();
     const { GetData, PostData } = useCallApi();
-    // const { reload } = useDataGrid();
+    const {
+        showDetailDialog,
+        setShowDetailDialog,
+        selectedTransactionId
+    } = useTransactionContext();
+    const { reload } = useDataGrid();
     const [transactionDetails, setTransactionDetails] = useState<any>(null);
     const [alert, setAlert] = useState({
         show: false,
@@ -159,25 +162,26 @@ const ResendTransaction = ({ isOpen, onClose, selectedTransactionForResend }: Re
         if (response?.status) {
             setAlert({ show: false, message: '' });
             // handleResendDialog(false, null);
+            onClose();
+            setShowDetailDialog(false);
+            reload();
             toast.success('Success Retry Transaction');
-            // reload();
 
             const createActivity = {
                 module: 'History Transaction',
-                description: `Retry Transaction => ${selectedTransactionForResend}`,
+                description: `Retry Transaction => ${data.code}`,
                 action: 'U'
             };
 
             doSaveLogActivity(createActivity);
         } else {
-            setAlert({ show: true, message: response?.message });
+            setAlert({ show: true, message: response?.message.message });
             toast.error('Failed Retry Transaction');
         }
     }, [selectedTransactionForResend, PostData]);
 
     if (!isOpen) return null;
 
-
     return (
         <Dialog open={isOpen} onOpenChange={onClose}>
             <DialogContent className="container-fixed max-w-md flex flex-col p-5 overflow-hidden [&>button]:hidden">
diff --git a/src/pages/transaction/history-transaction/hooks/TransactionContext.tsx b/src/pages/transaction/history-transaction/hooks/TransactionContext.tsx
index 569e266..725cc9b 100644
--- a/src/pages/transaction/history-transaction/hooks/TransactionContext.tsx
+++ b/src/pages/transaction/history-transaction/hooks/TransactionContext.tsx
@@ -7,6 +7,7 @@ import { useCallApi } from '@/hooks';
 import ListToolbar from '../blocks/ListToolbar';
 import { useNavigate } from 'react-router';
 import DetailTransaction from '../blocks/DetailTransaction';
+import ResendTransaction from '../blocks/ResendTransaction';
 
 interface TransactionProps {
   id: number;
@@ -320,7 +321,7 @@ const TransactionProvider = ({ children }: { children: React.ReactNode }) => {
       }}
     >
       <Toaster expand visibleToasts={9} duration={3000} />
-      <DetailTransaction />
+
 
       <DataGridProvider
         columns={columns}
@@ -333,6 +334,12 @@ const TransactionProvider = ({ children }: { children: React.ReactNode }) => {
           getTransactionLists(pageIndex, pageSize, sorting, columnFilters)
         }
       >
+        <DetailTransaction />
+        <ResendTransaction
+          isOpen={false}
+          onClose={() => console.log('Retry Transaction closed')}
+          selectedTransactionForResend={null}
+        />
         {children}
       </DataGridProvider>
     </ManageTransactionContext.Provider>