Merge pull request #791 from sparcs-kaist/dev

Main branch update from Dev branch
sparcs-kaist · May 28, 2024 · 4356ef5 · 4356ef5
2 parents 917be6b + 7acf06a
commit 4356ef5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/packages/web/src/components/Chat/MessagesBody/MessageSet/MessagePaySettlement.tsx b/packages/web/src/components/Chat/MessagesBody/MessageSet/MessagePaySettlement.tsx
@@ -19,7 +19,7 @@ const MessagePaySettlement = ({ type, color }: MessagePaySettlementProps) => (
     }}
     className="selectable"
   >
-    {type === "payment" ? (
+    {type === "settlement" ? (
       <>
         <CreditCardRoundedIcon style={{ fontSize: "18px" }} />
         제가 택시비를 결제했어요 !

diff --git a/packages/web/src/components/ModalPopup/ModalChatPayment.tsx b/packages/web/src/components/ModalPopup/ModalChatPayment.tsx
@@ -65,7 +65,7 @@ const ModalChatPayment = ({
     if (isRequesting.current) return;
     isRequesting.current = true;
     await axios({
-      url: "/rooms/commitSettlement",
+      url: "/rooms/commitPayment",
       method: "post",
       data: { roomId: roomInfo._id },
       onSuccess: () => {

diff --git a/packages/web/src/components/ModalPopup/ModalChatSettlement.tsx b/packages/web/src/components/ModalPopup/ModalChatSettlement.tsx
@@ -46,7 +46,7 @@ const ModalChatSettlement = ({
     if (isRequesting.current || !isValidAccount) return;
     isRequesting.current = true;
     axios({
-      url: "/rooms/commitPayment",
+      url: "/rooms/commitSettlement",
       method: "post",
       data: { roomId: roomInfo._id },
       onSuccess: async () => {