TIMOR-TELECOM/revenue-fe
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.shiblysolution.id/TPAY/dashboard

Browse Source
This commit is contained in:
ardiola
2025-04-22 15:06:39 +07:00
parent e7d0180865 a97c43e8b4
commit 6a52429e7a
4 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pages/dashboards/home/DashboardHomePage.tsx
View File

@ -45,7 +45,7 @@ const DashboardHomePage = () => {
useEffect(() => { useEffect(() => {
if (selectYear.length > 0 && !selectedYear) { if (selectYear.length > 0 && !selectedYear) {
let latestYear = Math.max(...selectYear.map((item) => parseInt(item, 10))).toString(); let latestYear = Math.max(...selectYear.map((item) => parseInt(item, 10))).toString();
console.log('latestYear :', latestYear); // console.log('latestYear :', latestYear);
setSelectedYear(latestYear); setSelectedYear(latestYear);
setInitialYear(latestYear); setInitialYear(latestYear);
} }

2
src/pages/groups/ManageGroups.tsx
View File

@ -223,7 +223,7 @@ const ManageGroups = () => {
<div className="grid gap-5 lg:gap-7.5 mt-5 relative"> <div className="grid gap-5 lg:gap-7.5 mt-5 relative">
{isReloading && ( {isReloading && (
<div className="fixed inset-0 flex items-center justify-center z-50 bg-white/70"> <div className="fixed inset-0 bg-transparent flex items-center justify-center z-50 text-muted-foreground px-4 py-2">
<div className="flex flex-col items-center"> <div className="flex flex-col items-center">
<RefreshCw className="animate-spin h-8 w-8 text-slate-500 mb-2" /> <RefreshCw className="animate-spin h-8 w-8 text-slate-500 mb-2" />
<span className="text-slate-500 font-medium">Refreshing data...</span> <span className="text-slate-500 font-medium">Refreshing data...</span>

10
src/pages/transaction/approval-transaction/blocks/DetailApprovalTransaction.tsx
View File

@ -42,7 +42,15 @@ const DetailApprovalTransaction = () => {
} }
}, [showDetailDialog, selectedTransactionId, GetData]); }, [showDetailDialog, selectedTransactionId, GetData]);
const [activeTab, setActiveTab] = useState('detail'); // 'detail', 'log', 'approve' const [activeTab, setActiveTab] = useState('detail');
// Reset ke tab awal saat dialog dibuka
useEffect(() => {
if (showDetailDialog) {
setActiveTab('detail');
}
}, [showDetailDialog]);
return ( return (
<Dialog open={showDetailDialog} onOpenChange={setShowDetailDialog}> <Dialog open={showDetailDialog} onOpenChange={setShowDetailDialog}>

10
src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx
View File

@ -56,7 +56,15 @@ const DetailTransaction = () => {
} }
}, [showDetailDialog, selectedTransactionId, GetData]); }, [showDetailDialog, selectedTransactionId, GetData]);
const [activeTab, setActiveTab] = useState('detail'); // 'detail', 'log', 'approve' const [activeTab, setActiveTab] = useState('detail');
// Reset ke tab awal saat dialog dibuka
useEffect(() => {
if (showDetailDialog) {
setActiveTab('detail');
}
}, [showDetailDialog]);
return ( return (
<Dialog open={showDetailDialog} onOpenChange={setShowDetailDialog}> <Dialog open={showDetailDialog} onOpenChange={setShowDetailDialog}>