From 107ea244519bfbc292b5cc7b65310c9e32de46c0 Mon Sep 17 00:00:00 2001
From: Adam Crabtree <adcrabtr@microsoft.com>
Date: Thu, 23 May 2019 22:33:15 +0000
Subject: [PATCH] Merged PR 15362: [GraphNotificationsSample][iOS][UI
 change]Change to make dismiss work correctly

What's Changed:

1. Dismiss button now grays out and disables correctly once the Notification is dismissed.

2. The read button now grays out and dissabled correctly once the Notification is read.

3. The notification list now updates notification's in place instead of sending updated notifications (read, dismissed, etc) to the front of the listview.

4. Main menu improvements to center login and label button across all iOS devices. Now displays correctly.

5. Fixed login and logout scenarios for MSA. The new UI updates properly depending on the status of whether you're logged in or not.

----------------------

How verified:

1. Clicked dismiss and saw the notification update correctly in place.

2. Clicked read and saw the notification update correctly in place.

3. Ran the application on both iPhone and iPad to make sure it displayed correctly on both.

4. Logged in with MSA, observed UI update correctly. Logged out of MSA, observed UI update correctly. Logged back in and saw the UI update correctly.

Screenshots of UI running on iPad.

https://microsoft-my.sharepoint.com/:i:/p/adcrabtr/EV5rE1zE2lhDicbM56araegBx7H7TXKGQ1eM92oDFiZVPA?e=xmhDbS

https://microsoft-my.sharepoint.com/:i:/p/adcrabtr/EfklkqSwrzhCkjw1t2z_t5UB5-uB4WHwTIWR9ZRQBe71Xg?e=zRXzbE
---
 .../Base.lproj/Main.storyboard                | 49 +++++++++-------
 .../LoginViewController.m                     | 16 ++++--
 .../NotificationsManager.m                    |  6 +-
 .../NotificationsViewController.m             | 16 ++++--
 .../SDKSample/iOSSample/main.storyboard       | 56 +++++++++----------
 iOS/samples/SignInHelpers/src/MSAAccount.m    |  4 +-
 6 files changed, 84 insertions(+), 63 deletions(-)

diff --git a/iOS/samples/GraphNotifications/GraphNotificationsSample/Base.lproj/Main.storyboard b/iOS/samples/GraphNotifications/GraphNotificationsSample/Base.lproj/Main.storyboard
index 3ba7b08..af95e06 100644
--- a/iOS/samples/GraphNotifications/GraphNotificationsSample/Base.lproj/Main.storyboard
+++ b/iOS/samples/GraphNotifications/GraphNotificationsSample/Base.lproj/Main.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="703-4V-yAM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="703-4V-yAM">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -33,9 +33,8 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nW6-tV-2PU">
+                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nW6-tV-2PU">
                                 <rect key="frame" x="64" y="263" width="236" height="48"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <state key="normal" title="Login with MSA">
                                     <color key="titleColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -44,32 +43,39 @@
                                     <action selector="loginMSA" destination="S4R-Ja-viH" eventType="touchUpInside" id="JLQ-Q2-VCr"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fz1-y2-7rY">
-                                <rect key="frame" x="64" y="318" width="236" height="48"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                <state key="normal" title="Login with AAD">
-                                    <color key="titleColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                </state>
-                                <connections>
-                                    <action selector="loginAAD" destination="S4R-Ja-viH" eventType="touchUpInside" id="jIC-Q3-hja"/>
-                                </connections>
-                            </button>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Graph Notifications Sample" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MiM-ed-uOi">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Graph Notifications Sample" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MiM-ed-uOi">
                                 <rect key="frame" x="0.0" y="76" width="375" height="21"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="20"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Status" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ho4-ZN-PVf">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Status" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ho4-ZN-PVf">
                                 <rect key="frame" x="16" y="438" width="343" height="21"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
