Merge pull request #547 from PermanentOrg/bugfix/VSP-1704-iOS-Fix-resubmission-issue-for-appstore-rejection

luciancerbu-vsp · web-flow · commit fd82fe542e75 · 2026-02-20T14:51:40.000+02:00
VSP-1704 iOS Fix resubmission issue for appstore rejection
diff --git a/.github/workflows/deployRelease.yml b/.github/workflows/deployRelease.yml
@@ -6,7 +6,48 @@ on:
     branches: [ "Release-**" ]
 
 jobs:
+  test:
+    name: Run Unit Tests
+    runs-on: macos-26
+    environment: production
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Update Bundler
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.1.0'
+          bundler-cache: true
+      - uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: '26.2'
+      - name: Cache CocoaPods
+        uses: actions/cache@v3
+        with:
+          path: Pods
+          key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-pods-
+      - name: Run Unit Tests
+        env:
+          CLIENT_ID: ${{ secrets.IOS_FIREBASE_CLIENT_ID }}
+          REVERSED_CLIENT_ID: ${{ secrets.IOS_FIREBASE_REVERSED_CLIENT_ID }}
+          API_KEY: ${{ secrets.IOS_FIREBASE_API_KEY }}
+          GCM_SENDER_ID: ${{ secrets.IOS_FIREBASE_GCM_SENDER_ID }}
+          PROJECT_ID: ${{ secrets.IOS_FIREBASE_PROJECT_ID }}
+          STORAGE_BUCKET: ${{ secrets.IOS_FIREBASE_STORAGE_BUCKET }}
+          GOOGLE_APP_ID: ${{ secrets.IOS_FIREBASE_GOOGLE_APP_ID }}
+          AUTH_TENANT_ID: ${{ secrets.MOBILE_PROD_AUTH_TENANT_ID }}
+          AUTH_CLIENT_ID: ${{ secrets.MOBILE_PROD_AUTH_CLIENT_ID }}
+          AUTH_CLIENT_SECRET: ${{ secrets.MOBILE_PROD_AUTH_CLIENT_SECRET }}
+          STRIPE_PUB_KEY: ${{ secrets.MOBILE_PROD_STRIPE_PUB_KEY }}
+          SKIPLINT: true
+          TEST_PLAN: 'unit-tests'
+        run: bundle exec fastlane tests
+
   build:
+    needs: test
     name: Build and deploy a release build to TestFlight
     runs-on: macos-26
     environment: production
@@ -22,6 +63,13 @@ jobs:
       - uses: maxim-lobanov/setup-xcode@v1
         with:
           xcode-version: '26.2'
+      - name: Cache CocoaPods
+        uses: actions/cache@v3
+        with:
+          path: Pods
+          key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-pods-
       - name: Run Fastlane AppStore
         env:
           CLIENT_ID: ${{ secrets.IOS_FIREBASE_CLIENT_ID }}
diff --git a/Permanent.xcodeproj/project.pbxproj b/Permanent.xcodeproj/project.pbxproj
@@ -4850,14 +4850,10 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Permanent/Pods-Permanent-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Permanent/Pods-Permanent-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Permanent/Pods-Permanent-resources.sh\"\n";
@@ -4871,14 +4867,10 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-PermanentTests/Pods-PermanentTests-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-PermanentTests/Pods-PermanentTests-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-PermanentTests/Pods-PermanentTests-frameworks.sh\"\n";
@@ -4936,14 +4928,10 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Permanent/Pods-Permanent-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Permanent/Pods-Permanent-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Permanent/Pods-Permanent-frameworks.sh\"\n";
diff --git a/Permanent/Common/Base/SwiftUINavigationViews/CustomNavigationView.swift b/Permanent/Common/Base/SwiftUINavigationViews/CustomNavigationView.swift
@@ -84,7 +84,13 @@ struct CustomNavigationView<Content: View, LeftButton: View, RightButton: View>:
             .navigationViewStyle(StackNavigationViewStyle())
         }
         .onAppear {
-            UIDevice.current.setValue(UIInterfaceOrientation.portrait.rawValue, forKey: "orientation")
+            if #available(iOS 16.0, *) {
+                if let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene {
+                    windowScene.requestGeometryUpdate(.iOS(interfaceOrientations: .portrait))
+                }
+            } else {
+                UIDevice.current.setValue(UIInterfaceOrientation.portrait.rawValue, forKey: "orientation")
+            }
             #if !canImport(ShareExtension)
             AppDelegate.orientationLock = .portrait
             ScrollViewAppearanceManager.shared.pushScrollViewBounce(enabled: false, identifier: "CustomNavigationView")
