Skip to content

develop > main#219

Merged
VarGun merged 623 commits intomainfrom
develop
Jul 1, 2025
Merged

develop > main#219
VarGun merged 623 commits intomainfrom
develop

Conversation

@jjinleee
Copy link
Contributor

@jjinleee jjinleee commented Jul 1, 2025

No description provided.

VarGun and others added 30 commits June 24, 2025 09:21
…to feat/#97-etf-recommand-modal

# Conflicts:
#	app/(routes)/etf/_components/etf-page-container.tsx
Feat: isa 계좌정보 api 호출로 변경
…egories

Feat: 선호 카테고리 렌더링 (#113)
…mand-modal

# Conflicts:
#	app/(routes)/etf/_components/etf-page-container.tsx
Feat: etf 추천 슬라이더 및 모달 추가
# Conflicts:
#	__tests__/api/etf-recommend-api.test.ts
#	app/(routes)/isa/_components/profit-report.tsx
#	app/api/isa-profit-test/route.ts
jjinleee and others added 20 commits June 27, 2025 23:41
…e-claim-test-description

Refactor: challenge 테스트 description 수정 (#217)
…ily-status-update

Feat: 챌린지 로직 개선, STREAK 연속 출석 계산, DAILY 조건 보완, 수령 조건 정밀화 (#151)
@jjinleee jjinleee self-assigned this Jul 1, 2025
@VarGun VarGun merged commit 28161e6 into main Jul 1, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants