From 2f984c042d61ef49b0aa5aa7ebade9d8d169bce9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20Cisin=CC=81ski?= <zbigniew@cisinski.com>
Date: Tue, 23 Apr 2024 23:39:28 +0200
Subject: [PATCH] TF-250 Fixes

---
 TwoFAS/TwoFASWatch Watch App/Data/Models/Category.swift   | 2 +-
 TwoFAS/TwoFASWatch Watch App/IntroductionView.swift       | 1 +
 .../Settings/Security/SecurityView.swift                  | 8 ++++----
 .../Settings/Security/SuccessView.swift                   | 1 +
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/TwoFAS/TwoFASWatch Watch App/Data/Models/Category.swift b/TwoFAS/TwoFASWatch Watch App/Data/Models/Category.swift
index b83aeed7..b0ae0c4d 100644
--- a/TwoFAS/TwoFASWatch Watch App/Data/Models/Category.swift	
+++ b/TwoFAS/TwoFASWatch Watch App/Data/Models/Category.swift	
@@ -38,7 +38,7 @@ extension CategoryData {
             if let section {
                 return section.title
             }
-            return T.Commons.service
+            return T.Tokens.myTokens
         }()
         return Category(id: id, name: name, services: services.toServices())
     }
diff --git a/TwoFAS/TwoFASWatch Watch App/IntroductionView.swift b/TwoFAS/TwoFASWatch Watch App/IntroductionView.swift
index 5d5e0f25..fa8922f4 100644
--- a/TwoFAS/TwoFASWatch Watch App/IntroductionView.swift	
+++ b/TwoFAS/TwoFASWatch Watch App/IntroductionView.swift	
@@ -37,6 +37,7 @@ struct IntroductionView: View {
                 }, label: {
                     Text(T.Commons.continue)
                 })
+                .padding(.vertical, 12)
             }
         }
     }
diff --git a/TwoFAS/TwoFASWatch Watch App/Settings/Security/SecurityView.swift b/TwoFAS/TwoFASWatch Watch App/Settings/Security/SecurityView.swift
index 4095558c..cb0b4f30 100644
--- a/TwoFAS/TwoFASWatch Watch App/Settings/Security/SecurityView.swift	
+++ b/TwoFAS/TwoFASWatch Watch App/Settings/Security/SecurityView.swift	
@@ -104,13 +104,13 @@ struct SecurityView: View {
                         PINKeyboardView(presenter: .init(interactor: InteractorFactory.shared.pinInteractor(variant: .PINValidationWithClose), completion: { result in
                             switch result {
                             case .closed: path.removeLast()
-                            case .verified: path.append(SecurityPath.setPIN(.selectLength))
+                            case .verified: path.append(SecurityPath.changePIN(.selectLength))
                             default: break
                             }
                         }))
                     case .selectLength:
                         PINTypeView(didSelect: { PINType in
-                            path.append(SecurityPath.setPIN(.enterPIN(PINType)))
+                            path.append(SecurityPath.changePIN(.enterPIN(PINType)))
                         }, showClose: true) {
                             path.removeLast(2)
                         }
@@ -118,7 +118,7 @@ struct SecurityView: View {
                         PINKeyboardView(presenter: .init(interactor: InteractorFactory.shared.pinInteractor(variant: .enterNewPIN(PINType)), completion: { result in
                             switch result {
                             case .closed: path.removeLast(3)
-                            case .entered(let appPIN): path.append(SecurityPath.setPIN(.verifyPIN(appPIN)))
+                            case .entered(let appPIN): path.append(SecurityPath.changePIN(.verifyPIN(appPIN)))
                             default: break
                             }
                         }))
@@ -126,7 +126,7 @@ struct SecurityView: View {
                         PINKeyboardView(presenter: .init(interactor: InteractorFactory.shared.pinInteractor(variant: .verifyPIN(appPIN)), completion: { result in
                             switch result {
                             case .closed: path.removeLast(4)
-                            case .saved: path.append(SecurityPath.setPIN(.success))
+                            case .saved: path.append(SecurityPath.changePIN(.success))
                             default: break
                             }
                         }))
diff --git a/TwoFAS/TwoFASWatch Watch App/Settings/Security/SuccessView.swift b/TwoFAS/TwoFASWatch Watch App/Settings/Security/SuccessView.swift
index 1fa9802f..d7d79f25 100644
--- a/TwoFAS/TwoFASWatch Watch App/Settings/Security/SuccessView.swift	
+++ b/TwoFAS/TwoFASWatch Watch App/Settings/Security/SuccessView.swift	
@@ -34,6 +34,7 @@ struct SuccessView: View {
             }
             .controlSize(.large)
         }
+        .navigationBarBackButtonHidden()
     }
 }