Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix popup logic #265

Merged
merged 2 commits into from
Sep 11, 2023
Merged

Fix popup logic #265

merged 2 commits into from
Sep 11, 2023

Conversation

shp7724
Copy link
Contributor

@shp7724 shp7724 commented Sep 10, 2023

다음과 같이 변경

  • 서버 팝업 데이터 기준으로,
    • 동일한 key에 해당하는 Popup이 로컬에 있으면 로컬 데이터 사용, 없으면 (당연히) 서버 데이터 사용
    • 그런데 로컬 팝업 데이터와 서버 데이터 사이에 hidden_days 차이가 있으면 서버 데이터 사용 (안보기 타이머는 초기화)

@shp7724 shp7724 self-assigned this Sep 10, 2023
@shp7724 shp7724 requested a review from a team as a code owner September 10, 2023 06:45
peng-u-0807
peng-u-0807 approved these changes Sep 11, 2023
View reviewed changes
Copy link
Member

@peng-u-0807 peng-u-0807 left a comment

Choose a reason for hiding this comment

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

👍

SNUTT-2022/SNUTT/Services/PopupService.swift Outdated Show resolved Hide resolved
@shp7724 shp7724 merged commit 6b8e00a into master Sep 11, 2023
4 checks passed
@shp7724 shp7724 deleted the shp7724/fix-popup branch September 11, 2023 05:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@peng-u-0807 peng-u-0807 peng-u-0807 approved these changes

Assignees

@shp7724 shp7724

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@shp7724 @peng-u-0807