diff --git a/Permanent/Common/Base/SwiftUINavigationViews/SimpleCustomNavigationView.swift b/Permanent/Common/Base/SwiftUINavigationViews/SimpleCustomNavigationView.swift
@@ -70,7 +70,13 @@ struct SimpleCustomNavigationView<Content: View, LeftButton: View, RightButton:
             .navigationViewStyle(StackNavigationViewStyle())
         }
         .onAppear {
-            UIDevice.current.setValue(UIInterfaceOrientation.portrait.rawValue, forKey: "orientation")
+            if #available(iOS 16.0, *) {
+                if let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene {
+                    windowScene.requestGeometryUpdate(.iOS(interfaceOrientations: .portrait))
+                }
+            } else {
+                UIDevice.current.setValue(UIInterfaceOrientation.portrait.rawValue, forKey: "orientation")
+            }
             #if !canImport(ShareExtension)
             AppDelegate.orientationLock = .portrait
             ScrollViewAppearanceManager.shared.pushScrollViewBounce(enabled: false, identifier: "SimpleCustomNavigationView")
diff --git a/Permanent/Modules/AccountSettings/ViewController/AccountInfoViewController.swift b/Permanent/Modules/AccountSettings/ViewController/AccountInfoViewController.swift
@@ -29,19 +29,53 @@ class AccountInfoViewController: BaseViewController<InfoViewModel> {
         viewModel?.trackEvents(action: AccountEventAction.openLoginInfo)
     }
 
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShow(_:)), name: UIResponder.keyboardWillShowNotification, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide(_:)), name: UIResponder.keyboardWillHideNotification, object: nil)
+    }
+
+    override func viewWillDisappear(_ animated: Bool) {
+        super.viewWillDisappear(animated)
+        NotificationCenter.default.removeObserver(self, name: UIResponder.keyboardWillShowNotification, object: nil)
+        NotificationCenter.default.removeObserver(self, name: UIResponder.keyboardWillHideNotification, object: nil)
+    }
+
+    @objc private func keyboardWillShow(_ notification: Notification) {
+        guard let keyboardFrame = notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? CGRect,
+              let duration = notification.userInfo?[UIResponder.keyboardAnimationDurationUserInfoKey] as? Double else { return }
+        let inset = keyboardFrame.height - view.safeAreaInsets.bottom
+        UIView.animate(withDuration: duration) {
+            self.scrollView.contentInset.bottom = inset
+            self.scrollView.verticalScrollIndicatorInsets.bottom = inset
+        }
+    }
+
+    @objc private func keyboardWillHide(_ notification: Notification) {
+        guard let duration = notification.userInfo?[UIResponder.keyboardAnimationDurationUserInfoKey] as? Double else { return }
+        UIView.animate(withDuration: duration) {
+            self.scrollView.contentInset.bottom = 0
+            self.scrollView.verticalScrollIndicatorInsets.bottom = 0
+        }
+    }
+    
+    @objc private func moveToNextFromPhone() {
+        addressView.textField?.becomeFirstResponder()
+    }
+
     private func initUI() {
         title = .accountInfo
         view.backgroundColor = .white
         
-        accountNameView.configureElementUI(label: .accountName, returnKey: UIReturnKeyType.done)
-        primaryEmailView.configureElementUI(label: .primaryEmail, returnKey: UIReturnKeyType.done)
-        mobilePhoneView.configureElementUI(label: .mobilePhone, returnKey: UIReturnKeyType.done, keyboardType: .numbersAndPunctuation)
-        addressView.configureElementUI(label: "Address Line 1".localized(), returnKey: UIReturnKeyType.done)
-        addressView2.configureElementUI(label: "Address Line 2".localized(), returnKey: UIReturnKeyType.done)
-        cityView.configureElementUI(label: .city, returnKey: UIReturnKeyType.done)
-        stateView.configureElementUI(label: .stateOrRegion, returnKey: UIReturnKeyType.done)
-        postalCodeView.configureElementUI(label: .postalcode, returnKey: UIReturnKeyType.done)
-        countryView.configureElementUI(label: .country, returnKey: UIReturnKeyType.done)
+        accountNameView.configureElementUI(label: .accountName, returnKey: .next)
+        primaryEmailView.configureElementUI(label: .primaryEmail, returnKey: .next)
+        mobilePhoneView.configureElementUI(label: .mobilePhone, returnKey: .next, keyboardType: .phonePad)
+        addressView.configureElementUI(label: "Address Line 1".localized(), returnKey: .next)
+        addressView2.configureElementUI(label: "Address Line 2".localized(), returnKey: .next)
+        cityView.configureElementUI(label: .city, returnKey: .next)
+        stateView.configureElementUI(label: .stateOrRegion, returnKey: .next)
+        postalCodeView.configureElementUI(label: .postalcode, returnKey: .next)
+        countryView.configureElementUI(label: .country, returnKey: .done)
         contentUpdateButton.configureActionButtonUI(title: .save)
         deleteAccountButton.configureActionButtonUI(title: "Delete Account".localized(), bgColor: .deepRed)
         
@@ -54,10 +88,27 @@ class AccountInfoViewController: BaseViewController<InfoViewModel> {
         stateView.delegate = self
         postalCodeView.delegate = self
         countryView.delegate = self
-        
+
+        let tapGesture = UITapGestureRecognizer(target: self, action: #selector(dismissKeyboard))
+        tapGesture.cancelsTouchesInView = false
+        scrollView.addGestureRecognizer(tapGesture)
+
         getUserDetails()
+        
+        
+        //toolbar for having a next button on phone number introduction
+        let toolbar = UIToolbar()
+        toolbar.sizeToFit()
+        let nextButton = UIBarButtonItem(title: "Next", style: .done, target: self, action: #selector(moveToNextFromPhone))
+        let spacer = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil)
+        toolbar.items = [spacer, nextButton]
+        mobilePhoneView.textField?.inputAccessoryView = toolbar
     }
     
+    @objc private func dismissKeyboard() {
+        view.endEditing(true)
+    }
+
     @IBAction func pressedUpdateButton(_ sender: RoundedButton) {
         attemptValuesChange()
     }
@@ -147,41 +198,32 @@ extension AccountInfoViewController: UITextFieldDelegate {
     }
     
     func textFieldShouldReturn(_ textField: UITextField) -> Bool {
-        textField.resignFirstResponder()
-        
-        switch textField {
-        case postalCodeView.textField, countryView.textField, cityView.textField, stateView.textField:
-            let point = CGPoint.zero
-            scrollView.setContentOffset(point, animated: true)
-            
-        default:
-            break
+        let fields = [
+            accountNameView.textField,
+            primaryEmailView.textField,
+            mobilePhoneView.textField,
+            addressView.textField,
+            addressView2.textField,
+            cityView.textField,
+            stateView.textField,
+            postalCodeView.textField,
+            countryView.textField
+        ]
+        if let index = fields.firstIndex(of: textField), index < fields.count - 1 {
+            fields[index + 1]?.becomeFirstResponder()
+        } else {
+            textField.resignFirstResponder()
         }
         return true
     }
 
     func textFieldDidBeginEditing(_ textField: UITextField) {
-        let changePosition: [CGFloat] = [view.frame.height / 10, view.frame.height / 7]
         (textField as? PETextField)?.toggleBorder(active: true)
-        
-        let point: CGPoint
-        switch textField {
-        case cityView.textField:
-            point = CGPoint(x: 0, y: textField.frame.origin.y + changePosition[0])
-            
-        case stateView.textField:
-            point = CGPoint(x: 0, y: textField.frame.origin.y + changePosition[0])
-            
-        case postalCodeView.textField:
-            point = CGPoint(x: 0, y: textField.frame.origin.y + changePosition[1])
-            
-        case countryView.textField:
-            point = CGPoint(x: 0, y: textField.frame.origin.y + changePosition[1])
-            
-        default:
-            point = CGPoint.zero
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
+            let fieldFrame = self.scrollView.convert(textField.bounds, from: textField)
+            let visibleRect = fieldFrame.insetBy(dx: 0, dy: -16)
+            self.scrollView.scrollRectToVisible(visibleRect, animated: true)
         }
-        scrollView.setContentOffset(point, animated: true)
     }
     
     func textFieldDidEndEditing(_ textField: UITextField) {
diff --git a/Permanent/Resources/Storyboards/Settings.storyboard b/Permanent/Resources/Storyboards/Settings.storyboard