+                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fz1-y2-7rY">
+                                <rect key="frame" x="64" y="319" width="236" height="48"/>
+                                <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <state key="normal" title="Login with AAD">
+                                    <color key="titleColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                </state>
+                                <connections>
+                                    <action selector="loginAAD" destination="S4R-Ja-viH" eventType="touchUpInside" id="jIC-Q3-hja"/>
+                                </connections>
+                            </button>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <constraints>
+                            <constraint firstItem="nW6-tV-2PU" firstAttribute="centerX" secondItem="K9I-jD-KjA" secondAttribute="centerX" id="8gA-iU-zlW"/>
+                            <constraint firstItem="fz1-y2-7rY" firstAttribute="top" secondItem="nW6-tV-2PU" secondAttribute="bottom" constant="8" id="9oF-6X-ybB"/>
+                            <constraint firstItem="nW6-tV-2PU" firstAttribute="top" secondItem="MiM-ed-uOi" secondAttribute="bottom" constant="166" id="Dhx-SE-Bav"/>
+                            <constraint firstItem="nW6-tV-2PU" firstAttribute="centerY" secondItem="K9I-jD-KjA" secondAttribute="centerY" id="ECz-ip-gnS"/>
+                            <constraint firstItem="fz1-y2-7rY" firstAttribute="centerX" secondItem="K9I-jD-KjA" secondAttribute="centerX" id="FHG-lw-Uc9"/>
+                            <constraint firstItem="ho4-ZN-PVf" firstAttribute="centerX" secondItem="K9I-jD-KjA" secondAttribute="centerX" id="sXg-Ml-qeD"/>
+                            <constraint firstItem="MiM-ed-uOi" firstAttribute="centerX" secondItem="K9I-jD-KjA" secondAttribute="centerX" id="wdg-HC-qDx"/>
+                            <constraint firstItem="ho4-ZN-PVf" firstAttribute="top" secondItem="fz1-y2-7rY" secondAttribute="bottom" constant="71" id="wzK-oL-qer"/>
+                        </constraints>
                         <viewLayoutGuide key="safeArea" id="K9I-jD-KjA"/>
                     </view>
                     <connections>
@@ -173,6 +179,11 @@
                                             <state key="normal" title="Dismiss">
                                                 <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                             </state>
+                                            <userDefinedRuntimeAttributes>
+                                                <userDefinedRuntimeAttribute type="number" keyPath="tag">
+                                                    <integer key="value" value="5"/>
+                                                </userDefinedRuntimeAttribute>
+                                            </userDefinedRuntimeAttributes>
                                         </button>
                                         <button opaque="NO" tag="6" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7jd-9p-7fJ">
                                             <rect key="frame" x="216" y="78" width="99" height="30"/>
