Merge pull request #349 from team-yello/fix/#348/qa

Fix [#348] 출시 전 qa 사항 수정
team-yello · Feb 27, 2024 · dd7401a · dd7401a
2 parents 9ffec9d + 0fde66e
commit dd7401a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/YELLO-iOS/YELLO-iOS/Presentation/MyYello/Detail/View/MyYelloDetailView.swift b/YELLO-iOS/YELLO-iOS/Presentation/MyYello/Detail/View/MyYelloDetailView.swift
@@ -495,8 +495,7 @@ extension MyYelloDetailView {
                 if self.indexNumber != -1 {
                     MyYelloListView.myYelloModelDummy[self.indexNumber].nameHint = -2
                 }
-
-
+                UserManager.shared.userTicketCount -= 1
                 if !self.isKeywordUsed {
                     Amplitude.instance().logEvent("view_open_fullnamefirst")
                 } else {

diff --git a/YELLO-iOS/YELLO-iOS/Presentation/Payment/Button/PaymentNameKeyButton.swift b/YELLO-iOS/YELLO-iOS/Presentation/Payment/Button/PaymentNameKeyButton.swift
@@ -58,6 +58,7 @@ final class PaymentNameKeyButton: UIButton {
         self.backgroundColor = .black
 
         infoContainerView.do {
+            $0.isUserInteractionEnabled = false
             $0.makeBorder(width: 1, color: .purpleSub700)
             $0.makeCornerRound(radius: 10.adjustedHeight)
         }

diff --git a/YELLO-iOS/YELLO-iOS/Presentation/Payment/Button/PointButton.swift b/YELLO-iOS/YELLO-iOS/Presentation/Payment/Button/PointButton.swift
@@ -51,7 +51,6 @@ final class PointButton: UIButton {
         self.makeBorder(width: 1, color: .purpleSub700)
         self.makeCornerRound(radius: 10.adjustedHeight)
         self.backgroundColor = .black
-        self.isUserInteractionEnabled = true
 
         pointImageView.do {
             $0.image = ImageLiterals.Payment.imgCoin
@@ -72,11 +71,13 @@ final class PointButton: UIButton {
             $0.spacing = 0
             $0.alignment = .leading
             $0.addArrangedSubviews(pointTitleLabel, subTitleLabel)
+            $0.isUserInteractionEnabled = false
         }
 
         pointLabel.do {
             $0.textColor = .white
             $0.font = .uiBodyMedium
+            $0.isUserInteractionEnabled = false
         }
     }
 

diff --git a/YELLO-iOS/YELLO-iOS/Presentation/Voting/VotingPoint/VotingPointViewController.swift b/YELLO-iOS/YELLO-iOS/Presentation/Voting/VotingPoint/VotingPointViewController.swift
@@ -61,15 +61,10 @@ final class VotingPointViewController: BaseViewController {
             multiplyByTwoImageView.isHidden = false
         } else {
             multiplyByTwoImageView.isHidden = true
+            adButtonStackView.isHidden = isWatchAd
+            originView.yellowButton.isHidden = !isWatchAd
         }
 
-        if isWatchAd {
-            adButtonStackView.isHidden = true
-            originView.yellowButton.isHidden = false
-        } else {
-            adButtonStackView.isHidden = false
-            originView.yellowButton.isHidden = true
-        }
     }
 
     // MARK: - Style