diff --git a/src/pages/Payment/Card/index.js b/src/pages/Payment/Card/index.js
index afe5cff..7d7b4f7 100644
--- a/src/pages/Payment/Card/index.js
+++ b/src/pages/Payment/Card/index.js
@@ -69,9 +69,9 @@ const Index = () => {
 
 
     const loadForm = () => {
-        const timeoutdatetime = "2023-10-26T09:04:30Z[UTC]"
-        const convertedDateString = timeoutdatetime.replace("[UTC]", "");
-        setFpsmerchanttimeoutdatetime(convertedDateString)
+        // const timeoutdatetime = "2023-10-26T09:04:30Z[UTC]"
+        // const convertedDateString = timeoutdatetime.replace("[UTC]", "");
+        // setFpsmerchanttimeoutdatetime(convertedDateString)
 
         HttpUtils.post({
             url: paymentPath+loadPaymentUrl+(paymentData.type=="PPS"?"pps":"creditcard"),
diff --git a/src/pages/Payment/FPS/FPS.js b/src/pages/Payment/FPS/FPS.js
index 2dc6595..8272ccd 100644
--- a/src/pages/Payment/FPS/FPS.js
+++ b/src/pages/Payment/FPS/FPS.js
@@ -40,6 +40,7 @@ const Index = () => {
     const [responeData, setResponeDataData] = React.useState({});
     const [fpsTransctionData, setFpsTransctionData] = React.useState({});
     const [fpsmerchanttimeoutdatetime, setFpsmerchanttimeoutdatetime] = React.useState("");
+    const [timeDownCount, setTimeDownCount] = React.useState(0);
    
     // const [fpsqrcodeurl, setFpsqrcodeurl] = React.useState("");
     // const pasgPath = 'https://fps.payapps.hkicl.com.hk'; //PRD
@@ -185,6 +186,8 @@ const Index = () => {
         console.log(time)
         console.log(timeOutDate)
         console.log(currentTime)
+        console.log(timeOutDate.getTime()-currentTime.getTime())
+        setTimeDownCount(timeOutDate.getTime()-currentTime.getTime())
         getPaymentStatus();
         if (timeOutDate.getTime()<currentTime.getTime()){
             console.log("stop");
@@ -239,9 +242,11 @@ const Index = () => {
                                         <br />
                                         <img src={fpsTransctionData.fpsqrcodeimgbase64} alt="QR Code"/>
                                         <br />
-                                        二維碼有效期限10分鐘
+                                        二維碼有效期限3分鐘
                                         <br />
                                         請在規定時間內完成付款流程
+                                        <br />
+                                        {"剩餘時間:"+timeDownCount}
                                     </Typography>
 
                                     <Typography variant="h3" sx={{ ml: 8, mt: 4, mr: 8, textAlign: "center" }}>
diff --git a/src/pages/Payment/MultiPaymentWindow.js b/src/pages/Payment/MultiPaymentWindow.js
index 48574f3..aaa2d4f 100644
--- a/src/pages/Payment/MultiPaymentWindow.js
+++ b/src/pages/Payment/MultiPaymentWindow.js
@@ -33,27 +33,44 @@ const MultiPaymentWindow = (props) => {
 
   const windowTitle = "請選擇付款方式";
   const [content, setContent] = useState();
+  const [loadtTransactionData, setLoadtTransactionData] = useState({});
+  const [loadAvailableMethodData, setLoadAvailableMethodData] = useState([]);
   const [paymentMethod, setPaymentMethod] = useState("");
-  const [transactionData, setTransactionData] = useState([]);
+  const [transactionData, setTransactionData] = useState({});
   const [availableMethodData, setAvailableMethodData] = useState([]);
   const [onReady, setOnReady] = useState(false);
 
   useEffect(() => {
-    console.log(props.availableMethods)
     console.log(props.transactionData)
-    if(props.availableMethods.length > 0){
-        setAvailableMethodData(props.availableMethods)
-        setTransactionData(props.transactionData)
+    if(Object.keys(props.transactionData).length > 0){
+      setLoadtTransactionData(props.transactionData)
     }
   }, [props.transactionData]);
 
   useEffect(() => {
-    console.log(availableMethodData)
-    console.log(transactionData)
-    if(availableMethodData.length > 0){
+    console.log(props.availableMethods)
+    if(props.availableMethods.length > 0){
+      setLoadAvailableMethodData(props.availableMethods)
+    }
+  }, [props.availableMethods]);
+
+  useEffect(() => {
+    if(loadAvailableMethodData.length > 0){
+        setAvailableMethodData(loadAvailableMethodData)
+    }
+  }, [loadAvailableMethodData]);
+
+  useEffect(() => {
+    if(Object.keys(loadtTransactionData).length > 0){
+        setTransactionData(loadtTransactionData)
+    }
+  }, [loadtTransactionData]);
+
+  useEffect(() => {
+    if(availableMethodData.length > 0 && Object.keys(transactionData).length > 0){
         setOnReady(true)
     }
-  }, [availableMethodData]);
+  }, [availableMethodData,transactionData]);
 
   useEffect(() => {
     console.log(paymentMethod)