Release/1.0.10 -> develop (#362)

* chore: 연락처 접근 권한 요청 문구 수정 * feat: 문답 이후 상태 업데이트 * chore: 빌드 넘버 업데이트(36) * chore: profile setup interface에 base webview interface 의존성 주입 * fix: 모래사장 바로가기 버튼 클릭 시 보틀 리스트로 넘어가지 않게 수정 * fix: feat: 모래사장 화면 자기소개 작성 및 보틀 보여주기 로직 수정 * chore: 빌드 넘버 업데이트(37) * fix: 모래사장 바로가기 버튼 클릭 시 보틀 리스트로 넘어가게 수정 --------- Co-authored-by: JongHoon <[email protected]>
Nexters · Nov 11, 2024 · 5261440 · 5261440
1 parent f02f768
commit 5261440
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/Projects/Feature/ProfileSetup/Project.swift b/Projects/Feature/ProfileSetup/Project.swift
@@ -9,7 +9,8 @@ let project = Project.makeModule(
             interface: .ProfileSetup,
             factory: .init(
                 dependencies: [
-                    .domain
+                    .domain,
+                    .feature(interface: .BaseWebView)
                 ]
             )
         ),

diff --git a/Projects/Feature/SandBeach/Interface/Sources/SandBeach/SandBeachFeatureInterface.swift b/Projects/Feature/SandBeach/Interface/Sources/SandBeach/SandBeachFeatureInterface.swift
@@ -123,26 +123,23 @@ extension SandBeachFeature {
             return
           }
 
-          if userProfileStatus == .doneProfileImage {
-            await send(.userStateFetchCompleted(
-              userState: .noBottle(time: nextBottleLeftHours ?? 0),
-              isDisableButton: false))
-            return
-          }
-
-          if newBottlesCount > 0 {
+          if userProfileStatus == .doneProfileImage && newBottlesCount > 0 {
             await send(.userStateFetchCompleted(
               userState: .hasNewBottle(bottleCount: newBottlesCount),
               isDisableButton: false))
             return
           }
 
-          if activeBottlesCount > 0 {
+          if userProfileStatus == .doneProfileImage && activeBottlesCount > 0 {
             await send(.userStateFetchCompleted(
               userState: .hasActiveBottle(bottleCount: activeBottlesCount),
               isDisableButton: false))
             return
           }
+
+          await send(.userStateFetchCompleted(
+            userState: .noBottle(time: nextBottleLeftHours ?? 0),
+            isDisableButton: false))
         } catch: { error, send in
           // TODO: 에러 핸들링
           Log.error(error)

diff --git a/Tuist/ProjectDescriptionHelpers/InfoPlist+Templates.swift b/Tuist/ProjectDescriptionHelpers/InfoPlist+Templates.swift
@@ -11,7 +11,7 @@ public extension InfoPlist {
     static var app: InfoPlist {
         return .extendingDefault(with: [
             "CFBundleShortVersionString": "1.0.10",
-            "CFBundleVersion": "34",
+            "CFBundleVersion": "37",
             "UIUserInterfaceStyle": "Light",
             "CFBundleName": "보틀",
             "UILaunchScreen": [
@@ -46,7 +46,7 @@ public extension InfoPlist {
     static var example: InfoPlist {
         return .extendingDefault(with: [
             "CFBundleShortVersionString": "1.0.10",
-            "CFBundleVersion": "34",
+            "CFBundleVersion": "37",
             "UIUserInterfaceStyle": "Light",
             "UILaunchScreen": [:],
             "UISupportedInterfaceOrientations": [