Remove activity indicator and configuration for primary button's visibility from ULAccountMismatchViewController

Author: itsmeichigo

WooCommerce/Classes/Authentication/Navigation Exceptions/ULAccountMismatchViewController.swift

@@ -27,7 +27,6 @@ final class ULAccountMismatchViewController: UIViewController {
     @IBOutlet private weak var logOutButton: UIButton!
     @IBOutlet private weak var primaryButton: NUXButton!
     @IBOutlet private weak var secondaryButton: NUXButton!
-    @IBOutlet private weak var activityIndicator: UIActivityIndicatorView!
 
     @IBOutlet private weak var imageView: UIImageView!
     @IBOutlet private weak var errorMessage: UILabel!
@@ -65,7 +64,6 @@ final class ULAccountMismatchViewController: UIViewController {
 
         configurePrimaryButton()
         configureSecondaryButon()
-        configureActivityIndicator()
 
         setUnifiedMargins(forWidth: view.frame.width)
 
@@ -162,12 +160,6 @@ private extension ULAccountMismatchViewController {
                 self?.primaryButton.showActivityIndicator(isLoading)
             }
             .store(in: &subscriptions)
-
-        viewModel.isPrimaryButtonHidden
-            .sink { [weak self] isHidden in
-                self?.primaryButton.isHidden = isHidden
-            }
-            .store(in: &subscriptions)
     }
 
     func configureSecondaryButon() {
@@ -179,20 +171,6 @@ private extension ULAccountMismatchViewController {
         }
     }
 
-    func configureActivityIndicator() {
-        activityIndicator.hidesWhenStopped = true
-
-        viewModel.isShowingActivityIndicator
-            .sink { [weak self] showing in
-                if showing {
-                    self?.activityIndicator.startAnimating()
-                } else {
-                    self?.activityIndicator.stopAnimating()
-                }
-            }
-            .store(in: &subscriptions)
-    }
-
     /// This logic is lifted from WPAuthenticator's LoginPrologueViewController
     /// This View Controller will be provided to WPAuthenticator. WPAuthenticator
     /// will insert it into its own navigation stack, where it is applying a similar logic
@@ -282,10 +260,6 @@ extension ULAccountMismatchViewController {
         return secondaryButton
     }
 
-    func getActivityIndicator() -> UIActivityIndicatorView {
-        return activityIndicator
-    }
-
     func getUserNameLabel() -> UILabel {
         return userNameLabel
     }

WooCommerce/Classes/Authentication/Navigation Exceptions/ULAccountMismatchViewController.xib

@@ -11,7 +11,6 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ULAccountMismatchViewController" customModule="WooCommerce" customModuleProvider="target">
             <connections>
-                <outlet property="activityIndicator" destination="GcM-pl-Wag" id="SyY-Mz-h3S"/>
                 <outlet property="buttonViewLeadingConstraint" destination="r9Z-y5-j3W" id="bWb-vV-0U2"/>
                 <outlet property="buttonViewTrailingConstraint" destination="3Fe-tr-bmb" id="DjF-95-KFx"/>
                 <outlet property="errorMessage" destination="a2d-le-aKc" id="YgT-Ex-Gwh"/>
@@ -35,17 +34,13 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="10Z-y1-ZQ6" userLabel="Action Background View">
-                    <rect key="frame" x="0.0" y="662" width="414" height="200"/>
+                    <rect key="frame" x="0.0" y="702" width="414" height="160"/>
                     <subviews>
                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="mhI-fa-Yzw">
-                            <rect key="frame" x="20" y="20" width="374" height="160"/>
+                            <rect key="frame" x="20" y="20" width="374" height="120"/>
                             <subviews>
-                                <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" style="medium" id="GcM-pl-Wag">
-                                    <rect key="frame" x="0.0" y="0.0" width="374" height="20"/>
-                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                </activityIndicatorView>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ZHa-is-GJK" userLabel="secondary action button" customClass="NUXButton" customModule="WordPressAuthenticator">
-                                    <rect key="frame" x="0.0" y="40" width="374" height="50"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="374" height="50"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="50" id="Gcd-Af-CS9"/>
                                     </constraints>
@@ -55,7 +50,7 @@
                                     </state>
                                 </button>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0ZR-ma-6pq" userLabel="secondary action button" customClass="NUXButton" customModule="WordPressAuthenticator">
-                                    <rect key="frame" x="0.0" y="110" width="374" height="50"/>
+                                    <rect key="frame" x="0.0" y="70" width="374" height="50"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="50" id="BTA-bw-h4s"/>
                                     </constraints>
@@ -75,7 +70,7 @@
                     </constraints>
                 </view>
                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="32" translatesAutoresizingMaskIntoConstraints="NO" id="jIt-xb-rrN">
-                    <rect key="frame" x="34" y="176" width="346" height="486"/>
+                    <rect key="frame" x="34" y="192" width="346" height="486"/>
                     <subviews>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Np4-PU-IRZ" customClass="CircularImageView" customModule="WooCommerce" customModuleProvider="target">
                             <rect key="frame" x="143" y="0.0" width="60" height="60"/>