From f807e73b757413d3f547778a525de06cd3181142 Mon Sep 17 00:00:00 2001
From: wnmayy <wanathachat@gmail.com>
Date: Sat, 19 Oct 2024 21:44:06 +0700
Subject: [PATCH 1/9] fix: hide shirt size requirement

---
 src/core/constants/stepCard.constant.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/constants/stepCard.constant.tsx b/src/core/constants/stepCard.constant.tsx
index e020e9d..330375f 100644
--- a/src/core/constants/stepCard.constant.tsx
+++ b/src/core/constants/stepCard.constant.tsx
@@ -241,7 +241,7 @@ const stepCardConstant: StepCardModel = {
               อย่าลืมชำระเงิน<span style={{ fontWeight: 500, color: "#941014" }}>ก่อนวันที่ 10 พฤศจิกายน</span>{" "}
               เพื่อยืนยันสิทธิ์การเข้าร่วมค่ายด้วยล่ะ !!
             </div>
-            <div style={{ marginTop: "0.75rem" }}>หากไม่เห็นปุ่มชำระค่าใช้จ่าย ให้เลือกไซส์เสื้อก่อน แล้ว Refresh อีกครั้ง</div>
+            {/* <div style={{ marginTop: "0.75rem" }}>หากไม่เห็นปุ่มชำระค่าใช้จ่าย ให้เลือกไซส์เสื้อก่อน แล้ว Refresh อีกครั้ง</div> */}
           </>
         ),
         primaryButton: {

From c67815686a5a217eb508f5033c6c02c728008ad5 Mon Sep 17 00:00:00 2001
From: wnmayy <wanathachat@gmail.com>
Date: Mon, 21 Oct 2024 15:54:05 +0700
Subject: [PATCH 2/9] fix: bank account

---
 .../components/profile/uploadPaymentBlock.component.tsx     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/components/profile/uploadPaymentBlock.component.tsx b/src/core/components/profile/uploadPaymentBlock.component.tsx
index 4477a2a..8169a7f 100644
--- a/src/core/components/profile/uploadPaymentBlock.component.tsx
+++ b/src/core/components/profile/uploadPaymentBlock.component.tsx
@@ -93,9 +93,9 @@ const UploadPaymentBlock: React.FC<UploadPaymentBlockProps> = ({ paymentStatus,
   return (
     <div className={classes.paymentContainer}>
       {/* <img src={paymentQR} alt="QR Code" className={classes.image} /> */}
-      <Typography variant="subtitle1">ชื่อบัญชี TBA</Typography> {/* TODO: แก้ชื่อบัญชี */}
-      <Typography variant="subtitle1">ธนาคาร TBA</Typography> {/* TODO: แก้ชื่อธนาคาร */}
-      <Typography variant="subtitle1">เลขบัญชี TBA</Typography> {/* TODO: แก้เลขบัญชี */}
+      <Typography variant="subtitle1">ชื่อบัญชี กรรมการนิสิต คณะวิศวกรรมศาสตร์ จุฬาฯ</Typography> {/* TODO: แก้ชื่อบัญชี */}
+      <Typography variant="subtitle1">ธนาคารไทยพาณิชย์</Typography> {/* TODO: แก้ชื่อธนาคาร */}
+      <Typography variant="subtitle1">เลขบัญชี 045-286444-0</Typography> {/* TODO: แก้เลขบัญชี */}
       <Typography variant="subtitle1">จำนวน 750 บาท</Typography>
       {errorMessage.current !== "" && (
         <Typography variant="subtitle2" component="div" className={classes.error}>

From 9d8630d408a72c10a1990338b1bb9379833b5d7c Mon Sep 17 00:00:00 2001
From: wnmayy <wanathachat@gmail.com>
Date: Mon, 21 Oct 2024 16:21:21 +0700
Subject: [PATCH 3/9] fix: re-upload file

---
 src/core/components/profile/uploadPaymentBlock.component.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/components/profile/uploadPaymentBlock.component.tsx b/src/core/components/profile/uploadPaymentBlock.component.tsx
index 8169a7f..05cf77c 100644
--- a/src/core/components/profile/uploadPaymentBlock.component.tsx
+++ b/src/core/components/profile/uploadPaymentBlock.component.tsx
@@ -102,7 +102,7 @@ const UploadPaymentBlock: React.FC<UploadPaymentBlockProps> = ({ paymentStatus,
           {errorMessage.current}
         </Typography>
       )}
-      <Button variant="outlined" component="label" className={classes.button} disabled={isUpload}>
+      <Button variant="outlined" component="label" className={classes.button}>
         {status === "EMPTY" ? "อัปโหลดหลักฐานการชำระเงิน" : "อัปโหลดอีกครั้ง"}
         <input type="file" name="payment" hidden accept="image/jpeg, image/png" onChange={uploadFile} />
       </Button>

From 744bcdb588687d57e7fa6eedf96996b097f190a7 Mon Sep 17 00:00:00 2001
From: wnmayy <wanathachat@gmail.com>
Date: Mon, 28 Oct 2024 16:53:12 +0700
Subject: [PATCH 4/9] fix: last uploaded format

---
 src/core/components/profile/stepCard.component.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/components/profile/stepCard.component.tsx b/src/core/components/profile/stepCard.component.tsx
index b6e3f6d..99ecfac 100644
--- a/src/core/components/profile/stepCard.component.tsx
+++ b/src/core/components/profile/stepCard.component.tsx
@@ -371,7 +371,7 @@ const StepCard: React.FC<StepCardProps> = ({ step, status, isApproved }) => {
             </div>
             {step === 5 && application.payment.updatedAt && (
               <Typography variant="subtitle2" className={`${classes.text} ${classes.content}`}>
-                Last uploaded at: {application.payment.updatedAt}
+                Last uploaded at: {`${application.payment.updatedAt.toLocaleDateString()} ${application.payment.updatedAt.toLocaleTimeString()}`}
               </Typography>
             )}
           </>

From 9d950db04ee189162da6135af90b8f4a6b6700f9 Mon Sep 17 00:00:00 2001
From: wnmayy <wanathachat@gmail.com>
Date: Tue, 29 Oct 2024 10:27:44 +0700
Subject: [PATCH 5/9] fix: text style

---
 src/core/components/profile/stepCard.component.tsx | 2 +-
 src/core/constants/stepCard.constant.tsx           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/components/profile/stepCard.component.tsx b/src/core/components/profile/stepCard.component.tsx
index 99ecfac..b6b2027 100644
--- a/src/core/components/profile/stepCard.component.tsx
+++ b/src/core/components/profile/stepCard.component.tsx
@@ -344,7 +344,7 @@ const StepCard: React.FC<StepCardProps> = ({ step, status, isApproved }) => {
             <Typography variant="subtitle2" className={`${classes.text} ${classes.boldText} ${classes.redText} ${classes.paragraphTop}`}>
               หลักฐานการชำระเงินไม่ถูกต้อง
             </Typography>
-            <Typography variant="subtitle2" className={`${classes.text} ${classes.boldText} ${classes.redText} ${classes.paragraphTop}`}>
+            <Typography variant="subtitle2" className={`${classes.text} ${classes.boldText} ${classes.content} ${classes.paragraphTop}`}>
               จากทีมงาน : {application.payment.comment !== "" ? application.payment.comment : "โปรดอัปโหลดอีกครั้ง"}
             </Typography>
           </>
diff --git a/src/core/constants/stepCard.constant.tsx b/src/core/constants/stepCard.constant.tsx
index 9c76910..2fcd217 100644
--- a/src/core/constants/stepCard.constant.tsx
+++ b/src/core/constants/stepCard.constant.tsx
@@ -206,7 +206,7 @@ const stepCardConstant: StepCardModel = {
         contents: (
           <>
             ขอแสดงความยินดี !! น้องเป็นหนึ่งในผู้มีสิทธิ์เข้าร่วมค่ายลานเกียร์ ครั้งที่ {process.env.REACT_APP_CAMP_YEAR} แต่ใด ๆ ก็ตาม
-            อย่าลืมชำระค่าสนับสนุนกิจกรรมเป็นจำนวน 750 บาท ภายในวันที่ 10 พฤศจิกายน 2567 เพื่อยืนยันสิทธิ์การเข้าร่วมค่ายด้วยหล่ะ !!
+            อย่าลืมชำระค่าสนับสนุนกิจกรรมเป็นจำนวน 750 บาท <span style={{ fontWeight: 500, color: "#941014" }}>ภายในวันที่ 10 พฤศจิกายน 2567</span>{" "} เพื่อยืนยันสิทธิ์การเข้าร่วมค่ายด้วยหล่ะ !!
             <div style={{ marginTop: "0.75rem" }}>
               (หมายเหตุ หากน้องมีความประสงค์จะขอสละสิทธิ์ สามารถขอสละสิทธิ์ได้ โดยทำการแจ้งชื่อ นามสกุลและรหัส LG ผ่านทางเฟซบุ๊กเพจ LarnGear Camp)
             </div>

From a864f24bf56df88b1e81bea84af78ad0245d9b9b Mon Sep 17 00:00:00 2001
From: wnmayy <wanathachat@gmail.com>
Date: Tue, 29 Oct 2024 10:42:38 +0700
Subject: [PATCH 6/9] fix: bank account

---
 src/core/components/profile/uploadPaymentBlock.component.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/components/profile/uploadPaymentBlock.component.tsx b/src/core/components/profile/uploadPaymentBlock.component.tsx
index 05cf77c..a77deac 100644
--- a/src/core/components/profile/uploadPaymentBlock.component.tsx
+++ b/src/core/components/profile/uploadPaymentBlock.component.tsx
@@ -93,9 +93,9 @@ const UploadPaymentBlock: React.FC<UploadPaymentBlockProps> = ({ paymentStatus,
   return (
     <div className={classes.paymentContainer}>
       {/* <img src={paymentQR} alt="QR Code" className={classes.image} /> */}
-      <Typography variant="subtitle1">ชื่อบัญชี กรรมการนิสิต คณะวิศวกรรมศาสตร์ จุฬาฯ</Typography> {/* TODO: แก้ชื่อบัญชี */}
+      <Typography variant="subtitle1">ชื่อบัญชี : กรรมการนิสิต คณะวิศวกรรมศาสตร์ จุฬาฯ</Typography> {/* TODO: แก้ชื่อบัญชี */}
       <Typography variant="subtitle1">ธนาคารไทยพาณิชย์</Typography> {/* TODO: แก้ชื่อธนาคาร */}
-      <Typography variant="subtitle1">เลขบัญชี 045-286444-0</Typography> {/* TODO: แก้เลขบัญชี */}
+      <Typography variant="subtitle1">เลขบัญชี : 045-286444-0</Typography> {/* TODO: แก้เลขบัญชี */}
       <Typography variant="subtitle1">จำนวน 750 บาท</Typography>
       {errorMessage.current !== "" && (
         <Typography variant="subtitle2" component="div" className={classes.error}>

From 0c2b147d78f7d1f8791ffc037662aa0077943e6f Mon Sep 17 00:00:00 2001
From: wnmayy <wanathachat@gmail.com>
Date: Tue, 29 Oct 2024 11:59:28 +0700
Subject: [PATCH 7/9] fix: time format

---
 src/core/components/profile/stepCard.component.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/components/profile/stepCard.component.tsx b/src/core/components/profile/stepCard.component.tsx
index b6b2027..9502804 100644
--- a/src/core/components/profile/stepCard.component.tsx
+++ b/src/core/components/profile/stepCard.component.tsx
@@ -371,7 +371,7 @@ const StepCard: React.FC<StepCardProps> = ({ step, status, isApproved }) => {
             </div>
             {step === 5 && application.payment.updatedAt && (
               <Typography variant="subtitle2" className={`${classes.text} ${classes.content}`}>
-                Last uploaded at: {`${application.payment.updatedAt.toLocaleDateString()} ${application.payment.updatedAt.toLocaleTimeString()}`}
+                Last uploaded at: {application.payment.updatedAt}
               </Typography>
             )}
           </>

From 745dbe41385abe9af355227bb80595600eb70850 Mon Sep 17 00:00:00 2001
From: wnmayy <wanathachat@gmail.com>
Date: Tue, 29 Oct 2024 12:20:47 +0700
Subject: [PATCH 8/9] fix: date format

---
 src/core/components/profile/stepCard.component.tsx           | 2 +-
 src/core/components/profile/uploadPaymentBlock.component.tsx | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/components/profile/stepCard.component.tsx b/src/core/components/profile/stepCard.component.tsx
index 9502804..5e7534e 100644
--- a/src/core/components/profile/stepCard.component.tsx
+++ b/src/core/components/profile/stepCard.component.tsx
@@ -371,7 +371,7 @@ const StepCard: React.FC<StepCardProps> = ({ step, status, isApproved }) => {
             </div>
             {step === 5 && application.payment.updatedAt && (
               <Typography variant="subtitle2" className={`${classes.text} ${classes.content}`}>
-                Last uploaded at: {application.payment.updatedAt}
+                Last uploaded at: {application.payment.updatedAt.toLocaleDateString('en-US')}
               </Typography>
             )}
           </>
diff --git a/src/core/components/profile/uploadPaymentBlock.component.tsx b/src/core/components/profile/uploadPaymentBlock.component.tsx
index a77deac..5267171 100644
--- a/src/core/components/profile/uploadPaymentBlock.component.tsx
+++ b/src/core/components/profile/uploadPaymentBlock.component.tsx
@@ -93,9 +93,9 @@ const UploadPaymentBlock: React.FC<UploadPaymentBlockProps> = ({ paymentStatus,
   return (
     <div className={classes.paymentContainer}>
       {/* <img src={paymentQR} alt="QR Code" className={classes.image} /> */}
-      <Typography variant="subtitle1">ชื่อบัญชี : กรรมการนิสิต คณะวิศวกรรมศาสตร์ จุฬาฯ</Typography> {/* TODO: แก้ชื่อบัญชี */}
+      <Typography variant="subtitle1">ชื่อบัญชี: กรรมการนิสิต คณะวิศวกรรมศาสตร์ จุฬาฯ</Typography> {/* TODO: แก้ชื่อบัญชี */}
       <Typography variant="subtitle1">ธนาคารไทยพาณิชย์</Typography> {/* TODO: แก้ชื่อธนาคาร */}
-      <Typography variant="subtitle1">เลขบัญชี : 045-286444-0</Typography> {/* TODO: แก้เลขบัญชี */}
+      <Typography variant="subtitle1">เลขบัญชี: 045-286444-0</Typography> {/* TODO: แก้เลขบัญชี */}
       <Typography variant="subtitle1">จำนวน 750 บาท</Typography>
       {errorMessage.current !== "" && (
         <Typography variant="subtitle2" component="div" className={classes.error}>

From b63874bda6603632fbead8ffb2b03e1661fa7610 Mon Sep 17 00:00:00 2001
From: wnmayy <wanathachat@gmail.com>
Date: Tue, 29 Oct 2024 13:55:49 +0700
Subject: [PATCH 9/9] fix: date-time format

---
 src/core/components/profile/stepCard.component.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/components/profile/stepCard.component.tsx b/src/core/components/profile/stepCard.component.tsx
index 5e7534e..1dff085 100644
--- a/src/core/components/profile/stepCard.component.tsx
+++ b/src/core/components/profile/stepCard.component.tsx
@@ -371,7 +371,7 @@ const StepCard: React.FC<StepCardProps> = ({ step, status, isApproved }) => {
             </div>
             {step === 5 && application.payment.updatedAt && (
               <Typography variant="subtitle2" className={`${classes.text} ${classes.content}`}>
-                Last uploaded at: {application.payment.updatedAt.toLocaleDateString('en-US')}
+                Last uploaded at: {(new Date(application.payment.updatedAt)).toLocaleString()}
               </Typography>
             )}
           </>