diff --git a/iOS/samples/GraphNotifications/GraphNotificationsSample/LoginViewController.m b/iOS/samples/GraphNotifications/GraphNotificationsSample/LoginViewController.m
index 56003f6..4d0cab6 100644
--- a/iOS/samples/GraphNotifications/GraphNotificationsSample/LoginViewController.m
+++ b/iOS/samples/GraphNotifications/GraphNotificationsSample/LoginViewController.m
@@ -20,7 +20,7 @@ - (void)viewDidLoad {
 
     _platformManager = [ConnectedDevicesPlatformManager sharedInstance];
     
-    [self _setButtonTextForState:[self _getState]];
+    [self _setButtonTextAndVisibilityForState:[self _getState]];
 }
 
 - (IBAction)loginMSA {
@@ -32,7 +32,7 @@ - (IBAction)loginMSA {
         // Perform MSA sign-in
         [_platformManager signInMsaAsync].then(^{
             [self _setStatusText:[NSString stringWithFormat:@"Currently signed in"]];
-            [self _setButtonTextForState:MSA];
+            [self _setButtonTextAndVisibilityForState:MSA];
         }).catch(^(NSError* error){
             NSLog(@"%@", error);
             [self _setStatusText:[NSString stringWithFormat:@"MSA sign-in failed!"]];
@@ -40,7 +40,7 @@ - (IBAction)loginMSA {
     } else {
         [_platformManager signOutAsync:_platformManager.accounts[0]].then(^{
             [self _setStatusText:[NSString stringWithFormat:@"Currently signed out"]];
-            [self _setButtonTextForState:SIGNED_OUT];
+            [self _setButtonTextAndVisibilityForState:SIGNED_OUT];
         }).catch(^(NSError* error){
             NSLog(@"%@", error);
             [self _setStatusText:[NSString stringWithFormat:@"MSA sign-out failed!"]];
@@ -57,7 +57,7 @@ - (IBAction)loginAAD {
         // Perform AAD sign-in
         [_platformManager signInAadAsync].then(^{
             [self _setStatusText:[NSString stringWithFormat:@"Currently signed in"]];
-            [self _setButtonTextForState:AAD];
+            [self _setButtonTextAndVisibilityForState:AAD];
         }).catch(^(NSError* error){
             NSLog(@"%@", error);
             [self _setStatusText:[NSString stringWithFormat:@"AAD sign-in failed!"]];
@@ -65,7 +65,7 @@ - (IBAction)loginAAD {
     } else {
         [_platformManager signOutAsync:_platformManager.accounts[0]].then(^{
             [self _setStatusText:[NSString stringWithFormat:@"Currently signed out"]];
-            [self _setButtonTextForState:SIGNED_OUT];
+            [self _setButtonTextAndVisibilityForState:SIGNED_OUT];
         }).catch(^(NSError* error){
             NSLog(@"%@", error);
             [self _setStatusText:[NSString stringWithFormat:@"AAD sign-out failed!"]];
@@ -94,22 +94,26 @@ - (LoginState)_getState {
     }
 }
 
-- (void)_setButtonTextForState:(LoginState)state {
+- (void)_setButtonTextAndVisibilityForState:(LoginState)state {
     dispatch_async(dispatch_get_main_queue(), ^{
            switch (state) {
                case SIGNED_OUT:
                    [self.aadButton setTitle:@"Login with AAD" forState:UIControlStateNormal];
                    [self.msaButton setTitle:@"Login with MSA" forState:UIControlStateNormal];
+                   self.aadButton.hidden = FALSE;
+                   self.msaButton.hidden = FALSE;
                    self.loginStatusLabel.text = @"Currently signed-out";
                    break;
                case AAD:
                    [self.aadButton setTitle:@"Logout" forState:UIControlStateNormal];
                    [self.msaButton setTitle:@"" forState:UIControlStateNormal];
+                   self.msaButton.hidden = TRUE;
                    self.loginStatusLabel.text = @"Currently signed-in with AAD";
                    break;
                case MSA:
                    [self.aadButton setTitle:@"" forState:UIControlStateNormal];
                    [self.msaButton setTitle:@"Logout" forState:UIControlStateNormal];
+                   self.aadButton.hidden = TRUE;
                    self.loginStatusLabel.text = @"Currently signed-in with MSA";
                    break;
            }
diff --git a/iOS/samples/GraphNotifications/GraphNotificationsSample/NotificationsManager.m b/iOS/samples/GraphNotifications/GraphNotificationsSample/NotificationsManager.m
index 0453831..3231d43 100644
--- a/iOS/samples/GraphNotifications/GraphNotificationsSample/NotificationsManager.m
+++ b/iOS/samples/GraphNotifications/GraphNotificationsSample/NotificationsManager.m
@@ -168,7 +168,11 @@ - (void)_handleNotifications:(NSArray<MCDUserNotification*>*)notifications {
 
             if (notification.status == MCDUserNotificationStatusActive) {
                 NSLog(@"Notification %@ is active", notification.notificationId);
-                [_notifications insertObject:notification atIndex:0];
+                if(index != NSNotFound) {
+                    [_notifications insertObject:notification atIndex:index];
+                } else {
+                    [_notifications insertObject:notification atIndex:0];
+                }
 
                 if ((notification.userActionState == MCDUserNotificationUserActionStateNoInteraction)
                     && (notification.readState == MCDUserNotificationReadStateUnread)) {
diff --git a/iOS/samples/GraphNotifications/GraphNotificationsSample/NotificationsViewController.m b/iOS/samples/GraphNotifications/GraphNotificationsSample/NotificationsViewController.m
index dc2f004..5157d88 100644
--- a/iOS/samples/GraphNotifications/GraphNotificationsSample/NotificationsViewController.m
+++ b/iOS/samples/GraphNotifications/GraphNotificationsSample/NotificationsViewController.m
@@ -65,7 +65,8 @@ - (nonnull UITableViewCell*)tableView:(nonnull UITableView*)tableView cellForRow
 
     UILabel* actionStateLabel = (UILabel*)[cell viewWithTag:3];
     UIButton* dismissButton = (UIButton*)[cell viewWithTag:5];
-    [dismissButton setTag:indexPath.row];
+    [dismissButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+    [dismissButton setTitleColor:[UIColor grayColor] forState:UIControlStateDisabled];
     if (notification.userActionState == MCDUserNotificationUserActionStateNoInteraction) {
         [actionStateLabel setText:@"No Interaction"];
         dismissButton.enabled = YES;
@@ -76,7 +77,8 @@ - (nonnull UITableViewCell*)tableView:(nonnull UITableView*)tableView cellForRow
     }
 
     UIButton* readButton = (UIButton*)[cell viewWithTag:4];
-    [readButton setTag:indexPath.row];
+    [readButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+    [readButton setTitleColor:[UIColor grayColor] forState:UIControlStateDisabled];
     if (notification.readState == MCDUserNotificationReadStateUnread) {
         [idLabel setTextColor:[UIColor greenColor]];
         readButton.enabled = YES;
@@ -87,19 +89,23 @@ - (nonnull UITableViewCell*)tableView:(nonnull UITableView*)tableView cellForRow
     }
     
     UIButton* deleteButton = (UIButton*)[cell viewWithTag:6];
-    [deleteButton setTag:indexPath.row];
+    [deleteButton setTag:indexPath.row]; 
     [deleteButton addTarget:self action:@selector(handleDelete:) forControlEvents:UIControlEventTouchUpInside];
     
     return cell;
 }
 
 - (IBAction)handleRead:(UIButton*)button {
-    MCDUserNotification* selected = _notificationsManager.notifications[button.tag];
+    CGPoint touchPoint = [button convertPoint:CGPointZero toView:self.tableView];
+    NSIndexPath *clickedButtonIndexPath = [self.tableView indexPathForRowAtPoint:touchPoint];
+    MCDUserNotification* selected = _notificationsManager.notifications[clickedButtonIndexPath.row];
     [_notificationsManager markRead:selected];
 }
 
 - (IBAction)handleDismiss:(UIButton*)button {
-    MCDUserNotification* selected = _notificationsManager.notifications[button.tag];
+    CGPoint touchPoint = [button convertPoint:CGPointZero toView:self.tableView];
+    NSIndexPath *clickedButtonIndexPath = [self.tableView indexPathForRowAtPoint:touchPoint];
+    MCDUserNotification* selected = _notificationsManager.notifications[clickedButtonIndexPath.row];
     [_notificationsManager dismissNotification:selected];
 }
 
diff --git a/iOS/samples/SDKSample/iOSSample/main.storyboard b/iOS/samples/SDKSample/iOSSample/main.storyboard
index 5563699..213ef55 100644
--- a/iOS/samples/SDKSample/iOSSample/main.storyboard
+++ b/iOS/samples/SDKSample/iOSSample/main.storyboard
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="nHg-BC-QdW">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="nHg-BC-QdW">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
-        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -23,7 +22,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3ft-xb-gFq">
-                                <rect key="frame" x="95" y="155" width="185" height="54"/>
+                                <rect key="frame" x="150" y="306.5" width="75" height="54"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="54" id="sa4-E3-t1f"/>
                                 </constraints>
@@ -36,7 +35,7 @@
                                 </connections>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Currently signed out" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1Xl-Qo-E9M">
-                                <rect key="frame" x="99.5" y="73" width="176" height="24"/>
+                                <rect key="frame" x="99.5" y="282.5" width="176" height="24"/>
                                 <fontDescription key="fontDescription" style="UICTFontTextStyleTitle2"/>
                                 <color key="textColor" white="0.66666666669999997" alpha="1" colorSpace="calibratedWhite"/>
                                 <nil key="highlightedColor"/>
@@ -44,11 +43,10 @@
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
-                            <constraint firstItem="1Xl-Qo-E9M" firstAttribute="top" secondItem="qe9-7J-zpT" secondAttribute="bottom" constant="53" id="Qtq-pD-uCv"/>
-                            <constraint firstItem="3ft-xb-gFq" firstAttribute="top" secondItem="qe9-7J-zpT" secondAttribute="bottom" constant="135" id="TbQ-eQ-Tjq"/>
+                            <constraint firstItem="3ft-xb-gFq" firstAttribute="centerY" secondItem="cV7-PZ-5SB" secondAttribute="centerY" id="0b4-Da-9x1"/>
                             <constraint firstItem="3ft-xb-gFq" firstAttribute="centerX" secondItem="cV7-PZ-5SB" secondAttribute="centerX" id="egv-PF-DZf"/>
+                            <constraint firstItem="1Xl-Qo-E9M" firstAttribute="bottom" secondItem="3ft-xb-gFq" secondAttribute="top" id="mq9-5T-wLI"/>
                             <constraint firstItem="1Xl-Qo-E9M" firstAttribute="centerX" secondItem="cV7-PZ-5SB" secondAttribute="centerX" id="qBV-eR-wTA"/>
-                            <constraint firstItem="3ft-xb-gFq" firstAttribute="leading" secondItem="cV7-PZ-5SB" secondAttribute="leadingMargin" constant="79" id="tJ0-em-C5H"/>
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" id="al8-SV-ZkD"/>
@@ -75,7 +73,7 @@
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <subviews>
                                 <button opaque="NO" contentMode="scaleToFill" restorationIdentifier="discoverDevicesButton" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="FOa-o5-O7S">
-                                    <rect key="frame" x="98" y="1" width="179" height="41"/>
+                                    <rect key="frame" x="98" y="1.5" width="179" height="41"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="24"/>
                                     <state key="normal" title="Discover Devices">
                                         <color key="titleColor" red="0.28812987200000001" green="0.42992432310000001" blue="0.53264653500000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -170,7 +168,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="XbC-cE-ryQ">
-                                <rect key="frame" x="116.5" y="472" width="142" height="39"/>
+                                <rect key="frame" x="116.5" y="471.5" width="142" height="39"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="22"/>
                                 <state key="normal" title="Send Message">
                                     <color key="titleColor" red="0.28812987200000001" green="0.42992432310000001" blue="0.53264653500000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -199,7 +197,7 @@
                                 </connections>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Not Connected" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Qzo-Av-ZXM">
-                                <rect key="frame" x="100" y="443" width="116.5" height="21"/>
+                                <rect key="frame" x="100" y="442.5" width="116.5" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" white="0.66666666669999997" alpha="1" colorSpace="calibratedWhite"/>
                                 <nil key="highlightedColor"/>
@@ -307,7 +305,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2TA-ze-jse">
-                                <rect key="frame" x="117.5" y="173" width="140" height="40"/>
+                                <rect key="frame" x="117.5" y="173.5" width="140" height="40"/>
                                 <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="24"/>
                                 <state key="normal" title="Device Relay">
                                     <color key="titleColor" red="0.28812987200000001" green="0.42992432310000001" blue="0.53264653500000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -317,7 +315,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="d1m-Lg-F9v">
-                                <rect key="frame" x="118" y="313" width="139" height="40"/>
+                                <rect key="frame" x="118" y="313.5" width="139" height="40"/>
                                 <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="24"/>
                                 <state key="normal" title="Activity Feed">
                                     <color key="titleColor" red="0.29411764705882354" green="0.43137254901960786" blue="0.52941176470588236" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -327,7 +325,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ole-ZP-zrk" userLabel="App Service">
-                                <rect key="frame" x="145.5" y="453" width="84" height="40"/>
+                                <rect key="frame" x="145.5" y="453.5" width="84" height="40"/>
                                 <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="24"/>
                                 <state key="normal" title="Hosting">
                                     <color key="titleColor" red="0.29411764705882354" green="0.43137254901960786" blue="0.52941176470588236" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -366,7 +364,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="2th-hy-w9N">
-                                <rect key="frame" x="16" y="78" width="343" height="569"/>
+                                <rect key="frame" x="20" y="72" width="335" height="587"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
@@ -374,10 +372,10 @@
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
-                            <constraint firstItem="2th-hy-w9N" firstAttribute="leading" secondItem="XrJ-5v-b1k" secondAttribute="leading" constant="16" id="09i-JJ-183"/>
-                            <constraint firstItem="31e-Ip-mui" firstAttribute="top" secondItem="2th-hy-w9N" secondAttribute="bottom" constant="20" id="3gX-a0-kQk"/>
-                            <constraint firstItem="2th-hy-w9N" firstAttribute="top" secondItem="dJT-MH-ssn" secondAttribute="bottom" constant="14" id="6oV-e4-qBr"/>
-                            <constraint firstAttribute="trailing" secondItem="2th-hy-w9N" secondAttribute="trailing" constant="16" id="j3P-KD-RX3"/>
+                            <constraint firstItem="2th-hy-w9N" firstAttribute="leading" secondItem="XrJ-5v-b1k" secondAttribute="leading" constant="20" symbolic="YES" id="09i-JJ-183"/>
+                            <constraint firstItem="31e-Ip-mui" firstAttribute="top" secondItem="2th-hy-w9N" secondAttribute="bottom" constant="8" symbolic="YES" id="3gX-a0-kQk"/>
+                            <constraint firstItem="2th-hy-w9N" firstAttribute="top" secondItem="dJT-MH-ssn" secondAttribute="bottom" constant="8" symbolic="YES" id="6oV-e4-qBr"/>
+                            <constraint firstAttribute="trailing" secondItem="2th-hy-w9N" secondAttribute="trailing" constant="20" symbolic="YES" id="j3P-KD-RX3"/>
                         </constraints>
                     </view>
                     <connections>
@@ -401,7 +399,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button opaque="NO" contentMode="scaleToFill" restorationIdentifier="createActivityButton" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hYn-qy-Q5E">
-                                <rect key="frame" x="104" y="122" width="168" height="35"/>
+                                <rect key="frame" x="103.5" y="122" width="168" height="35"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="19"/>
                                 <state key="normal" title="Create New Activity">
                                     <color key="titleColor" red="0.28812987200000001" green="0.42992432310000001" blue="0.53264653500000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -411,7 +409,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Vm9-sg-M0A">
-                                <rect key="frame" x="123" y="316" width="131" height="35"/>
+                                <rect key="frame" x="122" y="316" width="131" height="35"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="19"/>
                                 <state key="normal" title="Publish Activity">
                                     <color key="titleColor" red="0.28812987200000001" green="0.42992432310000001" blue="0.53264653500000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -421,7 +419,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ae9-Cu-XFj">
-                                <rect key="frame" x="131" y="386" width="112" height="35"/>
+                                <rect key="frame" x="131.5" y="386" width="112" height="35"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="19"/>
                                 <state key="normal" title="Read Activity">
                                     <color key="titleColor" red="0.28812987200000001" green="0.42992432310000001" blue="0.53264653500000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -431,25 +429,25 @@
                                 </connections>
                             </button>
                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="SnL-O2-x1o">
-                                <rect key="frame" x="76" y="438" width="224" height="30"/>
+                                <rect key="frame" x="76" y="438" width="223" height="30"/>
                                 <nil key="textColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits"/>
                             </textField>
                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="KBa-Yy-C5W">
-                                <rect key="frame" x="76" y="476" width="222" height="30"/>
+                                <rect key="frame" x="76" y="476" width="223" height="30"/>
                                 <nil key="textColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits"/>
                             </textField>
                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="NeJ-KB-NDU" customClass="activityDisplay">
-                                <rect key="frame" x="76" y="514" width="222" height="30"/>
+                                <rect key="frame" x="76" y="514" width="223" height="30"/>
                                 <nil key="textColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits"/>
                             </textField>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Nec-1s-hjq">
-                                <rect key="frame" x="100" y="350" width="174" height="35"/>
+                                <rect key="frame" x="100" y="350" width="175" height="35"/>
                                 <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="19"/>
                                 <state key="normal" title="Activity Session">
                                     <color key="titleColor" red="0.28812987200000001" green="0.42992432310000001" blue="0.53264653500000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -459,19 +457,19 @@
                                 </connections>
                             </button>
                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="BKM-eV-H6x">
-                                <rect key="frame" x="53" y="207" width="270" height="30"/>
+                                <rect key="frame" x="53" y="207" width="269" height="30"/>
                                 <nil key="textColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits"/>
                             </textField>
                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="6H7-Wa-Pgi">
-                                <rect key="frame" x="53" y="169" width="270" height="30"/>
+                                <rect key="frame" x="53" y="169" width="269" height="30"/>
                                 <nil key="textColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits"/>
                             </textField>
                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="qJq-bi-JQO">
-                                <rect key="frame" x="53" y="245" width="270" height="30"/>
+                                <rect key="frame" x="53" y="245" width="269" height="30"/>
                                 <nil key="textColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits"/>
diff --git a/iOS/samples/SignInHelpers/src/MSAAccount.m b/iOS/samples/SignInHelpers/src/MSAAccount.m
index 92bb72e..04eef6e 100644
--- a/iOS/samples/SignInHelpers/src/MSAAccount.m
+++ b/iOS/samples/SignInHelpers/src/MSAAccount.m
@@ -315,9 +315,7 @@ - (void)webViewDidFinishLoad:(UIWebView*)webView
 
             [self removeAccount];
             [self _signInSignOutSucceededAsync:YES
-                                         error:[NSError errorWithDomain:MsaAccountProviderErrorDomain
-                                                                   code:SampleAccountActionFailureReasonFailToRetrieveAuthCode
-                                                               userInfo:nil]];
+                                         error:nil];
         }
         else
         {