Skip to content

Commit

Permalink
Merge pull request #189 from Make-A-Wish-Sopt/hotfix
Browse files Browse the repository at this point in the history
소원 공유 title 핫픽스
  • Loading branch information
Me1e authored Jan 13, 2024
2 parents cae60cb + 8679297 commit 5f4362b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
9 changes: 4 additions & 5 deletions components/Common/Modal/MainShareModal.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import theme from '@/styles/theme';
import styled from 'styled-components';
import ShareContent from './ShareContent';
import { useGetMainProgressData } from '@/hooks/queries/wishes';
import { useGetWishesProgress } from '@/hooks/queries/wishes';
import Image from 'next/image';
import { MainCakeImg, MainWishChatImg } from '@/public/assets/images';
import { CloseWhiteIc } from '@/public/assets/icons';
Expand All @@ -13,7 +13,7 @@ interface MainShareModalProps {

export default function MainShareModal(props: MainShareModalProps) {
const { handleToggle } = props;
const { progressData } = useGetMainProgressData();
const { wishesProgressData } = useGetWishesProgress();

return (
<>
Expand All @@ -22,14 +22,13 @@ export default function MainShareModal(props: MainShareModalProps) {
</Styled.ButtonContainer>

<Styled.Container>
{/* <Styled.Title>{progressData.title}</Styled.Title> */}
<Styled.Title>{'화정이의 앙큼 벌스데이'}</Styled.Title>
<Styled.Title>{wishesProgressData?.title}</Styled.Title>
<Image src={MainWishChatImg} alt="말풍선" />
<Image src={MainCakeImg} alt="메인 케이크 이미지" width={219} />
<Styled.PriceTextWrapper>
{'예상 케이크 금액\n'}
<Styled.PriceText>{`총 ${convertMoneyText(
progressData?.price.toString() || '0',
wishesProgressData?.price.toString() || '0',
)}원`}</Styled.PriceText>
</Styled.PriceTextWrapper>

Expand Down
1 change: 1 addition & 0 deletions constant/queryKey.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ export const QUERY_KEY = {
PAYREADY: 'payReady',
PG_TOKEN: 'pgToken',
USER: 'user',
MAIN: 'main',
ACCOUNT: 'account',
PROGRESS: 'progress',
CAKES_COUNT: 'cakesCount',
Expand Down
2 changes: 1 addition & 1 deletion hooks/queries/wishes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ export function useGetWishesProgress() {
* 진행중인 소원 조회(메인화면)
*/
export function useGetMainProgressData() {
const { data: progressData, ...restProps } = useQuery(QUERY_KEY.PROGRESS, getMainProgressData);
const { data: progressData, ...restProps } = useQuery(QUERY_KEY.MAIN, getMainProgressData);

return { progressData, ...restProps };
}
Expand Down

1 comment on commit 5f4362b

@vercel
Copy link

@vercel vercel bot commented on 5f4362b Jan 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.