From cb053eab3e47ac38f3d4a4de07d0a9de003b36a8 Mon Sep 17 00:00:00 2001
From: Jason Chuang <jchuang@2fi-solutions.com.hk>
Date: Wed, 16 Sep 2026 23:11:07 +0800
Subject: [PATCH] hide pay button after expiry date

---
 .../Details_Public/ApplicationDetailCard.js            | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
index bb9404f2..ced61f70 100644
--- a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
+++ b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
@@ -115,6 +115,13 @@ const ApplicationDetailCard = (
         setStatus("cancel")
     };
 
+    const isPastPaymentDeadline = (expiryDate) => {
+        if (!expiryDate) return false;
+        const deadline = DateUtils.convertToDate(expiryDate);
+        if (!deadline || Number.isNaN(deadline.getTime())) return false;
+        return Date.now() >= deadline.getTime();
+    };
+
     const checkExprityDate = () => {
         HttpUtils.post({
             url: UrlUtils.POST_CHECK_APP_EXPRITY_DATE,
@@ -203,7 +210,8 @@ const ApplicationDetailCard = (
                                 >
                                     <ThemeProvider theme={PNSPS_BUTTON_THEME}>
                                         {
-                                            currentApplicationDetailData.status == "confirmed" ?
+                                            currentApplicationDetailData.status == "confirmed"
+                                            && !isPastPaymentDeadline(currentApplicationDetailData.expiryDate) ?
                                                 <Button
                                                     variant="contained"
                                                     color="create"