From 88eeb54cff20b721e5140aeb1dd1778301e92fd6 Mon Sep 17 00:00:00 2001
From: JGibson2019 <jacqueline.gibson@microsoft.com>
Date: Fri, 12 Jun 2020 08:43:40 -0700
Subject: [PATCH 01/71] feat(android-setup): prompt-connected-start-testing
 step UI (#2867)

* added everything to the prompt-connected-start-testing-step and updated renderInitializer to allow us to trigger scanning from the android setup view

* updated the prompt-connected-start-testing-step test files and snapshots; also made some styling changes to the dialog itself
---
 .../android-setup/android-setup-types.ts      |  1 +
 .../default-android-setup-components.ts       |  2 +
 .../prompt-connected-start-testing-step.scss  | 12 +++
 .../prompt-connected-start-testing-step.tsx   | 59 +++++++++++++++
 src/electron/views/renderer-initializer.ts    |  6 ++
 .../android-setup-step-props-builder.tsx      |  1 +
 ...android-setup-step-container.test.tsx.snap |  1 +
 .../detect-devices-step.test.tsx.snap         |  1 +
 .../detect-service-step.test.tsx.snap         |  1 +
 .../installing-service-step.test.tsx.snap     |  1 +
 ...connected-start-testing-step.test.tsx.snap | 75 +++++++++++++++++++
 ...ompt-connected-start-testing-step.test.tsx | 70 +++++++++++++++++
 12 files changed, 230 insertions(+)
 create mode 100644 src/electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.scss
 create mode 100644 src/electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.tsx
 create mode 100644 src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-connected-start-testing-step.test.tsx.snap
 create mode 100644 src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.test.tsx

diff --git a/src/electron/views/device-connect-view/components/android-setup/android-setup-types.ts b/src/electron/views/device-connect-view/components/android-setup/android-setup-types.ts
index 55188b3c15b..384d65dfdc6 100644
--- a/src/electron/views/device-connect-view/components/android-setup/android-setup-types.ts
+++ b/src/electron/views/device-connect-view/components/android-setup/android-setup-types.ts
@@ -20,6 +20,7 @@ export type AndroidSetupPageDeps = {
     androidSetupStepComponentProvider: AndroidSetupStepComponentProvider;
     LinkComponent: LinkComponentType;
     closeApp: () => void;
+    startTesting: () => void;
 };
 
 // 'Partial' is used to allow missing step IDs as they get implemented.
diff --git a/src/electron/views/device-connect-view/components/android-setup/default-android-setup-components.ts b/src/electron/views/device-connect-view/components/android-setup/default-android-setup-components.ts
index 1ff8b5b88d3..071168920ce 100644
--- a/src/electron/views/device-connect-view/components/android-setup/default-android-setup-components.ts
+++ b/src/electron/views/device-connect-view/components/android-setup/default-android-setup-components.ts
@@ -7,6 +7,7 @@ import { DetectServiceStep } from 'electron/views/device-connect-view/components
 import { InstallingServiceStep } from 'electron/views/device-connect-view/components/android-setup/installing-service-step';
 import { PromptChooseDeviceStep } from 'electron/views/device-connect-view/components/android-setup/prompt-choose-device-step';
 import { PromptConnectToDeviceStep } from 'electron/views/device-connect-view/components/android-setup/prompt-connect-to-device-step';
+import { PromptConnectedStartTestingStep } from 'electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step';
 import { PromptGrantPermissionsStep } from 'electron/views/device-connect-view/components/android-setup/prompt-grant-permissions-step';
 import { PromptInstallFailedStep } from 'electron/views/device-connect-view/components/android-setup/prompt-install-failed-step';
 import { PromptInstallServiceStep } from 'electron/views/device-connect-view/components/android-setup/prompt-install-service-step';
@@ -23,4 +24,5 @@ export const defaultAndroidSetupComponents: AndroidSetupStepComponentProvider =
     'installing-service': InstallingServiceStep,
     'detect-devices': DetectDevicesStep,
     'detect-service': DetectServiceStep,
+    'prompt-connected-start-testing': PromptConnectedStartTestingStep,
 };
diff --git a/src/electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.scss b/src/electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.scss
new file mode 100644
index 00000000000..517cf667a64
--- /dev/null
+++ b/src/electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.scss
@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+@import '../../../../../common/styles/fonts.scss';
+
+.device-description {
+    margin-top: 16px;
+    margin-bottom: 16px;
+}
+
+.rescan-button {
+    margin-top: 16px;
+}
diff --git a/src/electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.tsx b/src/electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.tsx
new file mode 100644
index 00000000000..9dfbf470ee7
--- /dev/null
+++ b/src/electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.tsx
@@ -0,0 +1,59 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+import { NamedFC } from 'common/react/named-fc';
+import {
+    DeviceDescription,
+    DeviceDescriptionProps,
+} from 'electron/views/device-connect-view/components/android-setup/device-description';
+import * as styles from 'electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.scss';
+import { Button } from 'office-ui-fabric-react';
+import * as React from 'react';
+
+import { AndroidSetupStepLayout, AndroidSetupStepLayoutProps } from './android-setup-step-layout';
+import { CommonAndroidSetupStepProps } from './android-setup-types';
+
+export const PromptConnectedStartTestingStep = NamedFC<CommonAndroidSetupStepProps>(
+    'PromptConnectedStartTestingStep',
+    (props: CommonAndroidSetupStepProps) => {
+        const { LinkComponent } = props.deps;
+
+        const onRescanButton = () => {
+            // To be implemented in future feature work
+            console.log(`androidSetupActionCreator.rescanDevices()`);
+        };
+
+        const layoutProps: AndroidSetupStepLayoutProps = {
+            headerText: 'Connected and ready to go!',
+            moreInfoLink: (
+                <LinkComponent href="https://aka.ms/accessibility-insights-for-android/otherDevice">
+                    How do I connect a different device?
+                </LinkComponent>
+            ),
+            leftFooterButtonProps: {
+                text: 'Cancel',
+                onClick: props.deps.androidSetupActionCreator.cancel,
+            },
+            rightFooterButtonProps: {
+                text: 'Start testing',
+                disabled: false,
+                onClick: props.deps.startTesting,
+            },
+        };
+
+        const descriptionProps: DeviceDescriptionProps = {
+            ...props.androidSetupStoreData.selectedDevice,
+            className: styles.deviceDescription,
+        };
+
+        return (
+            <AndroidSetupStepLayout {...layoutProps}>
+                <DeviceDescription {...descriptionProps}></DeviceDescription>
+                <Button
+                    className={styles.rescanButton}
+                    text="Rescan devices"
+                    onClick={onRescanButton}
+                />
+            </AndroidSetupStepLayout>
+        );
+    },
+);
diff --git a/src/electron/views/renderer-initializer.ts b/src/electron/views/renderer-initializer.ts
index 016b194c344..e7472954dd1 100644
--- a/src/electron/views/renderer-initializer.ts
+++ b/src/electron/views/renderer-initializer.ts
@@ -440,6 +440,11 @@ getPersistedData(indexedDBInstance, indexedDBDataKeysToFetch).then(
             null,
         );
 
+        const startTesting = () => {
+            windowStateActionCreator.setRoute({ routeId: 'resultsView' });
+            windowFrameActionCreator.maximize();
+        };
+
         const deps: RootContainerRendererDeps = {
             ipcRendererShim: ipcRendererShim,
             userConfigurationStore,
@@ -470,6 +475,7 @@ getPersistedData(indexedDBInstance, indexedDBDataKeysToFetch).then(
             reportExportServiceProvider: ReportExportServiceProviderImpl,
             androidSetupStepComponentProvider: defaultAndroidSetupComponents,
             closeApp: ipcRendererShim.closeWindow,
+            startTesting: startTesting,
         };
 
         window.insightsUserConfiguration = new UserConfigurationController(interpreter);
diff --git a/src/tests/unit/common/android-setup-step-props-builder.tsx b/src/tests/unit/common/android-setup-step-props-builder.tsx
index a80f75c701d..e24152cd13c 100644
--- a/src/tests/unit/common/android-setup-step-props-builder.tsx
+++ b/src/tests/unit/common/android-setup-step-props-builder.tsx
@@ -24,6 +24,7 @@ export class AndroidSetupStepPropsBuilder extends BaseDataBuilder<CommonAndroidS
                 androidSetupActionCreator: null,
                 androidSetupStepComponentProvider: null,
                 closeApp: null,
+                startTesting: null,
             },
         };
     }
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/android-setup-step-container.test.tsx.snap b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/android-setup-step-container.test.tsx.snap
index 7cc676c3efe..4cf916a8dd4 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/android-setup-step-container.test.tsx.snap
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/android-setup-step-container.test.tsx.snap
@@ -16,6 +16,7 @@ exports[`AndroidSetupStepContainer passes common props and deps through 1`] = `
         "prompt-locate-adb": [Function],
       },
       "closeApp": null,
+      "startTesting": null,
     }
   }
   userConfigurationStoreData={
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/detect-devices-step.test.tsx.snap b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/detect-devices-step.test.tsx.snap
index 70c491d7f49..39eaeb7f799 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/detect-devices-step.test.tsx.snap
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/detect-devices-step.test.tsx.snap
@@ -9,6 +9,7 @@ exports[`DetectDevicesStep renders 1`] = `
         "androidSetupActionCreator": null,
         "androidSetupStepComponentProvider": null,
         "closeApp": null,
+        "startTesting": null,
       }
     }
     spinnerLabel="Scanning for devices..."
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/detect-service-step.test.tsx.snap b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/detect-service-step.test.tsx.snap
index 73927355605..e4a390972e4 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/detect-service-step.test.tsx.snap
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/detect-service-step.test.tsx.snap
@@ -9,6 +9,7 @@ exports[`DetectServiceStep renders 1`] = `
         "androidSetupActionCreator": null,
         "androidSetupStepComponentProvider": null,
         "closeApp": null,
+        "startTesting": null,
       }
     }
     disableCancel={true}
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/installing-service-step.test.tsx.snap b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/installing-service-step.test.tsx.snap
index 688a987ffee..aee874ab55f 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/installing-service-step.test.tsx.snap
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/installing-service-step.test.tsx.snap
@@ -9,6 +9,7 @@ exports[`InstallingServiceStep renders 1`] = `
         "androidSetupActionCreator": null,
         "androidSetupStepComponentProvider": null,
         "closeApp": null,
+        "startTesting": null,
       }
     }
     spinnerLabel="Installing on your device..."
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-connected-start-testing-step.test.tsx.snap b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-connected-start-testing-step.test.tsx.snap
new file mode 100644
index 00000000000..f20060310db
--- /dev/null
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-connected-start-testing-step.test.tsx.snap
@@ -0,0 +1,75 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`PromptConnectedStartTestingStep renders with device 1`] = `
+<AndroidSetupStepLayout
+  headerText="Connected and ready to go!"
+  leftFooterButtonProps={
+    Object {
+      "onClick": [Function],
+      "text": "Cancel",
+    }
+  }
+  moreInfoLink={
+    <LinkComponent
+      href="https://aka.ms/accessibility-insights-for-android/otherDevice"
+    >
+      How do I connect a different device?
+    </LinkComponent>
+  }
+  rightFooterButtonProps={
+    Object {
+      "disabled": false,
+      "onClick": [Function],
+      "text": "Start testing",
+    }
+  }
+>
+  <DeviceDescription
+    className="deviceDescription"
+    description="Super-Duper Gadget"
+    isEmulator={false}
+  />
+  <Button
+    className="rescanButton"
+    onClick={[Function]}
+    text="Rescan devices"
+  />
+</AndroidSetupStepLayout>
+`;
+
+exports[`PromptConnectedStartTestingStep renders with emulator 1`] = `
+<AndroidSetupStepLayout
+  headerText="Connected and ready to go!"
+  leftFooterButtonProps={
+    Object {
+      "onClick": [Function],
+      "text": "Cancel",
+    }
+  }
+  moreInfoLink={
+    <LinkComponent
+      href="https://aka.ms/accessibility-insights-for-android/otherDevice"
+    >
+      How do I connect a different device?
+    </LinkComponent>
+  }
+  rightFooterButtonProps={
+    Object {
+      "disabled": false,
+      "onClick": [Function],
+      "text": "Start testing",
+    }
+  }
+>
+  <DeviceDescription
+    className="deviceDescription"
+    description="Emulator Extraordinaire"
+    isEmulator={true}
+  />
+  <Button
+    className="rescanButton"
+    onClick={[Function]}
+    text="Rescan devices"
+  />
+</AndroidSetupStepLayout>
+`;
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.test.tsx b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.test.tsx
new file mode 100644
index 00000000000..44f42841f66
--- /dev/null
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.test.tsx
@@ -0,0 +1,70 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+import { AndroidSetupActionCreator } from 'electron/flux/action-creator/android-setup-action-creator';
+import { DeviceMetadata } from 'electron/flux/types/device-metadata';
+import { AndroidSetupStepLayout } from 'electron/views/device-connect-view/components/android-setup/android-setup-step-layout';
+import { CommonAndroidSetupStepProps } from 'electron/views/device-connect-view/components/android-setup/android-setup-types';
+import { PromptConnectedStartTestingStep } from 'electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step';
+import { shallow } from 'enzyme';
+import * as React from 'react';
+import { AndroidSetupStepPropsBuilder } from 'tests/unit/common/android-setup-step-props-builder';
+import { IMock, It, Mock, MockBehavior } from 'typemoq';
+
+describe('PromptConnectedStartTestingStep', () => {
+    let props: CommonAndroidSetupStepProps;
+    let startTestingMock: IMock<typeof props.deps.startTesting>;
+    const mockCancelAction = Mock.ofInstance(_ => {}, MockBehavior.Strict);
+    let sampleAndroidSetupActionCreator: AndroidSetupActionCreator;
+
+    beforeEach(() => {
+        startTestingMock = Mock.ofInstance(() => {});
+        mockCancelAction.setup(m => m(It.isAny())).verifiable();
+        sampleAndroidSetupActionCreator = {
+            cancel: mockCancelAction.object,
+        } as AndroidSetupActionCreator;
+        props = new AndroidSetupStepPropsBuilder('prompt-connected-start-testing')
+            .withDep('startTesting', startTestingMock.object)
+            .withDep('androidSetupActionCreator', sampleAndroidSetupActionCreator)
+            .build();
+    });
+
+    it('renders with device', () => {
+        const selectedDevice: DeviceMetadata = {
+            isEmulator: false,
+            description: 'Super-Duper Gadget',
+        };
+
+        props.androidSetupStoreData.selectedDevice = selectedDevice;
+
+        const rendered = shallow(<PromptConnectedStartTestingStep {...props} />);
+        expect(rendered.getElement()).toMatchSnapshot();
+    });
+
+    it('renders with emulator', () => {
+        const selectedDevice: DeviceMetadata = {
+            isEmulator: true,
+            description: 'Emulator Extraordinaire',
+        };
+
+        props.androidSetupStoreData.selectedDevice = selectedDevice;
+
+        const rendered = shallow(<PromptConnectedStartTestingStep {...props} />);
+        expect(rendered.getElement()).toMatchSnapshot();
+    });
+
+    it('passes startTesting dep through', () => {
+        const stubEvent = {} as React.MouseEvent<HTMLButtonElement>;
+        const rendered = shallow(<PromptConnectedStartTestingStep {...props} />);
+        rendered.find(AndroidSetupStepLayout).prop('rightFooterButtonProps').onClick(stubEvent);
+        startTestingMock.verifyAll();
+    });
+
+    it('handles the cancel button with the cancel action', () => {
+        const rendered = shallow(<PromptConnectedStartTestingStep {...props} />);
+
+        const stubEvent = {} as React.MouseEvent<HTMLButtonElement>;
+        rendered.find(AndroidSetupStepLayout).prop('leftFooterButtonProps').onClick(stubEvent);
+
+        mockCancelAction.verifyAll();
+    });
+});

From af060886b15876ec2cb94e54d305c590c22de4a9 Mon Sep 17 00:00:00 2001
From: AhmedAbdoOrtiga <45858632+AhmedAbdoOrtiga@users.noreply.github.com>
Date: Fri, 12 Jun 2020 10:27:59 -0700
Subject: [PATCH 02/71] Set "no mathcing/failing instances were found" to be
 bold (#2866)

---
 src/DetailsView/components/requirement-view.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/DetailsView/components/requirement-view.scss b/src/DetailsView/components/requirement-view.scss
index 60506cb148f..e330f7dbc7f 100644
--- a/src/DetailsView/components/requirement-view.scss
+++ b/src/DetailsView/components/requirement-view.scss
@@ -23,3 +23,7 @@
         line-height: 20px;
     }
 }
+
+:global(.no-matching-elements) {
+    font-weight: bold;
+}

From 4d38826a98530295ffd5c3d52cf13e9ec0bf46f8 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 12 Jun 2020 17:46:02 +0000
Subject: [PATCH 03/71] chore(deps): bump appium-adb from 8.5.1 to 8.6.0
 (#2868)

---
 package.json |  2 +-
 yarn.lock    | 34 +++++++---------------------------
 2 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/package.json b/package.json
index b51fa109f36..c28d37b995b 100644
--- a/package.json
+++ b/package.json
@@ -138,7 +138,7 @@
     },
     "dependencies": {
         "accessibility-insights-for-android-service-bin": "^1.2.0",
-        "appium-adb": "^8.5.1",
+        "appium-adb": "^8.6.0",
         "applicationinsights-js": "^1.0.21",
         "axe-core": "3.5.1",
         "axios": "^0.19.2",
diff --git a/yarn.lock b/yarn.lock
index 9d865884c2c..92c2dcf8d0a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -225,20 +225,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.7.2":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2":
   version "7.10.2"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.2.tgz#d103f21f2602497d38348a32e008637d506db839"
   integrity sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg==
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.1.2", "@babel/runtime@^7.5.5":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz#a9102eb5cadedf3f31d08a9ecf294af7827ea29f"
-  integrity sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==
-  dependencies:
-    regenerator-runtime "^0.13.4"
-
 "@babel/template@^7.3.3":
   version "7.8.6"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b"
@@ -1761,10 +1754,10 @@ app-builder-lib@22.7.0, app-builder-lib@^22.6.1:
     semver "^7.3.2"
     temp-file "^3.3.7"
 
-appium-adb@^8.5.1:
-  version "8.5.1"
-  resolved "https://registry.yarnpkg.com/appium-adb/-/appium-adb-8.5.1.tgz#c5506be9c01be34ae821e68528f30ea0e8bac7fb"
-  integrity sha512-bCkE2icGWGzRJDpNw/c2ZwQNnBQm/YGfHMkkjSKErv4416PWxbcx2iBgIe3MHHGx5w2aKS2ZEG0ELzxlMLA7Ag==
+appium-adb@^8.6.0:
+  version "8.6.0"
+  resolved "https://registry.yarnpkg.com/appium-adb/-/appium-adb-8.6.0.tgz#c172f0961108845e9dc200c414ac770d40183955"
+  integrity sha512-LLNjpJyebJvJiyewil5j32I3Zjp0T8QY+kRdtosEM3bFALYzKbBXbZildhzuDPN+5g2+FTb2rLd/KbyPo/ZjGw==
   dependencies:
     "@babel/runtime" "^7.0.0"
     adbkit-apkreader "^3.1.2"
@@ -2255,16 +2248,11 @@ bluebird-lst@^1.0.9:
   dependencies:
     bluebird "^3.5.5"
 
-bluebird@^3.4.7, bluebird@^3.5.1:
+bluebird@^3.4.7, bluebird@^3.5.1, bluebird@^3.5.5:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
-bluebird@^3.5.5:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.1.tgz#df70e302b471d7473489acf26a93d63b53f874de"
-  integrity sha512-DdmyoGCleJnkbp3nkbxTLJ18rjDsE4yCggEwKNXkeV123sPNfOCYeDoeuOY+F2FrSjO1YXcTU+dsy96KMy+gcg==
-
 bmp-js@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/bmp-js/-/bmp-js-0.1.0.tgz#e05a63f796a6c1ff25f4771ec7adadc148c07233"
@@ -9871,7 +9859,7 @@ source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@^0.5.19, source-map-support@^0.5.3, source-map-support@^0.5.5:
+source-map-support@^0.5.19, source-map-support@^0.5.3, source-map-support@^0.5.5, source-map-support@^0.5.6, source-map-support@~0.5.12:
   version "0.5.19"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
   integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
@@ -9879,14 +9867,6 @@ source-map-support@^0.5.19, source-map-support@^0.5.3, source-map-support@^0.5.5
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
-source-map-support@^0.5.6, source-map-support@~0.5.12:
-  version "0.5.16"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
-  integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
 source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"

From 49cbeb0d1f1cf23510b225ee3ef05f873c3adcb7 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 12 Jun 2020 17:46:54 +0000
Subject: [PATCH 04/71] chore(deps-dev): bump fake-indexeddb from 3.0.1 to
 3.0.2 (#2854)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index c28d37b995b..1823f95caba 100644
--- a/package.json
+++ b/package.json
@@ -91,7 +91,7 @@
         "enzyme-adapter-react-16": "^1.15.2",
         "express": "^4.16.4",
         "extract-zip": "^2.0.1",
-        "fake-indexeddb": "^3.0.1",
+        "fake-indexeddb": "^3.0.2",
         "fork-ts-checker-webpack-plugin": "^4.1.6",
         "grunt": "^1.1.0",
         "grunt-bom-removal": "1.0.1",
diff --git a/yarn.lock b/yarn.lock
index 92c2dcf8d0a..7250dd1e753 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4398,10 +4398,10 @@ extsprintf@^1.2.0:
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
   integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
-fake-indexeddb@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/fake-indexeddb/-/fake-indexeddb-3.0.1.tgz#42e478f9faa9a5a358dcb0a6392d979d7458c427"
-  integrity sha512-F+qD/G91cvuD/ItaTx3wUaGTp0hMV6p5neZswhUvnisMARdG7cZCc+7L6zzx2nELSAdK3G5WGVjyb619WdcZZA==
+fake-indexeddb@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/fake-indexeddb/-/fake-indexeddb-3.0.2.tgz#53bdef4c6b71b605b53bad1a9f649c4812031210"
+  integrity sha512-m1OBz7GIbOG8ETsmlJPlCU/GP+HR7AsWvBJDH1qtDg1o4sbBrOtNduAGweSNwsoN1uKGHedmRMEWcVIr2y7HOQ==
   dependencies:
     realistic-structured-clone "^2.0.1"
     setimmediate "^1.0.5"

From 108bc282702c60d031760d7136ceb27a88176fb6 Mon Sep 17 00:00:00 2001
From: Justin Hutchings <jhutchings1@users.noreply.github.com>
Date: Fri, 12 Jun 2020 10:49:39 -0700
Subject: [PATCH 05/71] chore: add CodeQL security scanning (#2803)

We discussed this with our engineering team in our weekly "engineering discussion" yesterday to make sure everyone would understand what was going on with the new checks. Folks were excited to give it a try, and unanimously agreed that it would be a good idea to enable it. Thanks again, Justin!
---
 .github/workflows/codeql.yml | 52 ++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 .github/workflows/codeql.yml

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
new file mode 100644
index 00000000000..9771ca0f4ed
--- /dev/null
+++ b/.github/workflows/codeql.yml
@@ -0,0 +1,52 @@
+name: "Code scanning - action"
+
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: '0 19 * * 0'
+
+jobs:
+  CodeQL-Build:
+
+    # CodeQL runs on ubuntu-latest and windows-latest
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        # We must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head.
+        fetch-depth: 2
+
+    # If this run was triggered by a pull request event, then checkout
+    # the head of the pull request instead of the merge commit.
+    - run: git checkout HEAD^2
+      if: ${{ github.event_name == 'pull_request' }}
+      
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      # Override language selection by uncommenting this and choosing your languages
+      # with:
+      #   languages: go, javascript, csharp, python, cpp, java
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

From 37756d31ae14c5d9db4284ecc8f5598cef899118 Mon Sep 17 00:00:00 2001
From: Rob Gallo <43080011+RobGallo@users.noreply.github.com>
Date: Fri, 12 Jun 2020 14:16:06 -0400
Subject: [PATCH 06/71] feat(android-setup): Create three state machine steps
 (#2865)

* feat(android-setup): Add prompt-locate-adb state machine step

* feat(android-setup): Add prompt-connect-to-device state machine step

* feat(android-setup): Add detect-devices state machine step

* feat(android-setup): Add new step configs to allAndroidSetupStateMachineConfigs
---
 .../setup/android-setup-steps-configs.ts      | 11 ++-
 .../steps/{detect.adb.ts => detect-adb.ts}    |  2 +-
 .../android/setup/steps/detect-devices.ts     | 33 +++++++
 .../setup/steps/prompt-connect-to-device.ts   | 12 +++
 .../android/setup/steps/prompt-locate-adb.ts  | 15 +++
 .../android/setup/steps/detect-adb.test.ts    |  6 +-
 .../setup/steps/detect-devices.test.ts        | 95 +++++++++++++++++++
 .../steps/prompt-connect-to-device.test.ts    | 26 +++++
 .../setup/steps/prompt-locate-adb.test.ts     | 29 ++++++
 9 files changed, 221 insertions(+), 8 deletions(-)
 rename src/electron/platform/android/setup/steps/{detect.adb.ts => detect-adb.ts} (80%)
 create mode 100644 src/electron/platform/android/setup/steps/detect-devices.ts
 create mode 100644 src/electron/platform/android/setup/steps/prompt-connect-to-device.ts
 create mode 100644 src/electron/platform/android/setup/steps/prompt-locate-adb.ts
 create mode 100644 src/tests/unit/tests/electron/platform/android/setup/steps/detect-devices.test.ts
 create mode 100644 src/tests/unit/tests/electron/platform/android/setup/steps/prompt-connect-to-device.test.ts
 create mode 100644 src/tests/unit/tests/electron/platform/android/setup/steps/prompt-locate-adb.test.ts

diff --git a/src/electron/platform/android/setup/android-setup-steps-configs.ts b/src/electron/platform/android/setup/android-setup-steps-configs.ts
index be84288b493..71950e8512b 100644
--- a/src/electron/platform/android/setup/android-setup-steps-configs.ts
+++ b/src/electron/platform/android/setup/android-setup-steps-configs.ts
@@ -5,11 +5,14 @@ import { AndroidSetupActions } from 'electron/flux/action/android-setup-actions'
 import { AndroidSetupStoreCallbacks } from 'electron/flux/types/android-setup-state-machine-types';
 import { AndroidSetupDeps } from 'electron/platform/android/setup/android-setup-deps';
 import { AndroidSetupStepId } from 'electron/platform/android/setup/android-setup-step-id';
+import { detectDevices } from 'electron/platform/android/setup/steps/detect-devices';
+import { promptConnectToDevice } from 'electron/platform/android/setup/steps/prompt-connect-to-device';
+import { promptLocateAdb } from 'electron/platform/android/setup/steps/prompt-locate-adb';
 import {
     StateMachineStepConfig,
     StateMachineStepConfigs,
 } from './state-machine/state-machine-step-configs';
-import { detectAdb } from './steps/detect.adb';
+import { detectAdb } from './steps/detect-adb';
 
 export type AndroidSetupStepConfigDeps = AndroidSetupDeps & AndroidSetupStoreCallbacks;
 
@@ -26,9 +29,9 @@ type AndroidSetupStepConfigs = StateMachineStepConfigs<
 
 export const allAndroidSetupStepConfigs: AndroidSetupStepConfigs = {
     'detect-adb': detectAdb,
-    'prompt-locate-adb': null,
-    'prompt-connect-to-device': null,
-    'detect-devices': null,
+    'prompt-locate-adb': promptLocateAdb,
+    'prompt-connect-to-device': promptConnectToDevice,
+    'detect-devices': detectDevices,
     'prompt-choose-device': null,
     'detect-service': null,
     'prompt-install-service': null,
diff --git a/src/electron/platform/android/setup/steps/detect.adb.ts b/src/electron/platform/android/setup/steps/detect-adb.ts
similarity index 80%
rename from src/electron/platform/android/setup/steps/detect.adb.ts
rename to src/electron/platform/android/setup/steps/detect-adb.ts
index 9d12823bd99..4ba78040865 100644
--- a/src/electron/platform/android/setup/steps/detect.adb.ts
+++ b/src/electron/platform/android/setup/steps/detect-adb.ts
@@ -7,6 +7,6 @@ export const detectAdb: AndroidSetupStepConfig = deps => ({
     actions: {},
     onEnter: async () => {
         const detected = await deps.hasAdbPath();
-        deps.stepTransition(detected ? 'detect-devices' : 'prompt-locate-adb');
+        deps.stepTransition(detected ? 'prompt-connect-to-device' : 'prompt-locate-adb');
     },
 });
diff --git a/src/electron/platform/android/setup/steps/detect-devices.ts b/src/electron/platform/android/setup/steps/detect-devices.ts
new file mode 100644
index 00000000000..309532fd41b
--- /dev/null
+++ b/src/electron/platform/android/setup/steps/detect-devices.ts
@@ -0,0 +1,33 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import { AndroidSetupStepConfig } from 'electron/platform/android/setup/android-setup-steps-configs';
+
+export const detectDevices: AndroidSetupStepConfig = deps => {
+    return {
+        actions: {
+            cancel: () => {
+                deps.stepTransition('prompt-connect-to-device');
+            },
+        },
+        onEnter: async () => {
+            const devices = await deps.getDevices();
+
+            switch (devices.length) {
+                case 0: {
+                    deps.stepTransition('prompt-connect-to-device');
+                    break;
+                }
+                case 1: {
+                    deps.setSelectedDeviceId(devices[0].id);
+                    deps.stepTransition('detect-service');
+                    break;
+                }
+                default: {
+                    deps.stepTransition('prompt-choose-device');
+                    break;
+                }
+            }
+        },
+    };
+};
diff --git a/src/electron/platform/android/setup/steps/prompt-connect-to-device.ts b/src/electron/platform/android/setup/steps/prompt-connect-to-device.ts
new file mode 100644
index 00000000000..969c28a0d9f
--- /dev/null
+++ b/src/electron/platform/android/setup/steps/prompt-connect-to-device.ts
@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import { AndroidSetupStepConfig } from 'electron/platform/android/setup/android-setup-steps-configs';
+
+export const promptConnectToDevice: AndroidSetupStepConfig = deps => {
+    return {
+        actions: {
+            next: () => deps.stepTransition('detect-devices'),
+        },
+    };
+};
diff --git a/src/electron/platform/android/setup/steps/prompt-locate-adb.ts b/src/electron/platform/android/setup/steps/prompt-locate-adb.ts
new file mode 100644
index 00000000000..38db3d2e70a
--- /dev/null
+++ b/src/electron/platform/android/setup/steps/prompt-locate-adb.ts
@@ -0,0 +1,15 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import { AndroidSetupStepConfig } from 'electron/platform/android/setup/android-setup-steps-configs';
+
+export const promptLocateAdb: AndroidSetupStepConfig = deps => {
+    return {
+        actions: {
+            saveAdbPath: (path: string) => {
+                deps.setAdbPath(path);
+                deps.stepTransition('prompt-connect-to-device');
+            },
+        },
+    };
+};
diff --git a/src/tests/unit/tests/electron/platform/android/setup/steps/detect-adb.test.ts b/src/tests/unit/tests/electron/platform/android/setup/steps/detect-adb.test.ts
index 04fff5fbb13..5cfb9aacc53 100644
--- a/src/tests/unit/tests/electron/platform/android/setup/steps/detect-adb.test.ts
+++ b/src/tests/unit/tests/electron/platform/android/setup/steps/detect-adb.test.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import { AndroidSetupStepConfigDeps } from 'electron/platform/android/setup/android-setup-steps-configs';
-import { detectAdb } from 'electron/platform/android/setup/steps/detect.adb';
+import { detectAdb } from 'electron/platform/android/setup/steps/detect-adb';
 import { Mock, MockBehavior, Times } from 'typemoq';
 import { checkExpectedActionsAreDefined } from './actions-tester';
 
@@ -14,7 +14,7 @@ describe('Android setup step: detectAdb', () => {
         expect(step.onEnter).toBeDefined();
     });
 
-    it('onEnter transitions to detect-devices as expected', async () => {
+    it('onEnter transitions to prompt-connect-to-device as expected', async () => {
         const p = new Promise<boolean>(resolve => resolve(true));
 
         const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
@@ -23,7 +23,7 @@ describe('Android setup step: detectAdb', () => {
             .returns(_ => p)
             .verifiable(Times.once());
 
-        depsMock.setup(m => m.stepTransition('detect-devices')).verifiable(Times.once());
+        depsMock.setup(m => m.stepTransition('prompt-connect-to-device')).verifiable(Times.once());
 
         const step = detectAdb(depsMock.object);
         await step.onEnter();
diff --git a/src/tests/unit/tests/electron/platform/android/setup/steps/detect-devices.test.ts b/src/tests/unit/tests/electron/platform/android/setup/steps/detect-devices.test.ts
new file mode 100644
index 00000000000..912be8b02ff
--- /dev/null
+++ b/src/tests/unit/tests/electron/platform/android/setup/steps/detect-devices.test.ts
@@ -0,0 +1,95 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import { DeviceInfo } from 'electron/platform/android/android-service-configurator';
+import { AndroidSetupStepConfigDeps } from 'electron/platform/android/setup/android-setup-steps-configs';
+import { detectDevices } from 'electron/platform/android/setup/steps/detect-devices';
+import { Mock, MockBehavior, Times } from 'typemoq';
+import { checkExpectedActionsAreDefined } from './actions-tester';
+
+describe('Android setup step: detectDevices', () => {
+    it('has expected properties', () => {
+        const deps = {} as AndroidSetupStepConfigDeps;
+        const step = detectDevices(deps);
+        checkExpectedActionsAreDefined(step, ['cancel']);
+        expect(step.onEnter).toBeDefined();
+    });
+
+    it('cancel transitions to prompt-connect-to-device as expected', () => {
+        const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
+        depsMock.setup(m => m.stepTransition('prompt-connect-to-device')).verifiable(Times.once());
+
+        const step = detectDevices(depsMock.object);
+        step.actions.cancel();
+
+        depsMock.verifyAll();
+    });
+
+    it('onEnter transitions to prompt-connect-to-device as expected', async () => {
+        const devices: DeviceInfo[] = [];
+        const p = new Promise<DeviceInfo[]>(resolve => resolve(devices));
+
+        const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
+        depsMock
+            .setup(m => m.getDevices())
+            .returns(_ => p)
+            .verifiable(Times.once());
+
+        depsMock.setup(m => m.stepTransition('prompt-connect-to-device')).verifiable(Times.once());
+
+        const step = detectDevices(depsMock.object);
+        await step.onEnter();
+
+        depsMock.verifyAll();
+    });
+
+    it('onEnter transitions to detect-service as expected', async () => {
+        const devices: DeviceInfo[] = [
+            {
+                id: 'device1',
+            } as DeviceInfo,
+        ];
+
+        const p = new Promise<DeviceInfo[]>(resolve => resolve(devices));
+
+        const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
+        depsMock
+            .setup(m => m.getDevices())
+            .returns(_ => p)
+            .verifiable(Times.once());
+
+        depsMock.setup(m => m.stepTransition('detect-service')).verifiable(Times.once());
+        depsMock.setup(m => m.setSelectedDeviceId('device1')).verifiable(Times.once());
+
+        const step = detectDevices(depsMock.object);
+        await step.onEnter();
+
+        depsMock.verifyAll();
+    });
+
+    it('onEnter transitions to prompt-choose-device as expected', async () => {
+        const devices: DeviceInfo[] = [
+            {
+                id: 'device1',
+            } as DeviceInfo,
+            {
+                id: 'device2',
+            } as DeviceInfo,
+        ];
+
+        const p = new Promise<DeviceInfo[]>(resolve => resolve(devices));
+
+        const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
+        depsMock
+            .setup(m => m.getDevices())
+            .returns(_ => p)
+            .verifiable(Times.once());
+
+        depsMock.setup(m => m.stepTransition('prompt-choose-device')).verifiable(Times.once());
+
+        const step = detectDevices(depsMock.object);
+        await step.onEnter();
+
+        depsMock.verifyAll();
+    });
+});
diff --git a/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-connect-to-device.test.ts b/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-connect-to-device.test.ts
new file mode 100644
index 00000000000..8f837faf051
--- /dev/null
+++ b/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-connect-to-device.test.ts
@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import { AndroidSetupStepConfigDeps } from 'electron/platform/android/setup/android-setup-steps-configs';
+import { promptConnectToDevice } from 'electron/platform/android/setup/steps/prompt-connect-to-device';
+import { Mock, MockBehavior, Times } from 'typemoq';
+import { checkExpectedActionsAreDefined } from './actions-tester';
+
+describe('Android setup step: promptConnectToDevice', () => {
+    it('has expected properties', () => {
+        const deps = {} as AndroidSetupStepConfigDeps;
+        const step = promptConnectToDevice(deps);
+        checkExpectedActionsAreDefined(step, ['next']);
+        expect(step.onEnter).not.toBeDefined();
+    });
+
+    it('next transitions to detect-devices as expected', () => {
+        const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
+        depsMock.setup(m => m.stepTransition('detect-devices')).verifiable(Times.once());
+
+        const step = promptConnectToDevice(depsMock.object);
+        step.actions.next();
+
+        depsMock.verifyAll();
+    });
+});
diff --git a/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-locate-adb.test.ts b/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-locate-adb.test.ts
new file mode 100644
index 00000000000..491d4fb1094
--- /dev/null
+++ b/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-locate-adb.test.ts
@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import { AndroidSetupStepConfigDeps } from 'electron/platform/android/setup/android-setup-steps-configs';
+import { promptLocateAdb } from 'electron/platform/android/setup/steps/prompt-locate-adb';
+import { Mock, MockBehavior, Times } from 'typemoq';
+import { checkExpectedActionsAreDefined } from './actions-tester';
+
+describe('Android setup step: promptLocateAdb', () => {
+    it('has expected properties', () => {
+        const deps = {} as AndroidSetupStepConfigDeps;
+        const step = promptLocateAdb(deps);
+        checkExpectedActionsAreDefined(step, ['saveAdbPath']);
+        expect(step.onEnter).not.toBeDefined();
+    });
+
+    it('saveAdbPath transitions to prompt-connect-to-device as expected', () => {
+        const testPath = 'my test path';
+
+        const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
+        depsMock.setup(m => m.setAdbPath(testPath)).verifiable(Times.once());
+        depsMock.setup(m => m.stepTransition('prompt-connect-to-device')).verifiable(Times.once());
+
+        const step = promptLocateAdb(depsMock.object);
+        step.actions.saveAdbPath(testPath);
+
+        depsMock.verifyAll();
+    });
+});

From 139168ce4fb36593d8777f968b06cbae86b5f09f Mon Sep 17 00:00:00 2001
From: Karan <karansin@microsoft.com>
Date: Fri, 12 Jun 2020 13:31:49 -0700
Subject: [PATCH 07/71] feat(android-setup): add selection & device
 descriptions to prompt-choose-device dialog  (#2858)

---
 .../prompt-choose-device-step.scss            |  4 ++
 .../prompt-choose-device-step.tsx             | 68 +++++++++++++++----
 .../prompt-choose-device-step.test.tsx.snap   | 43 ++++++++++--
 .../prompt-choose-device-step.test.tsx        |  9 ++-
 4 files changed, 102 insertions(+), 22 deletions(-)

diff --git a/src/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.scss b/src/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.scss
index d9b74ce1426..21b1f8ca39a 100644
--- a/src/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.scss
+++ b/src/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.scss
@@ -14,3 +14,7 @@
 .checkmark {
     font-size: large;
 }
+
+.row {
+    height: 36px;
+}
diff --git a/src/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.tsx b/src/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.tsx
index dd988d37afc..a7787bd918d 100644
--- a/src/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.tsx
+++ b/src/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.tsx
@@ -1,21 +1,45 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-import { NamedFC } from 'common/react/named-fc';
+import { DeviceMetadata } from 'electron/flux/types/device-metadata';
 import {
     CheckboxVisibility,
     DefaultButton,
     DetailsList,
     FontIcon,
+    ISelection,
+    Selection,
     SelectionMode,
 } from 'office-ui-fabric-react';
 import * as React from 'react';
 import { AndroidSetupStepLayout, AndroidSetupStepLayoutProps } from './android-setup-step-layout';
 import { CommonAndroidSetupStepProps } from './android-setup-types';
+import { DeviceDescription } from './device-description';
 import * as styles from './prompt-choose-device-step.scss';
 
-export const PromptChooseDeviceStep = NamedFC<CommonAndroidSetupStepProps>(
-    'PromptChooseDeviceStep',
-    (props: CommonAndroidSetupStepProps) => {
+export type PromptChooseDeviceStepState = {
+    selectedDevice: DeviceMetadata;
+};
+
+export class PromptChooseDeviceStep extends React.Component<
+    CommonAndroidSetupStepProps,
+    PromptChooseDeviceStepState
+> {
+    private selection: ISelection;
+    constructor(props) {
+        super(props);
+        this.state = { selectedDevice: null };
+
+        this.selection = new Selection({
+            onSelectionChanged: () => {
+                const details = this.selection.getSelection();
+                if (details.length > 0) {
+                    this.setState({ selectedDevice: details[0] as DeviceMetadata });
+                }
+            },
+        });
+    }
+
+    public render(): JSX.Element {
         const onNextButton = () => {
             // To be implemented in future feature work
             console.log(`androidSetupActionCreator.next()`);
@@ -26,33 +50,42 @@ export const PromptChooseDeviceStep = NamedFC<CommonAndroidSetupStepProps>(
             console.log(`androidSetupActionCreator.rescan()`);
         };
 
-        const items = [
+        // Available devices will be retrieved from store in future feature work
+        const devices: DeviceMetadata[] = [
             {
-                value: 'Phone 1',
+                description: 'Phone 1',
+                isEmulator: true,
             },
             {
-                value: 'Phone 2',
+                description: 'Phone 2',
+                isEmulator: false,
             },
             {
-                value: 'Phone 3',
+                description: 'Phone 3',
+                isEmulator: true,
             },
         ];
 
+        const items = devices.map(m => ({ metadata: m }));
+
         const layoutProps: AndroidSetupStepLayoutProps = {
             headerText: 'Choose which device to use',
             children: (
                 <>
-                    <p>2 Android devices or emulators connected</p>
+                    <p>{devices.length} Android devices or emulators connected</p>
                     <DefaultButton text="Rescan" onClick={onRescanButton} />
                     <DetailsList
+                        setKey={'devices'}
+                        compact={true}
                         ariaLabel="android devices"
                         className={styles.phoneList}
                         items={items}
+                        selection={this.selection}
                         selectionMode={SelectionMode.single}
                         checkboxVisibility={CheckboxVisibility.always}
                         isHeaderVisible={false}
                         checkboxCellClassName={styles.checkmarkCell}
-                        checkButtonAriaLabel="select device"
+                        checkButtonAriaLabel="select"
                         onRenderCheckbox={checkboxProps => {
                             return checkboxProps.checked ? (
                                 <>
@@ -61,22 +94,27 @@ export const PromptChooseDeviceStep = NamedFC<CommonAndroidSetupStepProps>(
                             ) : null;
                         }}
                         onRenderItemColumn={item => {
-                            return <p>{item.value}</p>;
+                            return (
+                                <DeviceDescription
+                                    className={styles.row}
+                                    {...item.metadata}
+                                ></DeviceDescription>
+                            );
                         }}
                     />
                 </>
             ),
             leftFooterButtonProps: {
                 text: 'Close',
-                onClick: _ => props.deps.closeApp(),
+                onClick: _ => this.props.deps.closeApp(),
             },
             rightFooterButtonProps: {
                 text: 'Next',
-                disabled: false,
+                disabled: this.state.selectedDevice === null,
                 onClick: onNextButton,
             },
         };
 
         return <AndroidSetupStepLayout {...layoutProps}></AndroidSetupStepLayout>;
-    },
-);
+    }
+}
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-choose-device-step.test.tsx.snap b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-choose-device-step.test.tsx.snap
index d66ef32ec00..db19a8949a8 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-choose-device-step.test.tsx.snap
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-choose-device-step.test.tsx.snap
@@ -11,7 +11,7 @@ exports[`PromptChooseDeviceStep renders per snapshot 1`] = `
   }
   rightFooterButtonProps={
     Object {
-      "disabled": false,
+      "disabled": true,
       "onClick": [Function],
       "text": "Next",
     }
@@ -19,7 +19,8 @@ exports[`PromptChooseDeviceStep renders per snapshot 1`] = `
 >
   <React.Fragment>
     <p>
-      2 Android devices or emulators connected
+      3
+       Android devices or emulators connected
     </p>
     <CustomizedDefaultButton
       onClick={[Function]}
@@ -27,27 +28,57 @@ exports[`PromptChooseDeviceStep renders per snapshot 1`] = `
     />
     <StyledWithViewportComponent
       ariaLabel="android devices"
-      checkButtonAriaLabel="select device"
+      checkButtonAriaLabel="select"
       checkboxCellClassName="checkmarkCell"
       checkboxVisibility={1}
       className="phoneList"
+      compact={true}
       isHeaderVisible={false}
       items={
         Array [
           Object {
-            "value": "Phone 1",
+            "metadata": Object {
+              "description": "Phone 1",
+              "isEmulator": true,
+            },
           },
           Object {
-            "value": "Phone 2",
+            "metadata": Object {
+              "description": "Phone 2",
+              "isEmulator": false,
+            },
           },
           Object {
-            "value": "Phone 3",
+            "metadata": Object {
+              "description": "Phone 3",
+              "isEmulator": true,
+            },
           },
         ]
       }
       onRenderCheckbox={[Function]}
       onRenderItemColumn={[Function]}
+      selection={
+        Selection {
+          "_anchoredIndex": 0,
+          "_canSelectItem": [Function],
+          "_changeEventSuppressionCount": 0,
+          "_exemptedCount": 0,
+          "_exemptedIndices": Object {},
+          "_getKey": [Function],
+          "_isModal": false,
+          "_items": Array [],
+          "_keyToIndexMap": Object {},
+          "_onSelectionChanged": [Function],
+          "_selectedItems": null,
+          "_unselectableCount": 0,
+          "_unselectableIndices": Object {},
+          "count": 0,
+          "mode": 2,
+        }
+      }
       selectionMode={1}
+      setKey="devices"
     />
   </React.Fragment>
 </AndroidSetupStepLayout>
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.test.tsx b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.test.tsx
index 4fef967f678..54fd04524bd 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.test.tsx
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.test.tsx
@@ -3,7 +3,7 @@
 import { AndroidSetupStepLayout } from 'electron/views/device-connect-view/components/android-setup/android-setup-step-layout';
 import { CommonAndroidSetupStepProps } from 'electron/views/device-connect-view/components/android-setup/android-setup-types';
 import { PromptChooseDeviceStep } from 'electron/views/device-connect-view/components/android-setup/prompt-choose-device-step';
-import { shallow } from 'enzyme';
+import { mount, shallow } from 'enzyme';
 import * as React from 'react';
 import { AndroidSetupStepPropsBuilder } from 'tests/unit/common/android-setup-step-props-builder';
 import { IMock, Mock, Times } from 'typemoq';
@@ -30,4 +30,11 @@ describe('PromptChooseDeviceStep', () => {
         rendered.find(AndroidSetupStepLayout).prop('leftFooterButtonProps').onClick(stubEvent);
         closeAppMock.verify(m => m(), Times.once());
     });
+
+    it('next button becomes enabled after device is selected', () => {
+        const rendered = mount(<PromptChooseDeviceStep {...props} />);
+        expect(rendered.find('button').at(2).props().disabled).toBeTruthy();
+        rendered.find('DeviceDescription').at(0).simulate('click');
+        expect(rendered.find('button').at(2).props().disabled).toBeUndefined();
+    });
 });

From d44929dab922e24437ef1648a930b1a3d170689d Mon Sep 17 00:00:00 2001
From: Liu Haonan <haonliu@microsoft.com>
Date: Fri, 12 Jun 2020 15:51:05 -0700
Subject: [PATCH 08/71] remove the space at the end of nav (#2871)

---
 src/DetailsView/components/left-nav/details-view-left-nav.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/DetailsView/components/left-nav/details-view-left-nav.scss b/src/DetailsView/components/left-nav/details-view-left-nav.scss
index 356ca08122f..67429ca23c5 100644
--- a/src/DetailsView/components/left-nav/details-view-left-nav.scss
+++ b/src/DetailsView/components/left-nav/details-view-left-nav.scss
@@ -49,6 +49,9 @@
         .dark-gray {
             color: $neutral-60;
         }
+        .ms-Nav-groupContent {
+            margin-bottom: 0px;
+        }
         .is-selected .button-flex-container {
             color: $always-black;
         }

From 4953857b08cd9b78169bcdb426ea3918a2c276d9 Mon Sep 17 00:00:00 2001
From: Dave Tryon <45672944+DaveTryon@users.noreply.github.com>
Date: Fri, 12 Jun 2020 18:20:45 -0700
Subject: [PATCH 09/71] feat(android-setup): Add support to remove port
 forwarding (#2870)

---
 .../android/android-service-configurator.ts   |  1 +
 .../android/appium-service-configurator.ts    | 10 +++++--
 .../appium-service-configurator.test.ts       | 29 +++++++++++++++++--
 3 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/src/electron/platform/android/android-service-configurator.ts b/src/electron/platform/android/android-service-configurator.ts
index a0f41cab665..bc2b727969a 100644
--- a/src/electron/platform/android/android-service-configurator.ts
+++ b/src/electron/platform/android/android-service-configurator.ts
@@ -23,6 +23,7 @@ export interface AndroidServiceConfigurator {
     installService(deviceId: string): Promise<void>;
     uninstallService(deviceId: string): Promise<void>;
     setTcpForwarding(deviceId: string): Promise<void>;
+    removeTcpForwarding(deviceId: string): Promise<void>;
 }
 
 export interface AndroidServiceConfiguratorFactory {
diff --git a/src/electron/platform/android/appium-service-configurator.ts b/src/electron/platform/android/appium-service-configurator.ts
index d0e2eeb3b2e..9a324f94a39 100644
--- a/src/electron/platform/android/appium-service-configurator.ts
+++ b/src/electron/platform/android/appium-service-configurator.ts
@@ -17,6 +17,8 @@ type AdbDevice = {
 const servicePackageName: string = 'com.microsoft.accessibilityinsightsforandroidservice';
 
 export class AppiumServiceConfigurator implements AndroidServiceConfigurator {
+    private readonly portNumber: number = 62442;
+
     constructor(private readonly adb: ADB) {}
 
     public getConnectedDevices = async (): Promise<Array<DeviceInfo>> => {
@@ -81,8 +83,12 @@ export class AppiumServiceConfigurator implements AndroidServiceConfigurator {
     };
 
     public setTcpForwarding = async (deviceId: string): Promise<void> => {
-        const port: number = 62442;
         this.adb.setDeviceId(deviceId);
-        await this.adb.forwardPort(port, port);
+        await this.adb.forwardPort(this.portNumber, this.portNumber);
+    };
+
+    public removeTcpForwarding = async (deviceId: string): Promise<void> => {
+        this.adb.setDeviceId(deviceId);
+        await this.adb.removePortForward(this.portNumber);
     };
 }
diff --git a/src/tests/unit/tests/electron/platform/android/appium-service-configurator.test.ts b/src/tests/unit/tests/electron/platform/android/appium-service-configurator.test.ts
index 30b98075b87..ef918a7dab1 100644
--- a/src/tests/unit/tests/electron/platform/android/appium-service-configurator.test.ts
+++ b/src/tests/unit/tests/electron/platform/android/appium-service-configurator.test.ts
@@ -21,6 +21,7 @@ describe('AppiumServiceConfigurator tests', () => {
     const dumpsysAccessibilitySnippetWithServiceRunning: string =
         'Service[label=Accessibility Insights for';
     const pathToApk: string = './ServiceForAndroid/AccessibilityInsightsforAndroidService.apk';
+    const expectedPortNumber: number = 62442;
 
     beforeEach(() => {
         adbMock = Mock.ofType<ADB>(undefined, MockBehavior.Strict);
@@ -333,14 +334,38 @@ describe('AppiumServiceConfigurator tests', () => {
     });
 
     it('setTcpForwarding, succeeds', async () => {
-        const expectedPort: number = 62442;
         adbMock.setup(m => m.setDeviceId(emulatorId)).verifiable(Times.once());
-        adbMock.setup(m => m.forwardPort(expectedPort, expectedPort)).verifiable(Times.once());
+        adbMock
+            .setup(m => m.forwardPort(expectedPortNumber, expectedPortNumber))
+            .verifiable(Times.once());
 
         await testSubject.setTcpForwarding(emulatorId);
 
         adbMock.verifyAll();
     });
+
+    it('removeTcpForwarding, propagates error', async () => {
+        const expectedError: string = 'Oops';
+        adbMock
+            .setup(m => m.setDeviceId(emulatorId))
+            .throws(new Error(expectedError))
+            .verifiable(Times.once());
+
+        await expect(testSubject.removeTcpForwarding(emulatorId)).rejects.toThrowError(
+            expectedError,
+        );
+
+        adbMock.verifyAll();
+    });
+
+    it('removeTcpForwarding, succeeds', async () => {
+        adbMock.setup(m => m.setDeviceId(emulatorId)).verifiable(Times.once());
+        adbMock.setup(m => m.removePortForward(expectedPortNumber)).verifiable(Times.once());
+
+        await testSubject.removeTcpForwarding(emulatorId);
+
+        adbMock.verifyAll();
+    });
     /*
     // For live testing, set ANDROID_HOME or ANDROID_SDK_ROOT to point
     // to your local installation, then add this line just before

From 40bb718ff6694d0b65b27d91ebefc6267444712a Mon Sep 17 00:00:00 2001
From: pownkel <55459788+pownkel@users.noreply.github.com>
Date: Mon, 15 Jun 2020 09:43:44 -0700
Subject: [PATCH 10/71] feat(nav-bar-functionality): add left border to nav in
 panel (#2874)

---
 .../components/left-nav/details-view-left-nav.scss         | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/DetailsView/components/left-nav/details-view-left-nav.scss b/src/DetailsView/components/left-nav/details-view-left-nav.scss
index 67429ca23c5..0613f168130 100644
--- a/src/DetailsView/components/left-nav/details-view-left-nav.scss
+++ b/src/DetailsView/components/left-nav/details-view-left-nav.scss
@@ -101,6 +101,11 @@
             margin-top: 0px !important;
         }
         .ms-Nav-compositeLink {
+            a {
+                border-left: $pivotItemLeftBorderWidth $pivotItemBorderStyle $neutral-0;
+                border-top: 0px;
+                border-bottom: 0px;
+            }
             .ms-Button-label {
                 color: $neutral-100;
             }
@@ -119,6 +124,8 @@
             &.is-selected {
                 a {
                     background-color: $communication-tint-40;
+                    border-left: $pivotItemLeftBorderWidth $pivotItemBorderStyle
+                        $communication-primary;
                 }
                 a::after {
                     border-left: 0px;

From b0f474a9a57fc782cbdecd4a1430a76e210298c0 Mon Sep 17 00:00:00 2001
From: Karan <karansin@microsoft.com>
Date: Mon, 15 Jun 2020 10:45:44 -0700
Subject: [PATCH 11/71] feat(android-setup): replace device metadata with
 device info (#2875)

---
 .../flux/types/android-setup-store-data.ts      |  4 ++--
 src/electron/flux/types/device-metadata.ts      |  8 --------
 .../android-setup/device-description.tsx        |  9 +++++----
 .../android-setup/prompt-choose-device-step.tsx | 17 ++++++++++-------
 .../prompt-choose-device-step.test.tsx.snap     |  9 ++++++---
 ...t-connected-start-testing-step.test.tsx.snap |  6 ++++--
 .../prompt-grant-permissions-step.test.tsx.snap |  6 ++++--
 .../prompt-install-failed-step.test.tsx.snap    |  6 ++++--
 .../prompt-install-service-step.test.tsx.snap   |  6 ++++--
 .../android-setup/device-description.test.tsx   | 12 ++++++++----
 ...prompt-connected-start-testing-step.test.tsx | 12 +++++++-----
 .../prompt-grant-permissions-step.test.tsx      | 12 +++++++-----
 .../prompt-install-failed-step.test.tsx         | 12 +++++++-----
 .../prompt-install-service-step.test.tsx        | 12 +++++++-----
 14 files changed, 75 insertions(+), 56 deletions(-)
 delete mode 100644 src/electron/flux/types/device-metadata.ts

diff --git a/src/electron/flux/types/android-setup-store-data.ts b/src/electron/flux/types/android-setup-store-data.ts
index 7622a64c208..fb9efe02a11 100644
--- a/src/electron/flux/types/android-setup-store-data.ts
+++ b/src/electron/flux/types/android-setup-store-data.ts
@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-import { DeviceMetadata } from 'electron/flux/types/device-metadata';
+import { DeviceInfo } from 'electron/platform/android/android-service-configurator';
 import { AndroidSetupStepId } from 'electron/platform/android/setup/android-setup-step-id';
 
 export type AndroidSetupStoreData = {
     currentStepId: AndroidSetupStepId;
 
     // undefined if no device exists or if no device has been selected
-    selectedDevice?: DeviceMetadata;
+    selectedDevice?: DeviceInfo;
 };
diff --git a/src/electron/flux/types/device-metadata.ts b/src/electron/flux/types/device-metadata.ts
deleted file mode 100644
index e92a7537dae..00000000000
--- a/src/electron/flux/types/device-metadata.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-export type DeviceMetadata = {
-    isEmulator: boolean;
-    description: string;
-    currentApplication?: string;
-};
diff --git a/src/electron/views/device-connect-view/components/android-setup/device-description.tsx b/src/electron/views/device-connect-view/components/android-setup/device-description.tsx
index fb4a2d75c6e..6000196864c 100644
--- a/src/electron/views/device-connect-view/components/android-setup/device-description.tsx
+++ b/src/electron/views/device-connect-view/components/android-setup/device-description.tsx
@@ -2,13 +2,14 @@
 // Licensed under the MIT License.
 
 import { NamedFC } from 'common/react/named-fc';
-import { DeviceMetadata } from 'electron/flux/types/device-metadata';
+import { DeviceInfo } from 'electron/platform/android/android-service-configurator';
 import { css, Icon } from 'office-ui-fabric-react';
 import * as React from 'react';
 import * as styles from './device-description.scss';
 
-export interface DeviceDescriptionProps extends DeviceMetadata {
+export interface DeviceDescriptionProps extends DeviceInfo {
     className?: string;
+    currentApplication?: string;
 }
 
 export const DeviceDescription = NamedFC<DeviceDescriptionProps>('DeviceDescription', props => {
@@ -20,12 +21,12 @@ export const DeviceDescription = NamedFC<DeviceDescriptionProps>('DeviceDescript
     if (props.currentApplication) {
         descriptionAndApp = (
             <div className={styles.deviceAndCurrentApplication}>
-                {props.description}
+                {props.friendlyName}
                 <div className={styles.currentApplication}>{props.currentApplication}</div>
             </div>
         );
     } else {
-        descriptionAndApp = props.description;
+        descriptionAndApp = props.friendlyName;
     }
 
     return (
diff --git a/src/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.tsx b/src/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.tsx
index a7787bd918d..e33326e0e37 100644
--- a/src/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.tsx
+++ b/src/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.tsx
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-import { DeviceMetadata } from 'electron/flux/types/device-metadata';
+import { DeviceInfo } from 'electron/platform/android/android-service-configurator';
 import {
     CheckboxVisibility,
     DefaultButton,
@@ -17,7 +17,7 @@ import { DeviceDescription } from './device-description';
 import * as styles from './prompt-choose-device-step.scss';
 
 export type PromptChooseDeviceStepState = {
-    selectedDevice: DeviceMetadata;
+    selectedDevice: DeviceInfo;
 };
 
 export class PromptChooseDeviceStep extends React.Component<
@@ -33,7 +33,7 @@ export class PromptChooseDeviceStep extends React.Component<
             onSelectionChanged: () => {
                 const details = this.selection.getSelection();
                 if (details.length > 0) {
-                    this.setState({ selectedDevice: details[0] as DeviceMetadata });
+                    this.setState({ selectedDevice: details[0] as DeviceInfo });
                 }
             },
         });
@@ -51,17 +51,20 @@ export class PromptChooseDeviceStep extends React.Component<
         };
 
         // Available devices will be retrieved from store in future feature work
-        const devices: DeviceMetadata[] = [
+        const devices: DeviceInfo[] = [
             {
-                description: 'Phone 1',
+                id: '1',
+                friendlyName: 'Phone 1',
                 isEmulator: true,
             },
             {
-                description: 'Phone 2',
+                id: '2',
+                friendlyName: 'Phone 2',
                 isEmulator: false,
             },
             {
-                description: 'Phone 3',
+                id: '3',
+                friendlyName: 'Phone 3',
                 isEmulator: true,
             },
         ];
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-choose-device-step.test.tsx.snap b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-choose-device-step.test.tsx.snap
index db19a8949a8..0baee8e360f 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-choose-device-step.test.tsx.snap
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-choose-device-step.test.tsx.snap
@@ -38,19 +38,22 @@ exports[`PromptChooseDeviceStep renders per snapshot 1`] = `
         Array [
           Object {
             "metadata": Object {
-              "description": "Phone 1",
+              "friendlyName": "Phone 1",
+              "id": "1",
               "isEmulator": true,
             },
           },
           Object {
             "metadata": Object {
-              "description": "Phone 2",
+              "friendlyName": "Phone 2",
+              "id": "2",
               "isEmulator": false,
             },
           },
           Object {
             "metadata": Object {
-              "description": "Phone 3",
+              "friendlyName": "Phone 3",
+              "id": "3",
               "isEmulator": true,
             },
           },
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-connected-start-testing-step.test.tsx.snap b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-connected-start-testing-step.test.tsx.snap
index f20060310db..ffb663596cb 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-connected-start-testing-step.test.tsx.snap
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-connected-start-testing-step.test.tsx.snap
@@ -26,7 +26,8 @@ exports[`PromptConnectedStartTestingStep renders with device 1`] = `
 >
   <DeviceDescription
     className="deviceDescription"
-    description="Super-Duper Gadget"
+    friendlyName="Super-Duper Gadget"
+    id="1"
     isEmulator={false}
   />
   <Button
@@ -63,7 +64,8 @@ exports[`PromptConnectedStartTestingStep renders with emulator 1`] = `
 >
   <DeviceDescription
     className="deviceDescription"
-    description="Emulator Extraordinaire"
+    friendlyName="Emulator Extraordinaire"
+    id="1"
     isEmulator={true}
   />
   <Button
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-grant-permissions-step.test.tsx.snap b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-grant-permissions-step.test.tsx.snap
index f6c659824f3..597ed67bf8b 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-grant-permissions-step.test.tsx.snap
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-grant-permissions-step.test.tsx.snap
@@ -29,7 +29,8 @@ exports[`PromptGrantPermissionsStep renders with device 1`] = `
   </React.Fragment>
   <DeviceDescription
     className="deviceDescription"
-    description="Super-Duper Gadget"
+    friendlyName="Super-Duper Gadget"
+    id="1"
     isEmulator={false}
   />
   <CustomizedPrimaryButton
@@ -68,7 +69,8 @@ exports[`PromptGrantPermissionsStep renders with emulator 1`] = `
   </React.Fragment>
   <DeviceDescription
     className="deviceDescription"
-    description="Emulator Extraordinaire"
+    friendlyName="Emulator Extraordinaire"
+    id="1"
     isEmulator={true}
   />
   <CustomizedPrimaryButton
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-install-failed-step.test.tsx.snap b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-install-failed-step.test.tsx.snap
index 946446ee1ad..f08a09806a6 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-install-failed-step.test.tsx.snap
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-install-failed-step.test.tsx.snap
@@ -29,7 +29,8 @@ exports[`PromptInstallFailedStep renders with device 1`] = `
   </React.Fragment>
   <DeviceDescription
     className="deviceDescription"
-    description="Super-Duper Gadget"
+    friendlyName="Super-Duper Gadget"
+    id="1"
     isEmulator={false}
   />
   <CustomizedPrimaryButton
@@ -68,7 +69,8 @@ exports[`PromptInstallFailedStep renders with emulator 1`] = `
   </React.Fragment>
   <DeviceDescription
     className="deviceDescription"
-    description="Emulator Extraordinaire"
+    friendlyName="Emulator Extraordinaire"
+    id="1"
     isEmulator={true}
   />
   <CustomizedPrimaryButton
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-install-service-step.test.tsx.snap b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-install-service-step.test.tsx.snap
index 2be7c413ccf..e9af1364dff 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-install-service-step.test.tsx.snap
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-install-service-step.test.tsx.snap
@@ -22,7 +22,8 @@ exports[`PromptInstallServiceStep renders with device 1`] = `
   </React.Fragment>
   <DeviceDescription
     className="deviceDescription"
-    description="Super-Duper Gadget"
+    friendlyName="Super-Duper Gadget"
+    id="1"
     isEmulator={false}
   />
   <CustomizedPrimaryButton
@@ -54,7 +55,8 @@ exports[`PromptInstallServiceStep renders with emulator 1`] = `
   </React.Fragment>
   <DeviceDescription
     className="deviceDescription"
-    description="Emulator Extraordinaire"
+    friendlyName="Emulator Extraordinaire"
+    id="1"
     isEmulator={true}
   />
   <CustomizedPrimaryButton
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/device-description.test.tsx b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/device-description.test.tsx
index aed02ee447d..dbd9a0e8d7c 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/device-description.test.tsx
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/device-description.test.tsx
@@ -11,7 +11,8 @@ describe('DeviceDescription', () => {
     it('renders with device', () => {
         const props: DeviceDescriptionProps = {
             isEmulator: false,
-            description: 'Super-Duper Gadget',
+            friendlyName: 'Super-Duper Gadget',
+            id: '0',
         };
 
         const rendered = shallow(<DeviceDescription {...props} />);
@@ -21,7 +22,8 @@ describe('DeviceDescription', () => {
     it('renders with emulator', () => {
         const props: DeviceDescriptionProps = {
             isEmulator: true,
-            description: 'Emulator Extraordinaire',
+            friendlyName: 'Emulator Extraordinaire',
+            id: '1',
         };
 
         const rendered = shallow(<DeviceDescription {...props} />);
@@ -31,8 +33,9 @@ describe('DeviceDescription', () => {
     it('renders with extra classname', () => {
         const props: DeviceDescriptionProps = {
             isEmulator: true,
-            description: 'Simple Emulator',
+            friendlyName: 'Simple Emulator',
             className: 'my-class',
+            id: '2',
         };
 
         const rendered = shallow(<DeviceDescription {...props} />);
@@ -42,8 +45,9 @@ describe('DeviceDescription', () => {
     it('renders with currentApplication', () => {
         const props: DeviceDescriptionProps = {
             isEmulator: false,
-            description: 'Whizbang tablet',
+            friendlyName: 'Whizbang tablet',
             currentApplication: 'Wildlife Manager',
+            id: '3',
         };
 
         const rendered = shallow(<DeviceDescription {...props} />);
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.test.tsx b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.test.tsx
index 44f42841f66..36a6f4c6744 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.test.tsx
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.test.tsx
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 import { AndroidSetupActionCreator } from 'electron/flux/action-creator/android-setup-action-creator';
-import { DeviceMetadata } from 'electron/flux/types/device-metadata';
+import { DeviceInfo } from 'electron/platform/android/android-service-configurator';
 import { AndroidSetupStepLayout } from 'electron/views/device-connect-view/components/android-setup/android-setup-step-layout';
 import { CommonAndroidSetupStepProps } from 'electron/views/device-connect-view/components/android-setup/android-setup-types';
 import { PromptConnectedStartTestingStep } from 'electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step';
@@ -29,9 +29,10 @@ describe('PromptConnectedStartTestingStep', () => {
     });
 
     it('renders with device', () => {
-        const selectedDevice: DeviceMetadata = {
+        const selectedDevice: DeviceInfo = {
             isEmulator: false,
-            description: 'Super-Duper Gadget',
+            friendlyName: 'Super-Duper Gadget',
+            id: '1',
         };
 
         props.androidSetupStoreData.selectedDevice = selectedDevice;
@@ -41,9 +42,10 @@ describe('PromptConnectedStartTestingStep', () => {
     });
 
     it('renders with emulator', () => {
-        const selectedDevice: DeviceMetadata = {
+        const selectedDevice: DeviceInfo = {
             isEmulator: true,
-            description: 'Emulator Extraordinaire',
+            friendlyName: 'Emulator Extraordinaire',
+            id: '1',
         };
 
         props.androidSetupStoreData.selectedDevice = selectedDevice;
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-grant-permissions-step.test.tsx b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-grant-permissions-step.test.tsx
index 9d8f7bbc3ab..d82823a5f7e 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-grant-permissions-step.test.tsx
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-grant-permissions-step.test.tsx
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-import { DeviceMetadata } from 'electron/flux/types/device-metadata';
+import { DeviceInfo } from 'electron/platform/android/android-service-configurator';
 import { CommonAndroidSetupStepProps } from 'electron/views/device-connect-view/components/android-setup/android-setup-types';
 import { PromptGrantPermissionsStep } from 'electron/views/device-connect-view/components/android-setup/prompt-grant-permissions-step';
 import { shallow } from 'enzyme';
@@ -15,9 +15,10 @@ describe('PromptGrantPermissionsStep', () => {
     });
 
     it('renders with device', () => {
-        const selectedDevice: DeviceMetadata = {
+        const selectedDevice: DeviceInfo = {
             isEmulator: false,
-            description: 'Super-Duper Gadget',
+            friendlyName: 'Super-Duper Gadget',
+            id: '1',
         };
 
         props.androidSetupStoreData.selectedDevice = selectedDevice;
@@ -27,9 +28,10 @@ describe('PromptGrantPermissionsStep', () => {
     });
 
     it('renders with emulator', () => {
-        const selectedDevice: DeviceMetadata = {
+        const selectedDevice: DeviceInfo = {
             isEmulator: true,
-            description: 'Emulator Extraordinaire',
+            friendlyName: 'Emulator Extraordinaire',
+            id: '1',
         };
 
         props.androidSetupStoreData.selectedDevice = selectedDevice;
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-install-failed-step.test.tsx b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-install-failed-step.test.tsx
index 2914999458f..8093f4dec42 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-install-failed-step.test.tsx
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-install-failed-step.test.tsx
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-import { DeviceMetadata } from 'electron/flux/types/device-metadata';
+import { DeviceInfo } from 'electron/platform/android/android-service-configurator';
 import { CommonAndroidSetupStepProps } from 'electron/views/device-connect-view/components/android-setup/android-setup-types';
 import { PromptInstallFailedStep } from 'electron/views/device-connect-view/components/android-setup/prompt-install-failed-step';
 import { shallow } from 'enzyme';
@@ -15,9 +15,10 @@ describe('PromptInstallFailedStep', () => {
     });
 
     it('renders with device', () => {
-        const selectedDevice: DeviceMetadata = {
+        const selectedDevice: DeviceInfo = {
             isEmulator: false,
-            description: 'Super-Duper Gadget',
+            friendlyName: 'Super-Duper Gadget',
+            id: '1',
         };
 
         props.androidSetupStoreData.selectedDevice = selectedDevice;
@@ -27,9 +28,10 @@ describe('PromptInstallFailedStep', () => {
     });
 
     it('renders with emulator', () => {
-        const selectedDevice: DeviceMetadata = {
+        const selectedDevice: DeviceInfo = {
             isEmulator: true,
-            description: 'Emulator Extraordinaire',
+            friendlyName: 'Emulator Extraordinaire',
+            id: '1',
         };
 
         props.androidSetupStoreData.selectedDevice = selectedDevice;
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-install-service-step.test.tsx b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-install-service-step.test.tsx
index b33dd3152e8..311404f42d3 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-install-service-step.test.tsx
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-install-service-step.test.tsx
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-import { DeviceMetadata } from 'electron/flux/types/device-metadata';
+import { DeviceInfo } from 'electron/platform/android/android-service-configurator';
 import { CommonAndroidSetupStepProps } from 'electron/views/device-connect-view/components/android-setup/android-setup-types';
 import { PromptInstallServiceStep } from 'electron/views/device-connect-view/components/android-setup/prompt-install-service-step';
 import { shallow } from 'enzyme';
@@ -15,9 +15,10 @@ describe('PromptInstallServiceStep', () => {
     });
 
     it('renders with device', () => {
-        const selectedDevice: DeviceMetadata = {
+        const selectedDevice: DeviceInfo = {
             isEmulator: false,
-            description: 'Super-Duper Gadget',
+            friendlyName: 'Super-Duper Gadget',
+            id: '1',
         };
 
         props.androidSetupStoreData.selectedDevice = selectedDevice;
@@ -27,9 +28,10 @@ describe('PromptInstallServiceStep', () => {
     });
 
     it('renders with emulator', () => {
-        const selectedDevice: DeviceMetadata = {
+        const selectedDevice: DeviceInfo = {
             isEmulator: true,
-            description: 'Emulator Extraordinaire',
+            friendlyName: 'Emulator Extraordinaire',
+            id: '1',
         };
 
         props.androidSetupStoreData.selectedDevice = selectedDevice;

From dc90ccb10fa6c22e3f6af9a4823932daab99ed9e Mon Sep 17 00:00:00 2001
From: Rob Gallo <43080011+RobGallo@users.noreply.github.com>
Date: Mon, 15 Jun 2020 16:26:33 -0400
Subject: [PATCH 12/71] feat(android-setup): Add most of the remaining state
 machine steps (#2873)

* feat(android-setup): Add detect-service state machine step

* feat:(android-setup): Add prompt-install-service state machine step

* feat(setup-android): Add installing-service state machine step

* feat(setup-android): Add detect-permissions state machine step

* feat(android-setup): Add prompt-grant-permissions state machine step

* feat(android-setup): Add prompt-connected-start-testing state machine step

* feat(android-setup): Add new step configs to allAndroidSetupStepConfigs
---
 .../setup/android-setup-steps-configs.ts      | 20 ++++---
 .../android/setup/steps/detect-permissions.ts | 14 +++++
 .../android/setup/steps/detect-service.ts     | 12 ++++
 .../android/setup/steps/installing-service.ts | 16 +++++
 .../steps/prompt-connected-start-testing.ts   | 12 ++++
 .../setup/steps/prompt-grant-permissions.ts   | 12 ++++
 .../setup/steps/prompt-install-service.ts     | 12 ++++
 .../setup/steps/detect-permissions.test.ts    | 52 ++++++++++++++++
 .../setup/steps/detect-service.test.ts        | 50 ++++++++++++++++
 .../setup/steps/installing-service.test.ts    | 60 +++++++++++++++++++
 .../prompt-connected-start-testing.test.ts    | 26 ++++++++
 .../steps/prompt-grant-permissions.test.ts    | 26 ++++++++
 .../steps/prompt-install-service.test.ts      | 26 ++++++++
 13 files changed, 331 insertions(+), 7 deletions(-)
 create mode 100644 src/electron/platform/android/setup/steps/detect-permissions.ts
 create mode 100644 src/electron/platform/android/setup/steps/detect-service.ts
 create mode 100644 src/electron/platform/android/setup/steps/installing-service.ts
 create mode 100644 src/electron/platform/android/setup/steps/prompt-connected-start-testing.ts
 create mode 100644 src/electron/platform/android/setup/steps/prompt-grant-permissions.ts
 create mode 100644 src/electron/platform/android/setup/steps/prompt-install-service.ts
 create mode 100644 src/tests/unit/tests/electron/platform/android/setup/steps/detect-permissions.test.ts
 create mode 100644 src/tests/unit/tests/electron/platform/android/setup/steps/detect-service.test.ts
 create mode 100644 src/tests/unit/tests/electron/platform/android/setup/steps/installing-service.test.ts
 create mode 100644 src/tests/unit/tests/electron/platform/android/setup/steps/prompt-connected-start-testing.test.ts
 create mode 100644 src/tests/unit/tests/electron/platform/android/setup/steps/prompt-grant-permissions.test.ts
 create mode 100644 src/tests/unit/tests/electron/platform/android/setup/steps/prompt-install-service.test.ts

diff --git a/src/electron/platform/android/setup/android-setup-steps-configs.ts b/src/electron/platform/android/setup/android-setup-steps-configs.ts
index 71950e8512b..edab0ea211e 100644
--- a/src/electron/platform/android/setup/android-setup-steps-configs.ts
+++ b/src/electron/platform/android/setup/android-setup-steps-configs.ts
@@ -6,7 +6,13 @@ import { AndroidSetupStoreCallbacks } from 'electron/flux/types/android-setup-st
 import { AndroidSetupDeps } from 'electron/platform/android/setup/android-setup-deps';
 import { AndroidSetupStepId } from 'electron/platform/android/setup/android-setup-step-id';
 import { detectDevices } from 'electron/platform/android/setup/steps/detect-devices';
+import { detectPermissions } from 'electron/platform/android/setup/steps/detect-permissions';
+import { detectService } from 'electron/platform/android/setup/steps/detect-service';
+import { installingService } from 'electron/platform/android/setup/steps/installing-service';
 import { promptConnectToDevice } from 'electron/platform/android/setup/steps/prompt-connect-to-device';
+import { promptConnectedStartTesting } from 'electron/platform/android/setup/steps/prompt-connected-start-testing';
+import { promptGrantPermissions } from 'electron/platform/android/setup/steps/prompt-grant-permissions';
+import { promptInstallService } from 'electron/platform/android/setup/steps/prompt-install-service';
 import { promptLocateAdb } from 'electron/platform/android/setup/steps/prompt-locate-adb';
 import {
     StateMachineStepConfig,
@@ -33,11 +39,11 @@ export const allAndroidSetupStepConfigs: AndroidSetupStepConfigs = {
     'prompt-connect-to-device': promptConnectToDevice,
     'detect-devices': detectDevices,
     'prompt-choose-device': null,
-    'detect-service': null,
-    'prompt-install-service': null,
-    'installing-service': null,
-    'prompt-install-failed': null,
-    'detect-permissions': null,
-    'prompt-grant-permissions': null,
-    'prompt-connected-start-testing': null,
+    'detect-service': detectService,
+    'prompt-install-service': promptInstallService,
+    'installing-service': installingService,
+    'prompt-install-failed': promptInstallService,
+    'detect-permissions': detectPermissions,
+    'prompt-grant-permissions': promptGrantPermissions,
+    'prompt-connected-start-testing': promptConnectedStartTesting,
 };
diff --git a/src/electron/platform/android/setup/steps/detect-permissions.ts b/src/electron/platform/android/setup/steps/detect-permissions.ts
new file mode 100644
index 00000000000..13ee3c8c5c2
--- /dev/null
+++ b/src/electron/platform/android/setup/steps/detect-permissions.ts
@@ -0,0 +1,14 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import { AndroidSetupStepConfig } from 'electron/platform/android/setup/android-setup-steps-configs';
+
+export const detectPermissions: AndroidSetupStepConfig = deps => ({
+    actions: {},
+    onEnter: async () => {
+        const detected = await deps.hasExpectedPermissions();
+        deps.stepTransition(
+            detected ? 'prompt-connected-start-testing' : 'prompt-grant-permissions',
+        );
+    },
+});
diff --git a/src/electron/platform/android/setup/steps/detect-service.ts b/src/electron/platform/android/setup/steps/detect-service.ts
new file mode 100644
index 00000000000..a3d5a31d8d3
--- /dev/null
+++ b/src/electron/platform/android/setup/steps/detect-service.ts
@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import { AndroidSetupStepConfig } from 'electron/platform/android/setup/android-setup-steps-configs';
+
+export const detectService: AndroidSetupStepConfig = deps => ({
+    actions: {},
+    onEnter: async () => {
+        const detected = await deps.hasExpectedServiceVersion();
+        deps.stepTransition(detected ? 'detect-permissions' : 'prompt-install-service');
+    },
+});
diff --git a/src/electron/platform/android/setup/steps/installing-service.ts b/src/electron/platform/android/setup/steps/installing-service.ts
new file mode 100644
index 00000000000..8bed75250fd
--- /dev/null
+++ b/src/electron/platform/android/setup/steps/installing-service.ts
@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import { AndroidSetupStepConfig } from 'electron/platform/android/setup/android-setup-steps-configs';
+
+export const installingService: AndroidSetupStepConfig = deps => ({
+    actions: {
+        cancel: () => {
+            deps.stepTransition('prompt-install-service');
+        },
+    },
+    onEnter: async () => {
+        const installed = await deps.installService();
+        deps.stepTransition(installed ? 'prompt-grant-permissions' : 'prompt-install-failed');
+    },
+});
diff --git a/src/electron/platform/android/setup/steps/prompt-connected-start-testing.ts b/src/electron/platform/android/setup/steps/prompt-connected-start-testing.ts
new file mode 100644
index 00000000000..679b925cf48
--- /dev/null
+++ b/src/electron/platform/android/setup/steps/prompt-connected-start-testing.ts
@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import { AndroidSetupStepConfig } from 'electron/platform/android/setup/android-setup-steps-configs';
+
+export const promptConnectedStartTesting: AndroidSetupStepConfig = deps => ({
+    actions: {
+        rescan: () => {
+            deps.stepTransition('detect-adb');
+        },
+    },
+});
diff --git a/src/electron/platform/android/setup/steps/prompt-grant-permissions.ts b/src/electron/platform/android/setup/steps/prompt-grant-permissions.ts
new file mode 100644
index 00000000000..5492e7b4236
--- /dev/null
+++ b/src/electron/platform/android/setup/steps/prompt-grant-permissions.ts
@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import { AndroidSetupStepConfig } from 'electron/platform/android/setup/android-setup-steps-configs';
+
+export const promptGrantPermissions: AndroidSetupStepConfig = deps => ({
+    actions: {
+        next: () => {
+            deps.stepTransition('detect-permissions');
+        },
+    },
+});
diff --git a/src/electron/platform/android/setup/steps/prompt-install-service.ts b/src/electron/platform/android/setup/steps/prompt-install-service.ts
new file mode 100644
index 00000000000..3ca14c665cb
--- /dev/null
+++ b/src/electron/platform/android/setup/steps/prompt-install-service.ts
@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import { AndroidSetupStepConfig } from 'electron/platform/android/setup/android-setup-steps-configs';
+
+export const promptInstallService: AndroidSetupStepConfig = deps => ({
+    actions: {
+        next: () => {
+            deps.stepTransition('installing-service');
+        },
+    },
+});
diff --git a/src/tests/unit/tests/electron/platform/android/setup/steps/detect-permissions.test.ts b/src/tests/unit/tests/electron/platform/android/setup/steps/detect-permissions.test.ts
new file mode 100644
index 00000000000..b30fb8c2ab5
--- /dev/null
+++ b/src/tests/unit/tests/electron/platform/android/setup/steps/detect-permissions.test.ts
@@ -0,0 +1,52 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import { AndroidSetupStepConfigDeps } from 'electron/platform/android/setup/android-setup-steps-configs';
+import { detectPermissions } from 'electron/platform/android/setup/steps/detect-permissions';
+import { Mock, MockBehavior, Times } from 'typemoq';
+import { checkExpectedActionsAreDefined } from './actions-tester';
+
+describe('Android setup step: detectPermissions', () => {
+    it('has expected properties', () => {
+        const deps = {} as AndroidSetupStepConfigDeps;
+        const step = detectPermissions(deps);
+        checkExpectedActionsAreDefined(step, []);
+        expect(step.onEnter).toBeDefined();
+    });
+
+    it('onEnter transitions to prompt-connected-start-testing as expected', async () => {
+        const p = new Promise<boolean>(resolve => resolve(true));
+
+        const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
+        depsMock
+            .setup(m => m.hasExpectedPermissions())
+            .returns(_ => p)
+            .verifiable(Times.once());
+
+        depsMock
+            .setup(m => m.stepTransition('prompt-connected-start-testing'))
+            .verifiable(Times.once());
+
+        const step = detectPermissions(depsMock.object);
+        await step.onEnter();
+
+        depsMock.verifyAll();
+    });
+
+    it('onEnter transitions to prompt-install-service as expected', async () => {
+        const p = new Promise<boolean>(resolve => resolve(false));
+
+        const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
+        depsMock
+            .setup(m => m.hasExpectedPermissions())
+            .returns(_ => p)
+            .verifiable(Times.once());
+
+        depsMock.setup(m => m.stepTransition('prompt-grant-permissions')).verifiable(Times.once());
+
+        const step = detectPermissions(depsMock.object);
+        await step.onEnter();
+
+        depsMock.verifyAll();
+    });
+});
diff --git a/src/tests/unit/tests/electron/platform/android/setup/steps/detect-service.test.ts b/src/tests/unit/tests/electron/platform/android/setup/steps/detect-service.test.ts
new file mode 100644
index 00000000000..1744f81e6b6
--- /dev/null
+++ b/src/tests/unit/tests/electron/platform/android/setup/steps/detect-service.test.ts
@@ -0,0 +1,50 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import { AndroidSetupStepConfigDeps } from 'electron/platform/android/setup/android-setup-steps-configs';
+import { detectService } from 'electron/platform/android/setup/steps/detect-service';
+import { Mock, MockBehavior, Times } from 'typemoq';
+import { checkExpectedActionsAreDefined } from './actions-tester';
+
+describe('Android setup step: detectService', () => {
+    it('has expected properties', () => {
+        const deps = {} as AndroidSetupStepConfigDeps;
+        const step = detectService(deps);
+        checkExpectedActionsAreDefined(step, []);
+        expect(step.onEnter).toBeDefined();
+    });
+
+    it('onEnter transitions to detect-permissions as expected', async () => {
+        const p = new Promise<boolean>(resolve => resolve(true));
+
+        const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
+        depsMock
+            .setup(m => m.hasExpectedServiceVersion())
+            .returns(_ => p)
+            .verifiable(Times.once());
+
+        depsMock.setup(m => m.stepTransition('detect-permissions')).verifiable(Times.once());
+
+        const step = detectService(depsMock.object);
+        await step.onEnter();
+
+        depsMock.verifyAll();
+    });
+
+    it('onEnter transitions to prompt-install-service as expected', async () => {
+        const p = new Promise<boolean>(resolve => resolve(false));
+
+        const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
+        depsMock
+            .setup(m => m.hasExpectedServiceVersion())
+            .returns(_ => p)
+            .verifiable(Times.once());
+
+        depsMock.setup(m => m.stepTransition('prompt-install-service')).verifiable(Times.once());
+
+        const step = detectService(depsMock.object);
+        await step.onEnter();
+
+        depsMock.verifyAll();
+    });
+});
diff --git a/src/tests/unit/tests/electron/platform/android/setup/steps/installing-service.test.ts b/src/tests/unit/tests/electron/platform/android/setup/steps/installing-service.test.ts
new file mode 100644
index 00000000000..69ae4b09127
--- /dev/null
+++ b/src/tests/unit/tests/electron/platform/android/setup/steps/installing-service.test.ts
@@ -0,0 +1,60 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import { AndroidSetupStepConfigDeps } from 'electron/platform/android/setup/android-setup-steps-configs';
+import { installingService } from 'electron/platform/android/setup/steps/installing-service';
+import { Mock, MockBehavior, Times } from 'typemoq';
+import { checkExpectedActionsAreDefined } from './actions-tester';
+
+describe('Android setup step: installingService', () => {
+    it('has expected properties', () => {
+        const deps = {} as AndroidSetupStepConfigDeps;
+        const step = installingService(deps);
+        checkExpectedActionsAreDefined(step, ['cancel']);
+        expect(step.onEnter).toBeDefined();
+    });
+
+    it('cancel transitions to prompt-grant-permissions as expected', () => {
+        const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
+        depsMock.setup(m => m.stepTransition('prompt-install-service')).verifiable(Times.once());
+
+        const step = installingService(depsMock.object);
+        step.actions.cancel();
+
+        depsMock.verifyAll();
+    });
+
+    it('onEnter transitions to prompt-grant-permissions as expected', async () => {
+        const p = new Promise<boolean>(resolve => resolve(true));
+
+        const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
+        depsMock
+            .setup(m => m.installService())
+            .returns(_ => p)
+            .verifiable(Times.once());
+
+        depsMock.setup(m => m.stepTransition('prompt-grant-permissions')).verifiable(Times.once());
+
+        const step = installingService(depsMock.object);
+        await step.onEnter();
+
+        depsMock.verifyAll();
+    });
+
+    it('onEnter transitions to prompt-install-service as expected', async () => {
+        const p = new Promise<boolean>(resolve => resolve(false));
+
+        const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
+        depsMock
+            .setup(m => m.installService())
+            .returns(_ => p)
+            .verifiable(Times.once());
+
+        depsMock.setup(m => m.stepTransition('prompt-install-failed')).verifiable(Times.once());
+
+        const step = installingService(depsMock.object);
+        await step.onEnter();
+
+        depsMock.verifyAll();
+    });
+});
diff --git a/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-connected-start-testing.test.ts b/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-connected-start-testing.test.ts
new file mode 100644
index 00000000000..511f5e6a04a
--- /dev/null
+++ b/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-connected-start-testing.test.ts
@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import { AndroidSetupStepConfigDeps } from 'electron/platform/android/setup/android-setup-steps-configs';
+import { promptConnectedStartTesting } from 'electron/platform/android/setup/steps/prompt-connected-start-testing';
+import { Mock, MockBehavior, Times } from 'typemoq';
+import { checkExpectedActionsAreDefined } from './actions-tester';
+
+describe('Android setup step: promptConnectedStartTesting', () => {
+    it('has expected properties', () => {
+        const deps = {} as AndroidSetupStepConfigDeps;
+        const step = promptConnectedStartTesting(deps);
+        checkExpectedActionsAreDefined(step, ['rescan']);
+        expect(step.onEnter).not.toBeDefined();
+    });
+
+    it('onEnter transitions to detect-adb as expected', () => {
+        const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
+        depsMock.setup(m => m.stepTransition('detect-adb')).verifiable(Times.once());
+
+        const step = promptConnectedStartTesting(depsMock.object);
+        step.actions.rescan();
+
+        depsMock.verifyAll();
+    });
+});
diff --git a/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-grant-permissions.test.ts b/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-grant-permissions.test.ts
new file mode 100644
index 00000000000..a65ce6101d8
--- /dev/null
+++ b/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-grant-permissions.test.ts
@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import { AndroidSetupStepConfigDeps } from 'electron/platform/android/setup/android-setup-steps-configs';
+import { promptGrantPermissions } from 'electron/platform/android/setup/steps/prompt-grant-permissions';
+import { Mock, MockBehavior, Times } from 'typemoq';
+import { checkExpectedActionsAreDefined } from './actions-tester';
+
+describe('Android setup step: promptGrantPermissions', () => {
+    it('has expected properties', () => {
+        const deps = {} as AndroidSetupStepConfigDeps;
+        const step = promptGrantPermissions(deps);
+        checkExpectedActionsAreDefined(step, ['next']);
+        expect(step.onEnter).not.toBeDefined();
+    });
+
+    it('onEnter transitions to detect-permissions as expected', () => {
+        const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
+        depsMock.setup(m => m.stepTransition('detect-permissions')).verifiable(Times.once());
+
+        const step = promptGrantPermissions(depsMock.object);
+        step.actions.next();
+
+        depsMock.verifyAll();
+    });
+});
diff --git a/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-install-service.test.ts b/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-install-service.test.ts
new file mode 100644
index 00000000000..aeca3c235b2
--- /dev/null
+++ b/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-install-service.test.ts
@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import { AndroidSetupStepConfigDeps } from 'electron/platform/android/setup/android-setup-steps-configs';
+import { promptInstallService } from 'electron/platform/android/setup/steps/prompt-install-service';
+import { Mock, MockBehavior, Times } from 'typemoq';
+import { checkExpectedActionsAreDefined } from './actions-tester';
+
+describe('Android setup step: promptInstallService', () => {
+    it('has expected properties', () => {
+        const deps = {} as AndroidSetupStepConfigDeps;
+        const step = promptInstallService(deps);
+        checkExpectedActionsAreDefined(step, ['next']);
+        expect(step.onEnter).not.toBeDefined();
+    });
+
+    it('onEnter transitions to installing-service as expected', () => {
+        const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
+        depsMock.setup(m => m.stepTransition('installing-service')).verifiable(Times.once());
+
+        const step = promptInstallService(depsMock.object);
+        step.actions.next();
+
+        depsMock.verifyAll();
+    });
+});

From e59dd1b12641a3a2042a8c8e97dd6d2f06e22527 Mon Sep 17 00:00:00 2001
From: pownkel <55459788+pownkel@users.noreply.github.com>
Date: Mon, 15 Jun 2020 14:39:38 -0700
Subject: [PATCH 13/71] feat(nav-bar-functionality): render expandable nav
 links as buttons (#2878)

* Render nav links as buttons and change styles to work with button elements

* render test links as buttons and requirement links as links
---
 .../left-nav/details-view-left-nav.scss       | 23 +++++++++++++++----
 .../left-nav/left-nav-link-builder.tsx        |  1 +
 .../left-nav/left-nav-link-builder.test.tsx   |  2 +-
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/DetailsView/components/left-nav/details-view-left-nav.scss b/src/DetailsView/components/left-nav/details-view-left-nav.scss
index 0613f168130..23b4d9061cf 100644
--- a/src/DetailsView/components/left-nav/details-view-left-nav.scss
+++ b/src/DetailsView/components/left-nav/details-view-left-nav.scss
@@ -10,7 +10,8 @@
             .ms-Nav-compositeLink {
                 &.is-selected {
                     background-color: $communication-tint-20;
-                    a {
+                    a,
+                    button {
                         background-color: $communication-tint-20 !important;
                     }
                 }
@@ -24,7 +25,8 @@
                     }
                 }
                 &:hover {
-                    a {
+                    a,
+                    button {
                         background-color: $nav-link-hover !important;
                     }
                 }
@@ -101,10 +103,12 @@
             margin-top: 0px !important;
         }
         .ms-Nav-compositeLink {
-            a {
+            a,
+            button {
                 border-left: $pivotItemLeftBorderWidth $pivotItemBorderStyle $neutral-0;
                 border-top: 0px;
                 border-bottom: 0px;
+                text-align: center;
             }
             .ms-Button-label {
                 color: $neutral-100;
@@ -122,12 +126,21 @@
                 border-color: $neutral-20;
             }
             &.is-selected {
-                a {
+                a,
+                button {
                     background-color: $communication-tint-40;
                     border-left: $pivotItemLeftBorderWidth $pivotItemBorderStyle
                         $communication-primary;
+                    .ms-Button-label {
+                        color: $highlighted-text;
+                    }
+                    .overview-percent,
+                    .dark-gray {
+                        color: $overview-percent-selected;
+                    }
                 }
-                a::after {
+                a::after,
+                button::after {
                     border-left: 0px;
                 }
                 .ms-Button-label {
diff --git a/src/DetailsView/components/left-nav/left-nav-link-builder.tsx b/src/DetailsView/components/left-nav/left-nav-link-builder.tsx
index 1348a471cad..32bbc12b8a3 100644
--- a/src/DetailsView/components/left-nav/left-nav-link-builder.tsx
+++ b/src/DetailsView/components/left-nav/left-nav-link-builder.tsx
@@ -224,6 +224,7 @@ export class LeftNavLinkBuilder {
             links: [gettingStartedLink, ...requirementLinks],
             isExpanded: isExpanded,
             testType: assessment.visualizationType,
+            forceAnchor: false,
         };
 
         return testLink;
diff --git a/src/tests/unit/tests/DetailsView/components/left-nav/left-nav-link-builder.test.tsx b/src/tests/unit/tests/DetailsView/components/left-nav/left-nav-link-builder.test.tsx
index 03ea56f139d..a2ec06d9796 100644
--- a/src/tests/unit/tests/DetailsView/components/left-nav/left-nav-link-builder.test.tsx
+++ b/src/tests/unit/tests/DetailsView/components/left-nav/left-nav-link-builder.test.tsx
@@ -316,7 +316,7 @@ describe('LeftNavBuilder', () => {
                 const expectedTestLink = {
                     name: assessmentStub.title,
                     key: VisualizationType[visualizationType],
-                    forceAnchor: true,
+                    forceAnchor: false,
                     url: '',
                     index: startingIndexStub + linkIndex,
                     iconProps: {

From ba13670fd8b2b19559ebab7979ca8126eb70dbeb Mon Sep 17 00:00:00 2001
From: Karan <karansin@microsoft.com>
Date: Mon, 15 Jun 2020 14:54:53 -0700
Subject: [PATCH 14/71] feat(android-setup): add actions to
 prompt-choose-device-step (#2876)

---
 .../prompt-choose-device-step.tsx              | 18 ++++++------------
 .../prompt-choose-device-step.test.tsx.snap    |  1 +
 .../prompt-choose-device-step.test.tsx         | 18 ++++++++++++++++++
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.tsx b/src/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.tsx
index e33326e0e37..dfdbfdb4042 100644
--- a/src/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.tsx
+++ b/src/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.tsx
@@ -40,16 +40,6 @@ export class PromptChooseDeviceStep extends React.Component<
     }
 
     public render(): JSX.Element {
-        const onNextButton = () => {
-            // To be implemented in future feature work
-            console.log(`androidSetupActionCreator.next()`);
-        };
-
-        const onRescanButton = () => {
-            // To be implemented in future feature work
-            console.log(`androidSetupActionCreator.rescan()`);
-        };
-
         // Available devices will be retrieved from store in future feature work
         const devices: DeviceInfo[] = [
             {
@@ -76,7 +66,11 @@ export class PromptChooseDeviceStep extends React.Component<
             children: (
                 <>
                     <p>{devices.length} Android devices or emulators connected</p>
-                    <DefaultButton text="Rescan" onClick={onRescanButton} />
+                    <DefaultButton
+                        data-automation-id={'rescan'}
+                        text="Rescan"
+                        onClick={this.props.deps.androidSetupActionCreator.rescan}
+                    />
                     <DetailsList
                         setKey={'devices'}
                         compact={true}
@@ -114,7 +108,7 @@ export class PromptChooseDeviceStep extends React.Component<
             rightFooterButtonProps: {
                 text: 'Next',
                 disabled: this.state.selectedDevice === null,
-                onClick: onNextButton,
+                onClick: _ => this.props.deps.androidSetupActionCreator.next(),
             },
         };
 
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-choose-device-step.test.tsx.snap b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-choose-device-step.test.tsx.snap
index 0baee8e360f..2659656babd 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-choose-device-step.test.tsx.snap
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-choose-device-step.test.tsx.snap
@@ -23,6 +23,7 @@ exports[`PromptChooseDeviceStep renders per snapshot 1`] = `
        Android devices or emulators connected
     </p>
     <CustomizedDefaultButton
+      data-automation-id="rescan"
       onClick={[Function]}
       text="Rescan"
     />
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.test.tsx b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.test.tsx
index 54fd04524bd..a0f8f08f019 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.test.tsx
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.test.tsx
@@ -1,5 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
+import { AndroidSetupActionCreator } from 'electron/flux/action-creator/android-setup-action-creator';
 import { AndroidSetupStepLayout } from 'electron/views/device-connect-view/components/android-setup/android-setup-step-layout';
 import { CommonAndroidSetupStepProps } from 'electron/views/device-connect-view/components/android-setup/android-setup-types';
 import { PromptChooseDeviceStep } from 'electron/views/device-connect-view/components/android-setup/prompt-choose-device-step';
@@ -11,11 +12,14 @@ import { IMock, Mock, Times } from 'typemoq';
 describe('PromptChooseDeviceStep', () => {
     let props: CommonAndroidSetupStepProps;
     let closeAppMock: IMock<typeof props.deps.closeApp>;
+    let actionMessageCreatorMock: IMock<AndroidSetupActionCreator>;
 
     beforeEach(() => {
         closeAppMock = Mock.ofInstance(() => {});
+        actionMessageCreatorMock = Mock.ofType(AndroidSetupActionCreator);
         props = new AndroidSetupStepPropsBuilder('prompt-choose-device')
             .withDep('closeApp', closeAppMock.object)
+            .withDep('androidSetupActionCreator', actionMessageCreatorMock.object)
             .build();
     });
 
@@ -31,6 +35,20 @@ describe('PromptChooseDeviceStep', () => {
         closeAppMock.verify(m => m(), Times.once());
     });
 
+    it('passes rescan dep through', () => {
+        const rendered = shallow(<PromptChooseDeviceStep {...props} />);
+        const rescanButton = rendered.find({ 'data-automation-id': 'rescan' });
+        rescanButton.simulate('click');
+        actionMessageCreatorMock.verify(m => m.rescan(), Times.once());
+    });
+
+    it('passes next dep through', () => {
+        const stubEvent = {} as React.MouseEvent<HTMLButtonElement>;
+        const rendered = shallow(<PromptChooseDeviceStep {...props} />);
+        rendered.find(AndroidSetupStepLayout).prop('rightFooterButtonProps').onClick(stubEvent);
+        actionMessageCreatorMock.verify(m => m.next(), Times.once());
+    });
+
     it('next button becomes enabled after device is selected', () => {
         const rendered = mount(<PromptChooseDeviceStep {...props} />);
         expect(rendered.find('button').at(2).props().disabled).toBeTruthy();

From 919f9608b5dc8c647189109ad093af897f0674f8 Mon Sep 17 00:00:00 2001
From: Karan <karansin@microsoft.com>
Date: Mon, 15 Jun 2020 14:55:04 -0700
Subject: [PATCH 15/71] feat(android-setup): add actions to
 prompt-connected-start-testing-step (#2879)

---
 .../prompt-connected-start-testing-step.tsx   |  9 ++------
 ...ompt-connected-start-testing-step.test.tsx | 21 ++++++++++---------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.tsx b/src/electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.tsx
index 9dfbf470ee7..3ff11dcf0ff 100644
--- a/src/electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.tsx
+++ b/src/electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.tsx
@@ -17,11 +17,6 @@ export const PromptConnectedStartTestingStep = NamedFC<CommonAndroidSetupStepPro
     (props: CommonAndroidSetupStepProps) => {
         const { LinkComponent } = props.deps;
 
-        const onRescanButton = () => {
-            // To be implemented in future feature work
-            console.log(`androidSetupActionCreator.rescanDevices()`);
-        };
-
         const layoutProps: AndroidSetupStepLayoutProps = {
             headerText: 'Connected and ready to go!',
             moreInfoLink: (
@@ -31,7 +26,7 @@ export const PromptConnectedStartTestingStep = NamedFC<CommonAndroidSetupStepPro
             ),
             leftFooterButtonProps: {
                 text: 'Cancel',
-                onClick: props.deps.androidSetupActionCreator.cancel,
+                onClick: _ => props.deps.androidSetupActionCreator.cancel(),
             },
             rightFooterButtonProps: {
                 text: 'Start testing',
@@ -51,7 +46,7 @@ export const PromptConnectedStartTestingStep = NamedFC<CommonAndroidSetupStepPro
                 <Button
                     className={styles.rescanButton}
                     text="Rescan devices"
-                    onClick={onRescanButton}
+                    onClick={props.deps.androidSetupActionCreator.rescan}
                 />
             </AndroidSetupStepLayout>
         );
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.test.tsx b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.test.tsx
index 36a6f4c6744..fb64bee0b1a 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.test.tsx
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.test.tsx
@@ -5,26 +5,23 @@ import { DeviceInfo } from 'electron/platform/android/android-service-configurat
 import { AndroidSetupStepLayout } from 'electron/views/device-connect-view/components/android-setup/android-setup-step-layout';
 import { CommonAndroidSetupStepProps } from 'electron/views/device-connect-view/components/android-setup/android-setup-types';
 import { PromptConnectedStartTestingStep } from 'electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step';
+import * as styles from 'electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.scss';
 import { shallow } from 'enzyme';
 import * as React from 'react';
 import { AndroidSetupStepPropsBuilder } from 'tests/unit/common/android-setup-step-props-builder';
-import { IMock, It, Mock, MockBehavior } from 'typemoq';
+import { IMock, Mock, Times } from 'typemoq';
 
 describe('PromptConnectedStartTestingStep', () => {
     let props: CommonAndroidSetupStepProps;
     let startTestingMock: IMock<typeof props.deps.startTesting>;
-    const mockCancelAction = Mock.ofInstance(_ => {}, MockBehavior.Strict);
-    let sampleAndroidSetupActionCreator: AndroidSetupActionCreator;
+    let androidSetupActionCreatorMock: IMock<AndroidSetupActionCreator>;
 
     beforeEach(() => {
         startTestingMock = Mock.ofInstance(() => {});
-        mockCancelAction.setup(m => m(It.isAny())).verifiable();
-        sampleAndroidSetupActionCreator = {
-            cancel: mockCancelAction.object,
-        } as AndroidSetupActionCreator;
+        androidSetupActionCreatorMock = Mock.ofType(AndroidSetupActionCreator);
         props = new AndroidSetupStepPropsBuilder('prompt-connected-start-testing')
             .withDep('startTesting', startTestingMock.object)
-            .withDep('androidSetupActionCreator', sampleAndroidSetupActionCreator)
+            .withDep('androidSetupActionCreator', androidSetupActionCreatorMock.object)
             .build();
     });
 
@@ -63,10 +60,14 @@ describe('PromptConnectedStartTestingStep', () => {
 
     it('handles the cancel button with the cancel action', () => {
         const rendered = shallow(<PromptConnectedStartTestingStep {...props} />);
-
         const stubEvent = {} as React.MouseEvent<HTMLButtonElement>;
         rendered.find(AndroidSetupStepLayout).prop('leftFooterButtonProps').onClick(stubEvent);
+        androidSetupActionCreatorMock.verify(m => m.cancel(), Times.once());
+    });
 
-        mockCancelAction.verifyAll();
+    it('handles the rescan button with the rescan action', () => {
+        const rendered = shallow(<PromptConnectedStartTestingStep {...props} />);
+        rendered.find(`.${styles.rescanButton}`).simulate('click');
+        androidSetupActionCreatorMock.verify(m => m.rescan(), Times.once());
     });
 });

From 9b16d953fc4c77123b88f370f77a5debbfa1806a Mon Sep 17 00:00:00 2001
From: Karan <karansin@microsoft.com>
Date: Mon, 15 Jun 2020 14:55:47 -0700
Subject: [PATCH 16/71]  feat(android-setup): add actions to
 prompt-connect-to-device-step (#2877)

---
 .../prompt-connect-to-device-step.tsx             | 12 ++++++------
 .../prompt-connect-to-device-step.test.tsx.snap   |  1 +
 .../prompt-connect-to-device-step.test.tsx        | 15 ++++++++++++++-
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/electron/views/device-connect-view/components/android-setup/prompt-connect-to-device-step.tsx b/src/electron/views/device-connect-view/components/android-setup/prompt-connect-to-device-step.tsx
index 4ef37fb1752..45909fe21a9 100644
--- a/src/electron/views/device-connect-view/components/android-setup/prompt-connect-to-device-step.tsx
+++ b/src/electron/views/device-connect-view/components/android-setup/prompt-connect-to-device-step.tsx
@@ -6,16 +6,12 @@ import * as React from 'react';
 import { AndroidSetupStepLayout, AndroidSetupStepLayoutProps } from './android-setup-step-layout';
 import { CommonAndroidSetupStepProps } from './android-setup-types';
 
+export const detectDeviceAutomationId = 'detect-device';
 export const PromptConnectToDeviceStep = NamedFC<CommonAndroidSetupStepProps>(
     'PromptConnectToDeviceStep',
     (props: CommonAndroidSetupStepProps) => {
         const { LinkComponent } = props.deps;
 
-        const onDetectButton = () => {
-            // To be implemented in future feature work
-            console.log(`androidSetupActionCreator.detectDevices()`);
-        };
-
         const layoutProps: AndroidSetupStepLayoutProps = {
             headerText: 'Connect to your Android device',
             moreInfoLink: (
@@ -36,7 +32,11 @@ export const PromptConnectToDeviceStep = NamedFC<CommonAndroidSetupStepProps>(
 
         return (
             <AndroidSetupStepLayout {...layoutProps}>
-                <PrimaryButton text="Detect my device" onClick={onDetectButton} />
+                <PrimaryButton
+                    data-automation-id={detectDeviceAutomationId}
+                    text="Detect my device"
+                    onClick={props.deps.androidSetupActionCreator.next}
+                />
             </AndroidSetupStepLayout>
         );
     },
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-connect-to-device-step.test.tsx.snap b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-connect-to-device-step.test.tsx.snap
index 5f0c83b898a..ba44fecb8a7 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-connect-to-device-step.test.tsx.snap
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-connect-to-device-step.test.tsx.snap
@@ -25,6 +25,7 @@ exports[`PromptConnectToDeviceStep renders per snapshot 1`] = `
   }
 >
   <CustomizedPrimaryButton
+    data-automation-id="detect-device"
     onClick={[Function]}
     text="Detect my device"
   />
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-connect-to-device-step.test.tsx b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-connect-to-device-step.test.tsx
index dfc5cf0f620..70646f5fd90 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-connect-to-device-step.test.tsx
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-connect-to-device-step.test.tsx
@@ -1,8 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
+import { AndroidSetupActionCreator } from 'electron/flux/action-creator/android-setup-action-creator';
 import { AndroidSetupStepLayout } from 'electron/views/device-connect-view/components/android-setup/android-setup-step-layout';
 import { CommonAndroidSetupStepProps } from 'electron/views/device-connect-view/components/android-setup/android-setup-types';
-import { PromptConnectToDeviceStep } from 'electron/views/device-connect-view/components/android-setup/prompt-connect-to-device-step';
+import {
+    detectDeviceAutomationId,
+    PromptConnectToDeviceStep,
+} from 'electron/views/device-connect-view/components/android-setup/prompt-connect-to-device-step';
 import { shallow } from 'enzyme';
 import * as React from 'react';
 import { AndroidSetupStepPropsBuilder } from 'tests/unit/common/android-setup-step-props-builder';
@@ -11,11 +15,14 @@ import { IMock, Mock, Times } from 'typemoq';
 describe('PromptConnectToDeviceStep', () => {
     let props: CommonAndroidSetupStepProps;
     let closeAppMock: IMock<typeof props.deps.closeApp>;
+    let androidSetupActionCreatorMock: IMock<AndroidSetupActionCreator>;
 
     beforeEach(() => {
         closeAppMock = Mock.ofInstance(() => {});
+        androidSetupActionCreatorMock = Mock.ofType(AndroidSetupActionCreator);
         props = new AndroidSetupStepPropsBuilder('prompt-connect-to-device')
             .withDep('closeApp', closeAppMock.object)
+            .withDep('androidSetupActionCreator', androidSetupActionCreatorMock.object)
             .build();
     });
 
@@ -30,4 +37,10 @@ describe('PromptConnectToDeviceStep', () => {
         rendered.find(AndroidSetupStepLayout).prop('leftFooterButtonProps').onClick(stubEvent);
         closeAppMock.verify(m => m(), Times.once());
     });
+
+    it('invokes next action when detect devices selected', () => {
+        const rendered = shallow(<PromptConnectToDeviceStep {...props} />);
+        rendered.find({ 'data-automation-id': detectDeviceAutomationId }).simulate('click');
+        androidSetupActionCreatorMock.verify(m => m.next(), Times.once());
+    });
 });

From bd78a9394bcd5a1e388c19378cd5767e5729c29c Mon Sep 17 00:00:00 2001
From: Sebastian Morales <smoralesd@users.noreply.github.com>
Date: Mon, 15 Jun 2020 15:50:42 -0700
Subject: [PATCH 17/71] tools: fix broken debug tools view (#2872)

I notice the debug tools view got broken:

```
Uncaught TypeError: Cannot read property 'reflowUI' of undefined
    at DebugToolsView (webpack-internal:///./src/debug-tools/components/debug-tools-view.tsx:8)
    at renderWithHooks (webpack-internal:///./node_modules/react-dom/cjs/react-dom.development.js:14803)
    at mountIndeterminateComponent (webpack-internal:///./node_modules/react-dom/cjs/react-dom.development.js:17482)
    at beginWork (webpack-internal:///./node_modules/react-dom/cjs/react-dom.development.js:18596)
    at HTMLUnknownElement.callCallback (webpack-internal:///./node_modules/react-dom/cjs/react-dom.development.js:188)
    at Object.invokeGuardedCallbackDev (webpack-internal:///./node_modules/react-dom/cjs/react-dom.development.js:237)
    at invokeGuardedCallback (webpack-internal:///./node_modules/react-dom/cjs/react-dom.development.js:292)
    at beginWork$1 (webpack-internal:///./node_modules/react-dom/cjs/react-dom.development.js:23203)
    at performUnitOfWork (webpack-internal:///./node_modules/react-dom/cjs/react-dom.development.js:22157)
    at workLoopSync (webpack-internal:///./node_modules/react-dom/cjs/react-dom.development.js:22130)
```

This is due to not checking the store data before using it on `DebugTools`.

Adding a guard clause to check if we actually have data before using it. If we don't, rendering a spinner.

**Note** I'm wondering if this guard clause is something we should put on the `withStoreSubscription` HOC instead on the wrapped components.
---
 .../components/debug-tools-view.tsx           |  5 +++
 .../debug-tools-view.test.tsx.snap            | 24 +++++++++--
 .../components/debug-tools-view.test.tsx      | 42 ++++++++++++-------
 3 files changed, 53 insertions(+), 18 deletions(-)

diff --git a/src/debug-tools/components/debug-tools-view.tsx b/src/debug-tools/components/debug-tools-view.tsx
index 02f06742a07..e9d5cd74154 100644
--- a/src/debug-tools/components/debug-tools-view.tsx
+++ b/src/debug-tools/components/debug-tools-view.tsx
@@ -18,6 +18,7 @@ import {
     DebugToolsNavState,
 } from 'debug-tools/components/debug-tools-nav';
 import { NarrowModeDetector } from 'DetailsView/components/narrow-mode-detector';
+import { Spinner, SpinnerSize } from 'office-ui-fabric-react';
 import * as React from 'react';
 import * as styles from './debug-tools-view.scss';
 
@@ -34,6 +35,10 @@ export interface DebugToolsViewProps {
 }
 
 export const DebugTools = NamedFC<DebugToolsViewProps>('DebugToolsView', ({ deps, storeState }) => {
+    if (!deps.storesHub.hasStoreData()) {
+        return <Spinner size={SpinnerSize.large} label="Loading" />;
+    }
+
     const headerProps: Omit<HeaderProps, 'isNarrowMode'> = { deps };
     return (
         <div className={styles.debugToolsContainer}>
diff --git a/src/tests/unit/tests/debug-tools/components/__snapshots__/debug-tools-view.test.tsx.snap b/src/tests/unit/tests/debug-tools/components/__snapshots__/debug-tools-view.test.tsx.snap
index ba0bf334fa4..880faaa7424 100644
--- a/src/tests/unit/tests/debug-tools/components/__snapshots__/debug-tools-view.test.tsx.snap
+++ b/src/tests/unit/tests/debug-tools/components/__snapshots__/debug-tools-view.test.tsx.snap
@@ -1,6 +1,13 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`DebugToolsView renders 1`] = `
+exports[`DebugToolsView renders when storesHub.hasStoresData = false 1`] = `
+<StyledSpinnerBase
+  label="Loading"
+  size={3}
+/>
+`;
+
+exports[`DebugToolsView renders when storesHub.hasStoresData = true 1`] = `
 <div
   className="debugToolsContainer"
 >
@@ -9,7 +16,10 @@ exports[`DebugToolsView renders 1`] = `
     childrenProps={
       Object {
         "deps": Object {
-          "storesHub": null,
+          "storesHub": proxy {
+            "___id": "BCDF5CE5-F0DF-40B7-8BA0-69DF395033C8",
+            "stores": undefined,
+          },
         },
       }
     }
@@ -19,7 +29,10 @@ exports[`DebugToolsView renders 1`] = `
     className="nav"
     deps={
       Object {
-        "storesHub": null,
+        "storesHub": proxy {
+          "___id": "BCDF5CE5-F0DF-40B7-8BA0-69DF395033C8",
+          "stores": undefined,
+        },
       }
     }
     state={
@@ -36,7 +49,10 @@ exports[`DebugToolsView renders 1`] = `
   <CurrentView
     deps={
       Object {
-        "storesHub": null,
+        "storesHub": proxy {
+          "___id": "BCDF5CE5-F0DF-40B7-8BA0-69DF395033C8",
+          "stores": undefined,
+        },
       }
     }
     storeState={
diff --git a/src/tests/unit/tests/debug-tools/components/debug-tools-view.test.tsx b/src/tests/unit/tests/debug-tools/components/debug-tools-view.test.tsx
index 4cb67222d10..7e956ec9893 100644
--- a/src/tests/unit/tests/debug-tools/components/debug-tools-view.test.tsx
+++ b/src/tests/unit/tests/debug-tools/components/debug-tools-view.test.tsx
@@ -1,5 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
+import { BaseClientStoresHub } from 'common/stores/base-client-stores-hub';
+import { ClientStoresHub } from 'common/stores/client-stores-hub';
 import { FeatureFlagStoreData } from 'common/types/store-data/feature-flag-store-data';
 import { UserConfigurationStoreData } from 'common/types/store-data/user-configuration-store';
 import {
@@ -9,24 +11,36 @@ import {
 } from 'debug-tools/components/debug-tools-view';
 import { shallow } from 'enzyme';
 import * as React from 'react';
+import { IMock, Mock } from 'typemoq';
 
+//
 describe('DebugToolsView', () => {
-    it('renders', () => {
-        const deps = {
-            storesHub: null,
-        } as DebugToolsViewDeps;
+    describe('renders', () => {
+        let storesHubMock: IMock<ClientStoresHub<DebugToolsViewState>>;
 
-        const storeState = {
-            userConfigurationStoreData: {
-                isFirstTime: true,
-            } as UserConfigurationStoreData,
-            featureFlagStoreData: {
-                reflowUI: true,
-            } as FeatureFlagStoreData,
-        } as DebugToolsViewState;
+        beforeEach(() => {
+            storesHubMock = Mock.ofType<ClientStoresHub<DebugToolsViewState>>(BaseClientStoresHub);
+        });
 
-        const wrapped = shallow(<DebugTools deps={deps} storeState={storeState} />);
+        it.each([true, false])('when storesHub.hasStoresData = %s', hasStoreData => {
+            storesHubMock.setup(hub => hub.hasStoreData()).returns(() => hasStoreData);
 
-        expect(wrapped.getElement()).toMatchSnapshot();
+            const deps = {
+                storesHub: storesHubMock.object,
+            } as DebugToolsViewDeps;
+
+            const storeState = {
+                userConfigurationStoreData: {
+                    isFirstTime: true,
+                } as UserConfigurationStoreData,
+                featureFlagStoreData: {
+                    reflowUI: true,
+                } as FeatureFlagStoreData,
+            } as DebugToolsViewState;
+
+            const wrapped = shallow(<DebugTools deps={deps} storeState={storeState} />);
+
+            expect(wrapped.getElement()).toMatchSnapshot();
+        });
     });
 });

From b0402f792eed7d9959e967cd4bf485e8448c2265 Mon Sep 17 00:00:00 2001
From: Dan Bjorge <danielbj@microsoft.com>
Date: Mon, 15 Jun 2020 16:54:06 -0700
Subject: [PATCH 18/71] feat(android-setup): wire up browse button to native
 folder picker dialog (#2838)

#### Description of changes

Wires up the prompt-locate-adb step's Browse button the system open folder dialog. The dialog functionality can only be invoked from the main process, so round trips through the ipcRendererShim.

I found it off-putting to have to update all the other steps' tests to add the new dep, so I updated them to use a common props builder to avoid that in the future (and simplify the other tests).

Out of scope: hooking up the step's listeners to the state machine actions

Animation of flow through dialog:

![dialog-demo](https://user-images.githubusercontent.com/376284/84221573-726a4f80-aa8a-11ea-82f6-9bb1950c23b9.gif)

#### Pull request checklist
<!-- If a checklist item is not applicable to this change, write "n/a" in the checkbox -->
- [x] Addresses an existing issue: Part 2 of 1724336
- [x] Ran `yarn fastpass`
- [x] Added/updated relevant unit test(s) (and ran `yarn test`)
- [x] Verified code coverage for the changes made. Check coverage report at: `<rootDir>/test-results/unit/coverage`
- [x] PR title *AND* final merge commit title both start with a semantic tag (`fix:`, `chore:`, `feat(feature-name):`, `refactor:`). See `CONTRIBUTING.md`.
- [x] (UI changes only) Added screenshots/GIFs to description above
- [x] (UI changes only) Verified usability with NVDA/JAWS
---
 src/electron/ipc/ipc-channel-names.ts         |   1 +
 src/electron/ipc/ipc-renderer-shim.ts         |   7 +-
 .../main-window-renderer-message-handlers.ts  |  34 +++++-
 src/electron/main/main.ts                     |   3 +-
 .../android-setup/android-setup-types.ts      |   3 +-
 .../android-setup/folder-picker.tsx           |  15 ++-
 .../android-setup/prompt-locate-adb-step.tsx  |   1 +
 src/electron/views/renderer-initializer.ts    |   1 +
 .../android-setup-step-props-builder.tsx      |   1 +
 .../electron/ipc/ipc-renderer-shim.test.ts    |  27 ++++-
 ...n-window-renderer-message-handlers.test.ts |  36 +++++-
 ...android-setup-step-container.test.tsx.snap |   1 +
 .../detect-devices-step.test.tsx.snap         |   1 +
 .../detect-service-step.test.tsx.snap         |   1 +
 .../installing-service-step.test.tsx.snap     |   1 +
 .../prompt-locate-adb-step.test.tsx.snap      |  24 +++-
 .../android-setup/folder-picker.test.tsx      | 102 ++++++++++++++--
 .../prompt-locate-adb-step.test.tsx           | 112 ++++++++++--------
 18 files changed, 296 insertions(+), 75 deletions(-)

diff --git a/src/electron/ipc/ipc-channel-names.ts b/src/electron/ipc/ipc-channel-names.ts
index 4a031954e17..1bde2d2e7e7 100644
--- a/src/electron/ipc/ipc-channel-names.ts
+++ b/src/electron/ipc/ipc-channel-names.ts
@@ -15,6 +15,7 @@ export const IPC_FROMRENDERER_CLOSE_BROWSERWINDOW_CHANNEL_NAME =
 export const IPC_FROMRENDERER_SETSIZEANDCENTER_BROWSER_WINDOW_CHANNEL_NAME =
     '924a9a7e-b58f-4940-a5b3-c281a1ed621e';
 export const IPC_FROMRENDERER_GET_APP_PATH_CHANNEL_NAME = '5c13cdf4-ec5f-441a-8a0c-f755e1026d3d';
+export const IPC_FROMRENDERER_SHOW_OPEN_FILE_DIALOG = '1d63a44a-958d-4e67-a4f0-5a8736274e95';
 export const IPC_FROMBROWSERWINDOW_ENTERFULLSCREEN_CHANNEL_NAME =
     '0a25c6e8-0108-4943-8c45-809bdf30d811';
 export const IPC_FROMBROWSERWINDOW_MAXIMIZE_CHANNEL_NAME = 'bef38a72-98cb-44c0-ba95-96f8f2cc658c';
diff --git a/src/electron/ipc/ipc-renderer-shim.ts b/src/electron/ipc/ipc-renderer-shim.ts
index b15d5309d1d..ec2f5a220bf 100644
--- a/src/electron/ipc/ipc-renderer-shim.ts
+++ b/src/electron/ipc/ipc-renderer-shim.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 import { Action } from 'common/flux/action';
-import { IpcRenderer } from 'electron';
+import { IpcRenderer, OpenDialogOptions, OpenDialogReturnValue } from 'electron';
 import { SetSizePayload } from 'electron/flux/action/window-frame-actions-payloads';
 import {
     IPC_FROMBROWSERWINDOW_ENTERFULLSCREEN_CHANNEL_NAME,
@@ -14,6 +14,7 @@ import {
     IPC_FROMRENDERER_MINIMIZE_BROWSER_WINDOW_CHANNEL_NAME,
     IPC_FROMRENDERER_RESTORE_BROWSER_WINDOW_CHANNEL_NAME,
     IPC_FROMRENDERER_SETSIZEANDCENTER_BROWSER_WINDOW_CHANNEL_NAME,
+    IPC_FROMRENDERER_SHOW_OPEN_FILE_DIALOG,
 } from 'electron/ipc/ipc-channel-names';
 
 export class IpcRendererShim {
@@ -51,6 +52,10 @@ export class IpcRendererShim {
         return await this.ipcRenderer.invoke(IPC_FROMRENDERER_GET_APP_PATH_CHANNEL_NAME);
     };
 
+    public showOpenFileDialog = async (opts: OpenDialogOptions): Promise<OpenDialogReturnValue> => {
+        return await this.ipcRenderer.invoke(IPC_FROMRENDERER_SHOW_OPEN_FILE_DIALOG, opts);
+    };
+
     // Call these methods to send data FROM renderer process
     public initializeWindow = (): void => {
         this.ipcRenderer.send(IPC_FROMRENDERER_MAIN_WINDOW_INITIALIZED_CHANNEL_NAME);
diff --git a/src/electron/main/main-window-renderer-message-handlers.ts b/src/electron/main/main-window-renderer-message-handlers.ts
index cc60045e1b0..67b4109a3b2 100644
--- a/src/electron/main/main-window-renderer-message-handlers.ts
+++ b/src/electron/main/main-window-renderer-message-handlers.ts
@@ -1,6 +1,15 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-import { App, BrowserWindow, IpcMain, IpcMainEvent } from 'electron';
+import {
+    App,
+    BrowserWindow,
+    Dialog,
+    IpcMain,
+    IpcMainEvent,
+    IpcMainInvokeEvent,
+    OpenDialogOptions,
+    OpenDialogReturnValue,
+} from 'electron';
 import { SetSizePayload } from 'electron/flux/action/window-frame-actions-payloads';
 import {
     IPC_FROMBROWSERWINDOW_ENTERFULLSCREEN_CHANNEL_NAME,
@@ -12,22 +21,24 @@ import {
     IPC_FROMRENDERER_MINIMIZE_BROWSER_WINDOW_CHANNEL_NAME,
     IPC_FROMRENDERER_RESTORE_BROWSER_WINDOW_CHANNEL_NAME,
     IPC_FROMRENDERER_SETSIZEANDCENTER_BROWSER_WINDOW_CHANNEL_NAME,
+    IPC_FROMRENDERER_SHOW_OPEN_FILE_DIALOG,
 } from 'electron/ipc/ipc-channel-names';
 
-type EventCallback = {
+type EventCallback<EventT> = {
     eventName: string;
-    eventHandler: (event: IpcMainEvent, ...args: any[]) => void;
+    eventHandler: (event: EventT, ...args: any[]) => void;
 };
 
 export class MainWindowRendererMessageHandlers {
-    private ipcMainHandlers: EventCallback[];
-    private ipcMainListeners: EventCallback[];
-    private browserWindowCallbacks: EventCallback[];
+    private ipcMainHandlers: EventCallback<IpcMainInvokeEvent>[];
+    private ipcMainListeners: EventCallback<IpcMainEvent>[];
+    private browserWindowCallbacks: EventCallback<Electron.Event>[];
 
     public constructor(
         private readonly browserWindow: BrowserWindow,
         private readonly ipcMain: IpcMain,
         private readonly app: App,
+        private readonly dialog: Dialog,
     ) {}
 
     private populateCallbacks(): void {
@@ -36,6 +47,10 @@ export class MainWindowRendererMessageHandlers {
                 eventName: IPC_FROMRENDERER_GET_APP_PATH_CHANNEL_NAME,
                 eventHandler: this.handleGetAppPathFromRenderer,
             },
+            {
+                eventName: IPC_FROMRENDERER_SHOW_OPEN_FILE_DIALOG,
+                eventHandler: this.handleShowOpenFileDialogFromRenderer,
+            },
         ];
 
         this.ipcMainListeners = [
@@ -128,6 +143,13 @@ export class MainWindowRendererMessageHandlers {
         return this.app.getAppPath();
     };
 
+    private handleShowOpenFileDialogFromRenderer = async (
+        _: IpcMainInvokeEvent,
+        opts: OpenDialogOptions,
+    ): Promise<OpenDialogReturnValue> => {
+        return await this.dialog.showOpenDialog(this.browserWindow, opts);
+    };
+
     private onMaximizeFromMainWindow = (): void => {
         this.browserWindow.webContents.send(IPC_FROMBROWSERWINDOW_MAXIMIZE_CHANNEL_NAME);
     };
diff --git a/src/electron/main/main.ts b/src/electron/main/main.ts
index 877ba2fbbf1..f7c22b2077d 100644
--- a/src/electron/main/main.ts
+++ b/src/electron/main/main.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 import { FileSystemConfiguration } from 'common/configuration/file-system-configuration';
 import { UserConfigMessageCreator } from 'common/message-creators/user-config-message-creator';
-import { app, BrowserWindow, ipcMain, nativeTheme } from 'electron';
+import { app, BrowserWindow, dialog, ipcMain, nativeTheme } from 'electron';
 import log from 'electron-log';
 import { autoUpdater } from 'electron-updater';
 import { AutoUpdaterClient } from 'electron/auto-update/auto-updater-client';
@@ -63,6 +63,7 @@ const createWindow = () => {
         mainWindow,
         ipcMain,
         app,
+        dialog,
     );
 
     mainWindow
diff --git a/src/electron/views/device-connect-view/components/android-setup/android-setup-types.ts b/src/electron/views/device-connect-view/components/android-setup/android-setup-types.ts
index 384d65dfdc6..e9e44b8d41a 100644
--- a/src/electron/views/device-connect-view/components/android-setup/android-setup-types.ts
+++ b/src/electron/views/device-connect-view/components/android-setup/android-setup-types.ts
@@ -5,6 +5,7 @@ import { UserConfigurationStoreData } from 'common/types/store-data/user-configu
 import { AndroidSetupActionCreator } from 'electron/flux/action-creator/android-setup-action-creator';
 import { AndroidSetupStoreData } from 'electron/flux/types/android-setup-store-data';
 import { AndroidSetupStepId } from 'electron/platform/android/setup/android-setup-step-id';
+import { FolderPickerDeps } from 'electron/views/device-connect-view/components/android-setup/folder-picker';
 import * as React from 'react';
 
 export type AndroidSetupStep = React.ComponentType<CommonAndroidSetupStepProps>;
@@ -21,7 +22,7 @@ export type AndroidSetupPageDeps = {
     LinkComponent: LinkComponentType;
     closeApp: () => void;
     startTesting: () => void;
-};
+} & FolderPickerDeps;
 
 // 'Partial' is used to allow missing step IDs as they get implemented.
 // Once all step IDs have components, we should remove 'Partial'
diff --git a/src/electron/views/device-connect-view/components/android-setup/folder-picker.tsx b/src/electron/views/device-connect-view/components/android-setup/folder-picker.tsx
index 7144294891d..3525a4c4afc 100644
--- a/src/electron/views/device-connect-view/components/android-setup/folder-picker.tsx
+++ b/src/electron/views/device-connect-view/components/android-setup/folder-picker.tsx
@@ -1,11 +1,16 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 import { NamedFC } from 'common/react/named-fc';
+import { OpenDialogOptions, OpenDialogReturnValue } from 'electron';
 import { getId, PrimaryButton, TextField } from 'office-ui-fabric-react';
 import * as React from 'react';
 import * as styles from './folder-picker.scss';
 
+export type FolderPickerDeps = {
+    showOpenFileDialog: (opts: OpenDialogOptions) => Promise<OpenDialogReturnValue>;
+};
 export type FolderPickerProps = {
+    deps: FolderPickerDeps;
     instructionsText: string;
     value: string;
     onChange: (newValue?: string) => void;
@@ -18,8 +23,14 @@ export const FolderPicker = NamedFC<FolderPickerProps>(
             props.onChange(newValue);
         };
 
-        const onBrowseButtonClick = () => {
-            // To be implemented in terms of Electron.dialog.showOpenDialog in later feature work
+        const onBrowseButtonClick = async () => {
+            const result = await props.deps.showOpenFileDialog({
+                properties: ['openDirectory'],
+            });
+
+            if (!result.canceled && result.filePaths.length > 0) {
+                props.onChange(result.filePaths[0]);
+            }
         };
 
         const instructionsId = getId('folder-picker-instructions__');
diff --git a/src/electron/views/device-connect-view/components/android-setup/prompt-locate-adb-step.tsx b/src/electron/views/device-connect-view/components/android-setup/prompt-locate-adb-step.tsx
index ad75f8e9974..b0260933767 100644
--- a/src/electron/views/device-connect-view/components/android-setup/prompt-locate-adb-step.tsx
+++ b/src/electron/views/device-connect-view/components/android-setup/prompt-locate-adb-step.tsx
@@ -40,6 +40,7 @@ export const PromptLocateAdbStep = NamedFC<CommonAndroidSetupStepProps>(
         return (
             <AndroidSetupStepLayout {...layoutProps}>
                 <FolderPicker
+                    deps={props.deps}
                     instructionsText="Select the folder containing adb. We'll use it to connect to your device."
                     value={adbLocation}
                     onChange={onFolderPickerChange}
diff --git a/src/electron/views/renderer-initializer.ts b/src/electron/views/renderer-initializer.ts
index e7472954dd1..77e795655a6 100644
--- a/src/electron/views/renderer-initializer.ts
+++ b/src/electron/views/renderer-initializer.ts
@@ -476,6 +476,7 @@ getPersistedData(indexedDBInstance, indexedDBDataKeysToFetch).then(
             androidSetupStepComponentProvider: defaultAndroidSetupComponents,
             closeApp: ipcRendererShim.closeWindow,
             startTesting: startTesting,
+            showOpenFileDialog: ipcRendererShim.showOpenFileDialog,
         };
 
         window.insightsUserConfiguration = new UserConfigurationController(interpreter);
diff --git a/src/tests/unit/common/android-setup-step-props-builder.tsx b/src/tests/unit/common/android-setup-step-props-builder.tsx
index e24152cd13c..dfa7bd8ec0d 100644
--- a/src/tests/unit/common/android-setup-step-props-builder.tsx
+++ b/src/tests/unit/common/android-setup-step-props-builder.tsx
@@ -25,6 +25,7 @@ export class AndroidSetupStepPropsBuilder extends BaseDataBuilder<CommonAndroidS
                 androidSetupStepComponentProvider: null,
                 closeApp: null,
                 startTesting: null,
+                showOpenFileDialog: null,
             },
         };
     }
diff --git a/src/tests/unit/tests/electron/ipc/ipc-renderer-shim.test.ts b/src/tests/unit/tests/electron/ipc/ipc-renderer-shim.test.ts
index 91aa663d210..4770a531e7c 100644
--- a/src/tests/unit/tests/electron/ipc/ipc-renderer-shim.test.ts
+++ b/src/tests/unit/tests/electron/ipc/ipc-renderer-shim.test.ts
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-import { IpcRenderer } from 'electron';
+import { IpcRenderer, OpenDialogOptions, OpenDialogReturnValue } from 'electron';
 import { SetSizePayload } from 'electron/flux/action/window-frame-actions-payloads';
 import {
     IPC_FROMBROWSERWINDOW_ENTERFULLSCREEN_CHANNEL_NAME,
@@ -13,6 +13,7 @@ import {
     IPC_FROMRENDERER_MINIMIZE_BROWSER_WINDOW_CHANNEL_NAME,
     IPC_FROMRENDERER_RESTORE_BROWSER_WINDOW_CHANNEL_NAME,
     IPC_FROMRENDERER_SETSIZEANDCENTER_BROWSER_WINDOW_CHANNEL_NAME,
+    IPC_FROMRENDERER_SHOW_OPEN_FILE_DIALOG,
 } from 'electron/ipc/ipc-channel-names';
 import { IpcRendererShim } from 'electron/ipc/ipc-renderer-shim';
 import { IMock, It, Mock, MockBehavior, Times } from 'typemoq';
@@ -156,5 +157,29 @@ describe(IpcRendererShim, () => {
                 await expect(testSubject.getAppPath()).rejects.toThrowError(error);
             });
         });
+
+        describe('showOpenFileDialog', () => {
+            it('defers to the expected invoke call', async () => {
+                const opts: OpenDialogOptions = { properties: ['createDirectory'] };
+                const output: OpenDialogReturnValue = { canceled: false, filePaths: ['/path/1'] };
+                ipcRendererMock
+                    .setup(m => m.invoke(IPC_FROMRENDERER_SHOW_OPEN_FILE_DIALOG, opts))
+                    .returns(() => Promise.resolve(output))
+                    .verifiable(Times.once());
+
+                expect(await testSubject.showOpenFileDialog(opts)).toBe(output);
+            });
+
+            it('propagates errors from the invoke call', async () => {
+                const error = new Error('test error message');
+                const opts: OpenDialogOptions = { properties: ['createDirectory'] };
+                ipcRendererMock
+                    .setup(m => m.invoke(IPC_FROMRENDERER_SHOW_OPEN_FILE_DIALOG, opts))
+                    .returns(() => Promise.reject(error))
+                    .verifiable(Times.once());
+
+                await expect(testSubject.showOpenFileDialog(opts)).rejects.toThrowError(error);
+            });
+        });
     });
 });
diff --git a/src/tests/unit/tests/electron/main/main-window-renderer-message-handlers.test.ts b/src/tests/unit/tests/electron/main/main-window-renderer-message-handlers.test.ts
index 31f302aa206..b149f90c81a 100644
--- a/src/tests/unit/tests/electron/main/main-window-renderer-message-handlers.test.ts
+++ b/src/tests/unit/tests/electron/main/main-window-renderer-message-handlers.test.ts
@@ -1,6 +1,15 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-import { App, BrowserWindow, IpcMain, IpcMainEvent, WebContents } from 'electron';
+import {
+    App,
+    BrowserWindow,
+    Dialog,
+    IpcMain,
+    IpcMainEvent,
+    OpenDialogOptions,
+    OpenDialogReturnValue,
+    WebContents,
+} from 'electron';
 import { SetSizePayload } from 'electron/flux/action/window-frame-actions-payloads';
 import {
     IPC_FROMBROWSERWINDOW_ENTERFULLSCREEN_CHANNEL_NAME,
@@ -12,6 +21,7 @@ import {
     IPC_FROMRENDERER_MINIMIZE_BROWSER_WINDOW_CHANNEL_NAME,
     IPC_FROMRENDERER_RESTORE_BROWSER_WINDOW_CHANNEL_NAME,
     IPC_FROMRENDERER_SETSIZEANDCENTER_BROWSER_WINDOW_CHANNEL_NAME,
+    IPC_FROMRENDERER_SHOW_OPEN_FILE_DIALOG,
 } from 'electron/ipc/ipc-channel-names';
 import { MainWindowRendererMessageHandlers } from 'electron/main/main-window-renderer-message-handlers';
 import { IMock, It, Mock, MockBehavior, Times } from 'typemoq';
@@ -25,7 +35,10 @@ describe(MainWindowRendererMessageHandlers, () => {
     const enterFullScreen = 'enter-full-screen';
     const leaveFullScreen = 'leave-full-screen';
 
-    const ipcChannelHandlerNames = [IPC_FROMRENDERER_GET_APP_PATH_CHANNEL_NAME];
+    const ipcChannelHandlerNames = [
+        IPC_FROMRENDERER_GET_APP_PATH_CHANNEL_NAME,
+        IPC_FROMRENDERER_SHOW_OPEN_FILE_DIALOG,
+    ];
 
     const ipcChannelListenerNames = [
         IPC_FROMRENDERER_MAXIMIZE_BROWSER_WINDOW_CHANNEL_NAME,
@@ -40,6 +53,7 @@ describe(MainWindowRendererMessageHandlers, () => {
     let mainWindowMock: IMock<BrowserWindow>;
     let ipcMainMock: IMock<IpcMain>;
     let appMock: IMock<App>;
+    let dialogMock: IMock<Dialog>;
     let testSubject: MainWindowRendererMessageHandlers;
     let ipcHandlers: { [channelName: string]: (event: IpcMainEvent, args?: any) => Promise<any> };
     let ipcListeners: { [channelName: string]: (event: IpcMainEvent, args?: any) => void };
@@ -115,11 +129,13 @@ describe(MainWindowRendererMessageHandlers, () => {
         mainWindowMock = Mock.ofType<BrowserWindow>(undefined, MockBehavior.Loose);
         ipcMainMock = Mock.ofType<IpcMain>(undefined, MockBehavior.Strict);
         appMock = Mock.ofType<App>(undefined, MockBehavior.Strict);
+        dialogMock = Mock.ofType<Dialog>(undefined, MockBehavior.Strict);
 
         testSubject = new MainWindowRendererMessageHandlers(
             mainWindowMock.object,
             ipcMainMock.object,
             appMock.object,
+            dialogMock.object,
         );
 
         ipcChannelListenerNames.forEach(setupToAddOneIpcChannelListener);
@@ -206,6 +222,22 @@ describe(MainWindowRendererMessageHandlers, () => {
             expect(result).toBe(stubAppPath);
         });
 
+        it('uses dialog.showOpenDialog to handle SHOW_OPEN_DIALOG', async () => {
+            const options: OpenDialogOptions = {};
+            const returnValue: OpenDialogReturnValue = { canceled: true, filePaths: [] };
+            dialogMock
+                .setup(m => m.showOpenDialog(mainWindowMock.object, options))
+                .returns(() => Promise.resolve(returnValue))
+                .verifiable();
+
+            const result = await ipcHandlers[IPC_FROMRENDERER_SHOW_OPEN_FILE_DIALOG](
+                stubIpcMainEvent,
+                options,
+            );
+
+            expect(result).toBe(returnValue);
+        });
+
         it('StopListening removes all handlers', () => {
             ipcChannelHandlerNames.forEach(setupToRemoveOneIpcChannelHandler);
             ipcChannelListenerNames.forEach(setupToRemoveOneIpcChannelListener);
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/android-setup-step-container.test.tsx.snap b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/android-setup-step-container.test.tsx.snap
index 4cf916a8dd4..716a0afd83d 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/android-setup-step-container.test.tsx.snap
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/android-setup-step-container.test.tsx.snap
@@ -16,6 +16,7 @@ exports[`AndroidSetupStepContainer passes common props and deps through 1`] = `
         "prompt-locate-adb": [Function],
       },
       "closeApp": null,
+      "showOpenFileDialog": null,
       "startTesting": null,
     }
   }
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/detect-devices-step.test.tsx.snap b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/detect-devices-step.test.tsx.snap
index 39eaeb7f799..e461dde4fb9 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/detect-devices-step.test.tsx.snap
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/detect-devices-step.test.tsx.snap
@@ -9,6 +9,7 @@ exports[`DetectDevicesStep renders 1`] = `
         "androidSetupActionCreator": null,
         "androidSetupStepComponentProvider": null,
         "closeApp": null,
+        "showOpenFileDialog": null,
         "startTesting": null,
       }
     }
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/detect-service-step.test.tsx.snap b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/detect-service-step.test.tsx.snap
index e4a390972e4..ac075439ff0 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/detect-service-step.test.tsx.snap
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/detect-service-step.test.tsx.snap
@@ -9,6 +9,7 @@ exports[`DetectServiceStep renders 1`] = `
         "androidSetupActionCreator": null,
         "androidSetupStepComponentProvider": null,
         "closeApp": null,
+        "showOpenFileDialog": null,
         "startTesting": null,
       }
     }
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/installing-service-step.test.tsx.snap b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/installing-service-step.test.tsx.snap
index aee874ab55f..4ef6d777c2f 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/installing-service-step.test.tsx.snap
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/installing-service-step.test.tsx.snap
@@ -9,6 +9,7 @@ exports[`InstallingServiceStep renders 1`] = `
         "androidSetupActionCreator": null,
         "androidSetupStepComponentProvider": null,
         "closeApp": null,
+        "showOpenFileDialog": null,
         "startTesting": null,
       }
     }
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-locate-adb-step.test.tsx.snap b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-locate-adb-step.test.tsx.snap
index 288dc0a95ac..9a9a86eb1fb 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-locate-adb-step.test.tsx.snap
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-locate-adb-step.test.tsx.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`PromptLocateAdbStep renders per snapshot with adbLocation not set 1`] = `
+exports[`PromptLocateAdbStep rendering renders per snapshot with adbLocation not set 1`] = `
 <AndroidSetupStepLayout
   headerText="Locate Android Debug Bridge (adb)"
   leftFooterButtonProps={
@@ -25,6 +25,16 @@ exports[`PromptLocateAdbStep renders per snapshot with adbLocation not set 1`] =
   }
 >
   <FolderPicker
+    deps={
+      Object {
+        "LinkComponent": [Function],
+        "androidSetupActionCreator": null,
+        "androidSetupStepComponentProvider": null,
+        "closeApp": null,
+        "showOpenFileDialog": null,
+        "startTesting": null,
+      }
+    }
     instructionsText="Select the folder containing adb. We'll use it to connect to your device."
     onChange={[Function]}
     value=""
@@ -32,7 +42,7 @@ exports[`PromptLocateAdbStep renders per snapshot with adbLocation not set 1`] =
 </AndroidSetupStepLayout>
 `;
 
-exports[`PromptLocateAdbStep renders per snapshot with adbLocation set 1`] = `
+exports[`PromptLocateAdbStep rendering renders per snapshot with adbLocation set 1`] = `
 <AndroidSetupStepLayout
   headerText="Locate Android Debug Bridge (adb)"
   leftFooterButtonProps={
@@ -57,6 +67,16 @@ exports[`PromptLocateAdbStep renders per snapshot with adbLocation set 1`] = `
   }
 >
   <FolderPicker
+    deps={
+      Object {
+        "LinkComponent": [Function],
+        "androidSetupActionCreator": null,
+        "androidSetupStepComponentProvider": null,
+        "closeApp": null,
+        "showOpenFileDialog": null,
+        "startTesting": null,
+      }
+    }
     instructionsText="Select the folder containing adb. We'll use it to connect to your device."
     onChange={[Function]}
     value="/some/path/to/android/home"
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/folder-picker.test.tsx b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/folder-picker.test.tsx
index 64974efcec6..155cfd776a4 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/folder-picker.test.tsx
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/folder-picker.test.tsx
@@ -1,19 +1,24 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
+import { OpenDialogOptions } from 'electron';
 import {
     FolderPicker,
     FolderPickerProps,
 } from 'electron/views/device-connect-view/components/android-setup/folder-picker';
 import { shallow } from 'enzyme';
-import { TextField } from 'office-ui-fabric-react';
+import { PrimaryButton, TextField } from 'office-ui-fabric-react';
 import * as React from 'react';
-import { Mock, Times } from 'typemoq';
+import { tick } from 'tests/unit/common/tick';
+import { IMock, It, Mock, MockBehavior, Times } from 'typemoq';
 
 describe('FolderPicker', () => {
     let props: FolderPickerProps;
 
     beforeEach(() => {
         props = {
+            deps: {
+                showOpenFileDialog: null,
+            },
             instructionsText: 'some instructions',
             value: '/path/to/folder',
             onChange: null,
@@ -32,14 +37,93 @@ describe('FolderPicker', () => {
         );
     });
 
-    it('invokes onChange when the TextField is changed', () => {
-        const onChangeMock = Mock.ofType<typeof props.onChange>();
-        props.onChange = onChangeMock.object;
+    describe('onChange behavior', () => {
+        let onChangeMock: IMock<typeof props.onChange>;
+        let showOpenFileDialogMock: IMock<typeof props.deps.showOpenFileDialog>;
+        const stubFormEvent = {} as React.FormEvent<any>;
+        const stubMouseEvent = {} as React.MouseEvent<any>;
 
-        const eventStub = {} as React.FormEvent<any>;
-        const rendered = shallow(<FolderPicker {...props} />);
-        rendered.find(TextField).prop('onChange')(eventStub, 'new text');
+        beforeEach(() => {
+            onChangeMock = Mock.ofType<typeof props.onChange>();
+            props.onChange = onChangeMock.object;
+
+            showOpenFileDialogMock = Mock.ofType<typeof props.deps.showOpenFileDialog>(
+                undefined,
+                MockBehavior.Strict,
+            );
+            props.deps.showOpenFileDialog = showOpenFileDialogMock.object;
+        });
+
+        it('invokes onChange when the TextField is changed', () => {
+            const rendered = shallow(<FolderPicker {...props} />);
+            rendered.find(TextField).prop('onChange')(stubFormEvent, 'new text');
+
+            onChangeMock.verify(m => m('new text'), Times.once());
+        });
+
+        const expectedShowOpenFileDialogOptions: OpenDialogOptions = {
+            properties: ['openDirectory'],
+        };
+
+        it('flows through showOpenFileDialog to onChange when browse button is clicked', async () => {
+            showOpenFileDialogMock
+                .setup(m => m(expectedShowOpenFileDialogOptions))
+                .returns(() => Promise.resolve({ canceled: false, filePaths: ['/path/to/adb'] }))
+                .verifiable(Times.once());
+
+            const rendered = shallow(<FolderPicker {...props} />);
+            rendered.find(PrimaryButton).prop('onClick')(stubMouseEvent);
+
+            await tick();
+
+            showOpenFileDialogMock.verifyAll();
+            onChangeMock.verify(m => m('/path/to/adb'), Times.once());
+        });
+
+        // This is an unexpected case; cancellation of the dialog is not an error
+        it('does not invoke onChange if showOpenFileDialog throws an error', () => {
+            showOpenFileDialogMock
+                .setup(m => m(expectedShowOpenFileDialogOptions))
+                .returns(() => Promise.reject(new Error('unexpected error')))
+                .verifiable(Times.once());
+
+            const rendered = shallow(<FolderPicker {...props} />);
+            rendered.find(PrimaryButton).prop('onClick')(stubMouseEvent);
+
+            jest.runAllTimers();
+
+            showOpenFileDialogMock.verifyAll();
+            onChangeMock.verify(m => m(It.isAny()), Times.never());
+        });
+
+        it('does not invoke onChange if showOpenFileDialog returns in a cancelled state', () => {
+            showOpenFileDialogMock
+                .setup(m => m(expectedShowOpenFileDialogOptions))
+                .returns(() => Promise.resolve({ canceled: true, filePaths: ['/path/to/adb'] }))
+                .verifiable(Times.once());
+
+            const rendered = shallow(<FolderPicker {...props} />);
+            rendered.find(PrimaryButton).prop('onClick')(stubMouseEvent);
+
+            jest.runAllTimers();
+
+            showOpenFileDialogMock.verifyAll();
+            onChangeMock.verify(m => m(It.isAny()), Times.never());
+        });
+
+        it('does not invoke onChange if showOpenFileDialog returns without any selected folders', () => {
+            showOpenFileDialogMock
+                .setup(m => m(expectedShowOpenFileDialogOptions))
+                .returns(() => Promise.resolve({ canceled: false, filePaths: [] }))
+                .verifiable(Times.once());
+
+            const rendered = shallow(<FolderPicker {...props} />);
+            rendered.find(PrimaryButton).prop('onClick')(stubMouseEvent);
+
+            jest.runAllTimers();
 
-        onChangeMock.verify(m => m('new text'), Times.once());
+            showOpenFileDialogMock.verifyAll();
+            onChangeMock.verify(m => m(It.isAny()), Times.never());
+        });
     });
 });
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-locate-adb-step.test.tsx b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-locate-adb-step.test.tsx
index ad29fd1ded2..105f490ceb1 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-locate-adb-step.test.tsx
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-locate-adb-step.test.tsx
@@ -12,69 +12,81 @@ import { IMock, It, Mock, Times } from 'typemoq';
 
 describe('PromptLocateAdbStep', () => {
     let props: CommonAndroidSetupStepProps;
-    let closeAppMock: IMock<typeof props.deps.closeApp>;
-    let setupActionCreatorMock: IMock<AndroidSetupActionCreator>;
-    const stubClickEvent = {} as React.MouseEvent<HTMLButtonElement>;
-
-    beforeEach(() => {
-        closeAppMock = Mock.ofInstance(() => {});
-        setupActionCreatorMock = Mock.ofType<AndroidSetupActionCreator>();
-        props = new AndroidSetupStepPropsBuilder('prompt-locate-adb')
-            .withDep('closeApp', closeAppMock.object)
-            .withDep('androidSetupActionCreator', setupActionCreatorMock.object)
-            .build();
-    });
 
-    it('renders per snapshot with adbLocation not set', () => {
-        props.userConfigurationStoreData.adbLocation = null;
-        const rendered = shallow(<PromptLocateAdbStep {...props} />);
-        expect(rendered.getElement()).toMatchSnapshot();
-    });
+    describe('rendering', () => {
+        beforeEach(() => {
+            props = new AndroidSetupStepPropsBuilder('prompt-locate-adb').build();
+        });
 
-    it('renders per snapshot with adbLocation set', () => {
-        props.userConfigurationStoreData.adbLocation = '/some/path/to/android/home';
-        const rendered = shallow(<PromptLocateAdbStep {...props} />);
-        expect(rendered.getElement()).toMatchSnapshot();
-    });
+        it('renders per snapshot with adbLocation not set', () => {
+            props.userConfigurationStoreData.adbLocation = null;
+            const rendered = shallow(<PromptLocateAdbStep {...props} />);
+            expect(rendered.getElement()).toMatchSnapshot();
+        });
 
-    it('invokes closeApp when left footer button is clicked', () => {
-        const rendered = shallow(<PromptLocateAdbStep {...props} />);
-        rendered.find(AndroidSetupStepLayout).prop('leftFooterButtonProps').onClick(stubClickEvent);
-        closeAppMock.verify(m => m(), Times.once());
+        it('renders per snapshot with adbLocation set', () => {
+            props.userConfigurationStoreData.adbLocation = '/some/path/to/android/home';
+            const rendered = shallow(<PromptLocateAdbStep {...props} />);
+            expect(rendered.getElement()).toMatchSnapshot();
+        });
     });
 
-    it('does not invoke saveAdbPath for FolderPicker onChange with no next button click', () => {
-        const newValue = '/new/path';
-        const rendered = shallow(<PromptLocateAdbStep {...props} />);
+    describe('handlers', () => {
+        let closeAppMock: IMock<typeof props.deps.closeApp>;
+        let setupActionCreatorMock: IMock<AndroidSetupActionCreator>;
+        const stubClickEvent = {} as React.MouseEvent<HTMLButtonElement>;
 
-        rendered.find(FolderPicker).prop('onChange')(newValue);
+        beforeEach(() => {
+            closeAppMock = Mock.ofInstance(() => {});
+            setupActionCreatorMock = Mock.ofType<AndroidSetupActionCreator>();
+            props = new AndroidSetupStepPropsBuilder('prompt-locate-adb')
+                .withDep('closeApp', closeAppMock.object)
+                .withDep('androidSetupActionCreator', setupActionCreatorMock.object)
+                .build();
+        });
 
-        setupActionCreatorMock.verify(m => m.saveAdbPath(It.isAny()), Times.never());
-    });
+        it('invokes closeApp when left footer button is clicked', () => {
+            const rendered = shallow(<PromptLocateAdbStep {...props} />);
+            rendered
+                .find(AndroidSetupStepLayout)
+                .prop('leftFooterButtonProps')
+                .onClick(stubClickEvent);
+            closeAppMock.verify(m => m(), Times.once());
+        });
 
-    it('invokes saveAdbPath on next click, defaulting to value from saved adbLocation', () => {
-        props.userConfigurationStoreData.adbLocation = '/old/path';
-        const rendered = shallow(<PromptLocateAdbStep {...props} />);
+        it('does not invoke saveAdbPath for FolderPicker onChange with no next button click', () => {
+            const newValue = '/new/path';
+            const rendered = shallow(<PromptLocateAdbStep {...props} />);
 
-        rendered
-            .find(AndroidSetupStepLayout)
-            .prop('rightFooterButtonProps')
-            .onClick(stubClickEvent);
+            rendered.find(FolderPicker).prop('onChange')(newValue);
 
-        setupActionCreatorMock.verify(m => m.saveAdbPath('/old/path'), Times.once());
-    });
+            setupActionCreatorMock.verify(m => m.saveAdbPath(It.isAny()), Times.never());
+        });
+
+        it('invokes saveAdbPath on next click, defaulting to value from saved adbLocation', () => {
+            props.userConfigurationStoreData.adbLocation = '/old/path';
+            const rendered = shallow(<PromptLocateAdbStep {...props} />);
+
+            rendered
+                .find(AndroidSetupStepLayout)
+                .prop('rightFooterButtonProps')
+                .onClick(stubClickEvent);
+
+            setupActionCreatorMock.verify(m => m.saveAdbPath('/old/path'), Times.once());
+        });
 
-    it('invokes saveAdbPath on next click using the most recent onChange value from the FolderPicker', () => {
-        const rendered = shallow(<PromptLocateAdbStep {...props} />);
+        it('invokes saveAdbPath on next click using the most recent onChange value from the FolderPicker', () => {
+            const rendered = shallow(<PromptLocateAdbStep {...props} />);
 
-        rendered.find(FolderPicker).prop('onChange')('/first/new/path');
-        rendered.find(FolderPicker).prop('onChange')('/second/new/path');
+            rendered.find(FolderPicker).prop('onChange')('/first/new/path');
+            rendered.find(FolderPicker).prop('onChange')('/second/new/path');
 
-        rendered
-            .find(AndroidSetupStepLayout)
-            .prop('rightFooterButtonProps')
-            .onClick(stubClickEvent);
+            rendered
+                .find(AndroidSetupStepLayout)
+                .prop('rightFooterButtonProps')
+                .onClick(stubClickEvent);
 
-        setupActionCreatorMock.verify(m => m.saveAdbPath('/second/new/path'), Times.once());
+            setupActionCreatorMock.verify(m => m.saveAdbPath('/second/new/path'), Times.once());
+        });
     });
 });

From e55993a4d1969af882b2bf49184d84ddbdd67ec3 Mon Sep 17 00:00:00 2001
From: Karan <karansin@microsoft.com>
Date: Mon, 15 Jun 2020 16:55:09 -0700
Subject: [PATCH 19/71]  feat(android-setup): add actions to
 prompt-grant-permissions-step (#2880)

---
 .../prompt-grant-permissions-step.tsx         | 19 +++++++------------
 ...rompt-grant-permissions-step.test.tsx.snap |  2 ++
 .../prompt-grant-permissions-step.test.tsx    | 19 +++++++++++++++++--
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/electron/views/device-connect-view/components/android-setup/prompt-grant-permissions-step.tsx b/src/electron/views/device-connect-view/components/android-setup/prompt-grant-permissions-step.tsx
index c2e53fe59bb..9c609bf9df1 100644
--- a/src/electron/views/device-connect-view/components/android-setup/prompt-grant-permissions-step.tsx
+++ b/src/electron/views/device-connect-view/components/android-setup/prompt-grant-permissions-step.tsx
@@ -11,21 +11,12 @@ import { AndroidSetupStepLayout, AndroidSetupStepLayoutProps } from './android-s
 import { CommonAndroidSetupStepProps } from './android-setup-types';
 import * as styles from './prompt-grant-permissions-step.scss';
 
+export const tryAgainAutomationId = 'try-again';
 export const PromptGrantPermissionsStep = NamedFC<CommonAndroidSetupStepProps>(
     'PromptGrantPermissionsStep',
     (props: CommonAndroidSetupStepProps) => {
         const { LinkComponent } = props.deps;
 
-        const onCancelButton = () => {
-            // To be implemented in future feature work
-            console.log(`androidSetupActionCreator.cancel()`);
-        };
-
-        const onTryAgain = () => {
-            // To be implemented in future feature work
-            console.log(`androidSetupActionCreator.checkPermissions()`);
-        };
-
         const layoutProps: AndroidSetupStepLayoutProps = {
             headerText: 'Grant permissions on your device',
             moreInfoLink: (
@@ -35,7 +26,7 @@ export const PromptGrantPermissionsStep = NamedFC<CommonAndroidSetupStepProps>(
             ),
             leftFooterButtonProps: {
                 text: 'Cancel',
-                onClick: onCancelButton,
+                onClick: _ => props.deps.androidSetupActionCreator.cancel(),
             },
             rightFooterButtonProps: {
                 text: 'Next',
@@ -56,7 +47,11 @@ export const PromptGrantPermissionsStep = NamedFC<CommonAndroidSetupStepProps>(
                     on and has permission to access your device and capture screenshots.
                 </>
                 <DeviceDescription {...descriptionProps}></DeviceDescription>
-                <PrimaryButton text="Try again" onClick={onTryAgain} />
+                <PrimaryButton
+                    text="Try again"
+                    data-automation-id={tryAgainAutomationId}
+                    onClick={props.deps.androidSetupActionCreator.next}
+                />
             </AndroidSetupStepLayout>
         );
     },
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-grant-permissions-step.test.tsx.snap b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-grant-permissions-step.test.tsx.snap
index 597ed67bf8b..f2d3a8a30d1 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-grant-permissions-step.test.tsx.snap
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-grant-permissions-step.test.tsx.snap
@@ -34,6 +34,7 @@ exports[`PromptGrantPermissionsStep renders with device 1`] = `
     isEmulator={false}
   />
   <CustomizedPrimaryButton
+    data-automation-id="try-again"
     onClick={[Function]}
     text="Try again"
   />
@@ -74,6 +75,7 @@ exports[`PromptGrantPermissionsStep renders with emulator 1`] = `
     isEmulator={true}
   />
   <CustomizedPrimaryButton
+    data-automation-id="try-again"
     onClick={[Function]}
     text="Try again"
   />
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-grant-permissions-step.test.tsx b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-grant-permissions-step.test.tsx
index d82823a5f7e..cef21109969 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-grant-permissions-step.test.tsx
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-grant-permissions-step.test.tsx
@@ -1,17 +1,26 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
+import { AndroidSetupActionCreator } from 'electron/flux/action-creator/android-setup-action-creator';
 import { DeviceInfo } from 'electron/platform/android/android-service-configurator';
 import { CommonAndroidSetupStepProps } from 'electron/views/device-connect-view/components/android-setup/android-setup-types';
-import { PromptGrantPermissionsStep } from 'electron/views/device-connect-view/components/android-setup/prompt-grant-permissions-step';
+import {
+    PromptGrantPermissionsStep,
+    tryAgainAutomationId,
+} from 'electron/views/device-connect-view/components/android-setup/prompt-grant-permissions-step';
 import { shallow } from 'enzyme';
 import * as React from 'react';
 import { AndroidSetupStepPropsBuilder } from 'tests/unit/common/android-setup-step-props-builder';
+import { IMock, Mock, Times } from 'typemoq';
 
 describe('PromptGrantPermissionsStep', () => {
     let props: CommonAndroidSetupStepProps;
+    let androidSetupActionCreatorMock: IMock<AndroidSetupActionCreator>;
 
     beforeEach(() => {
-        props = new AndroidSetupStepPropsBuilder('prompt-grant-permissions').build();
+        androidSetupActionCreatorMock = Mock.ofType(AndroidSetupActionCreator);
+        props = new AndroidSetupStepPropsBuilder('prompt-grant-permissions')
+            .withDep('androidSetupActionCreator', androidSetupActionCreatorMock.object)
+            .build();
     });
 
     it('renders with device', () => {
@@ -39,4 +48,10 @@ describe('PromptGrantPermissionsStep', () => {
         const rendered = shallow(<PromptGrantPermissionsStep {...props} />);
         expect(rendered.getElement()).toMatchSnapshot();
     });
+
+    it('calls next action when try again button is selected', () => {
+        const rendered = shallow(<PromptGrantPermissionsStep {...props} />);
+        rendered.find({ 'data-automation-id': tryAgainAutomationId }).simulate('click');
+        androidSetupActionCreatorMock.verify(m => m.next(), Times.once());
+    });
 });

From 25f6d801452b58a8bb109a83fc44699b1ca6534e Mon Sep 17 00:00:00 2001
From: Karan <karansin@microsoft.com>
Date: Mon, 15 Jun 2020 16:55:35 -0700
Subject: [PATCH 20/71] feat(android-setup): add actions to
 prompt-install-failed-step (#2881)

---
 .../prompt-install-failed-step.tsx            | 19 +++++++-----------
 .../prompt-install-failed-step.test.tsx.snap  |  2 ++
 .../prompt-install-failed-step.test.tsx       | 20 +++++++++++++++++--
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/electron/views/device-connect-view/components/android-setup/prompt-install-failed-step.tsx b/src/electron/views/device-connect-view/components/android-setup/prompt-install-failed-step.tsx
index 2279c3222c9..4ef92868b0c 100644
--- a/src/electron/views/device-connect-view/components/android-setup/prompt-install-failed-step.tsx
+++ b/src/electron/views/device-connect-view/components/android-setup/prompt-install-failed-step.tsx
@@ -11,21 +11,12 @@ import { AndroidSetupStepLayout, AndroidSetupStepLayoutProps } from './android-s
 import { CommonAndroidSetupStepProps } from './android-setup-types';
 import * as styles from './prompt-install-failed-step.scss';
 
+export const tryAgainAutomationId = 'try-again';
 export const PromptInstallFailedStep = NamedFC<CommonAndroidSetupStepProps>(
     'PromptInstallFailedStep',
     (props: CommonAndroidSetupStepProps) => {
         const { LinkComponent } = props.deps;
 
-        const onCancelButton = () => {
-            // To be implemented in future feature work
-            console.log(`androidSetupActionCreator.cancel()`);
-        };
-
-        const onTryAgain = () => {
-            // To be implemented in future feature work
-            console.log(`androidSetupActionCreator.installService()`);
-        };
-
         const layoutProps: AndroidSetupStepLayoutProps = {
             headerText: 'Installation attempt failed',
             moreInfoLink: (
@@ -35,7 +26,7 @@ export const PromptInstallFailedStep = NamedFC<CommonAndroidSetupStepProps>(
             ),
             leftFooterButtonProps: {
                 text: 'Cancel',
-                onClick: onCancelButton,
+                onClick: _ => props.deps.androidSetupActionCreator.cancel(),
             },
             rightFooterButtonProps: {
                 text: 'Next',
@@ -57,7 +48,11 @@ export const PromptInstallFailedStep = NamedFC<CommonAndroidSetupStepProps>(
                     from your device, or choose one of the options below.
                 </>
                 <DeviceDescription {...descriptionProps}></DeviceDescription>
-                <PrimaryButton text="Try again" onClick={onTryAgain} />
+                <PrimaryButton
+                    data-automation-id={tryAgainAutomationId}
+                    text="Try again"
+                    onClick={props.deps.androidSetupActionCreator.next}
+                />
             </AndroidSetupStepLayout>
         );
     },
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-install-failed-step.test.tsx.snap b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-install-failed-step.test.tsx.snap
index f08a09806a6..7a7dee678fa 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-install-failed-step.test.tsx.snap
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-install-failed-step.test.tsx.snap
@@ -34,6 +34,7 @@ exports[`PromptInstallFailedStep renders with device 1`] = `
     isEmulator={false}
   />
   <CustomizedPrimaryButton
+    data-automation-id="try-again"
     onClick={[Function]}
     text="Try again"
   />
@@ -74,6 +75,7 @@ exports[`PromptInstallFailedStep renders with emulator 1`] = `
     isEmulator={true}
   />
   <CustomizedPrimaryButton
+    data-automation-id="try-again"
     onClick={[Function]}
     text="Try again"
   />
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-install-failed-step.test.tsx b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-install-failed-step.test.tsx
index 8093f4dec42..00ad5f3ba03 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-install-failed-step.test.tsx
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-install-failed-step.test.tsx
@@ -1,17 +1,26 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
+import { AndroidSetupActionCreator } from 'electron/flux/action-creator/android-setup-action-creator';
 import { DeviceInfo } from 'electron/platform/android/android-service-configurator';
 import { CommonAndroidSetupStepProps } from 'electron/views/device-connect-view/components/android-setup/android-setup-types';
-import { PromptInstallFailedStep } from 'electron/views/device-connect-view/components/android-setup/prompt-install-failed-step';
+import {
+    PromptInstallFailedStep,
+    tryAgainAutomationId,
+} from 'electron/views/device-connect-view/components/android-setup/prompt-install-failed-step';
 import { shallow } from 'enzyme';
 import * as React from 'react';
 import { AndroidSetupStepPropsBuilder } from 'tests/unit/common/android-setup-step-props-builder';
+import { IMock, Mock, Times } from 'typemoq';
 
 describe('PromptInstallFailedStep', () => {
     let props: CommonAndroidSetupStepProps;
+    let androidSetupActionCreatorMock: IMock<AndroidSetupActionCreator>;
 
     beforeEach(() => {
-        props = new AndroidSetupStepPropsBuilder('prompt-install-failed').build();
+        androidSetupActionCreatorMock = Mock.ofType(AndroidSetupActionCreator);
+        props = new AndroidSetupStepPropsBuilder('prompt-install-failed')
+            .withDep('androidSetupActionCreator', androidSetupActionCreatorMock.object)
+            .build();
     });
 
     it('renders with device', () => {
@@ -39,4 +48,11 @@ describe('PromptInstallFailedStep', () => {
         const rendered = shallow(<PromptInstallFailedStep {...props} />);
         expect(rendered.getElement()).toMatchSnapshot();
     });
+
+    it('routes try again button to next action', () => {
+        const rendered = shallow(<PromptInstallFailedStep {...props} />);
+        const button = rendered.find({ 'data-automation-id': tryAgainAutomationId });
+        button.simulate('click');
+        androidSetupActionCreatorMock.verify(m => m.next(), Times.once());
+    });
 });

From 62b8b017f18cde5ba65ea4fd0c536990ee566f2d Mon Sep 17 00:00:00 2001
From: Karan <karansin@microsoft.com>
Date: Mon, 15 Jun 2020 16:55:53 -0700
Subject: [PATCH 21/71] feat(android-setup): add actions to install-service
 step (#2882)

---
 .../prompt-install-service-step.tsx           | 19 +++++--------
 .../prompt-install-service-step.test.tsx.snap |  2 ++
 .../prompt-install-service-step.test.tsx      | 27 +++++++++++++++++--
 3 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/src/electron/views/device-connect-view/components/android-setup/prompt-install-service-step.tsx b/src/electron/views/device-connect-view/components/android-setup/prompt-install-service-step.tsx
index 5f1e2132041..c4fc81836a8 100644
--- a/src/electron/views/device-connect-view/components/android-setup/prompt-install-service-step.tsx
+++ b/src/electron/views/device-connect-view/components/android-setup/prompt-install-service-step.tsx
@@ -11,24 +11,15 @@ import { AndroidSetupStepLayout, AndroidSetupStepLayoutProps } from './android-s
 import { CommonAndroidSetupStepProps } from './android-setup-types';
 import * as styles from './prompt-install-service-step.scss';
 
+export const installAutomationId = 'install';
 export const PromptInstallServiceStep = NamedFC<CommonAndroidSetupStepProps>(
     'PromptInstallServiceStep',
     (props: CommonAndroidSetupStepProps) => {
-        const onCancelButton = () => {
-            // To be implemented in future feature work
-            console.log(`androidSetupActionCreator.cancel()`);
-        };
-
-        const onInstallButton = () => {
-            // To be implemented in future feature work
-            console.log(`androidSetupActionCreator.installService()`);
-        };
-
         const layoutProps: AndroidSetupStepLayoutProps = {
             headerText: 'Let us install the latest version on your device',
             leftFooterButtonProps: {
                 text: 'Cancel',
-                onClick: onCancelButton,
+                onClick: _ => props.deps.androidSetupActionCreator.cancel(),
             },
             rightFooterButtonProps: {
                 text: 'Next',
@@ -49,7 +40,11 @@ export const PromptInstallServiceStep = NamedFC<CommonAndroidSetupStepProps>(
                     either missing or out of date. We'll need to install the latest version.
                 </>
                 <DeviceDescription {...descriptionProps}></DeviceDescription>
-                <PrimaryButton text="Install" onClick={onInstallButton} />
+                <PrimaryButton
+                    text="Install"
+                    data-automation-id={installAutomationId}
+                    onClick={props.deps.androidSetupActionCreator.next}
+                />
             </AndroidSetupStepLayout>
         );
     },
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-install-service-step.test.tsx.snap b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-install-service-step.test.tsx.snap
index e9af1364dff..c9d1497bc4c 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-install-service-step.test.tsx.snap
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-install-service-step.test.tsx.snap
@@ -27,6 +27,7 @@ exports[`PromptInstallServiceStep renders with device 1`] = `
     isEmulator={false}
   />
   <CustomizedPrimaryButton
+    data-automation-id="install"
     onClick={[Function]}
     text="Install"
   />
@@ -60,6 +61,7 @@ exports[`PromptInstallServiceStep renders with emulator 1`] = `
     isEmulator={true}
   />
   <CustomizedPrimaryButton
+    data-automation-id="install"
     onClick={[Function]}
     text="Install"
   />
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-install-service-step.test.tsx b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-install-service-step.test.tsx
index 311404f42d3..fc381b1f956 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-install-service-step.test.tsx
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-install-service-step.test.tsx
@@ -1,17 +1,27 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
+import { AndroidSetupActionCreator } from 'electron/flux/action-creator/android-setup-action-creator';
 import { DeviceInfo } from 'electron/platform/android/android-service-configurator';
+import { AndroidSetupStepLayout } from 'electron/views/device-connect-view/components/android-setup/android-setup-step-layout';
 import { CommonAndroidSetupStepProps } from 'electron/views/device-connect-view/components/android-setup/android-setup-types';
-import { PromptInstallServiceStep } from 'electron/views/device-connect-view/components/android-setup/prompt-install-service-step';
+import {
+    installAutomationId,
+    PromptInstallServiceStep,
+} from 'electron/views/device-connect-view/components/android-setup/prompt-install-service-step';
 import { shallow } from 'enzyme';
 import * as React from 'react';
 import { AndroidSetupStepPropsBuilder } from 'tests/unit/common/android-setup-step-props-builder';
+import { IMock, Mock, Times } from 'typemoq';
 
 describe('PromptInstallServiceStep', () => {
     let props: CommonAndroidSetupStepProps;
+    let androidSetupActionCreatorMock: IMock<AndroidSetupActionCreator>;
 
     beforeEach(() => {
-        props = new AndroidSetupStepPropsBuilder('prompt-install-service').build();
+        androidSetupActionCreatorMock = Mock.ofType(AndroidSetupActionCreator);
+        props = new AndroidSetupStepPropsBuilder('prompt-install-service')
+            .withDep('androidSetupActionCreator', androidSetupActionCreatorMock.object)
+            .build();
     });
 
     it('renders with device', () => {
@@ -39,4 +49,17 @@ describe('PromptInstallServiceStep', () => {
         const rendered = shallow(<PromptInstallServiceStep {...props} />);
         expect(rendered.getElement()).toMatchSnapshot();
     });
+
+    it('calls cancel action when cancel button selected', () => {
+        const rendered = shallow(<PromptInstallServiceStep {...props} />);
+        const stubEvent = {} as React.MouseEvent<HTMLButtonElement>;
+        rendered.find(AndroidSetupStepLayout).prop('leftFooterButtonProps').onClick(stubEvent);
+        androidSetupActionCreatorMock.verify(m => m.cancel(), Times.once());
+    });
+
+    it('handles the install button with the next action', () => {
+        const rendered = shallow(<PromptInstallServiceStep {...props} />);
+        rendered.find({ 'data-automation-id': installAutomationId }).simulate('click');
+        androidSetupActionCreatorMock.verify(m => m.next(), Times.once());
+    });
 });

From b46ca62cf93eb1ddfa6a2eb97cb327127e8514a7 Mon Sep 17 00:00:00 2001
From: Rob Gallo <43080011+RobGallo@users.noreply.github.com>
Date: Tue, 16 Jun 2020 12:34:55 -0400
Subject: [PATCH 22/71] feat(android-setup): Add prompt-choose-device state
 machine step (#2890)

- Add functions to set the current device and available devices in the Android setup store
- Modify setSelectionDevice action to take a DeviceInfo structure
- Update detect-devices step to set available devices in store
---
 .../android-setup-action-creator.ts           |  5 +-
 .../flux/action/android-setup-actions.ts      |  3 +-
 .../flux/store/android-setup-store.ts         | 13 ++++
 .../android-setup-state-machine-types.ts      |  3 +
 .../flux/types/android-setup-store-data.ts    |  2 +
 .../android/setup/steps/detect-devices.ts     |  5 ++
 .../setup/steps/prompt-choose-device.ts       | 18 +++++
 .../android-setup-action-creator.test.ts      | 13 +++-
 .../flux/store/android-setup-store.test.ts    | 78 ++++++++++++++++++-
 .../setup/steps/detect-devices.test.ts        | 10 ++-
 .../setup/steps/prompt-choose-device.test.ts  | 45 +++++++++++
 .../prompt-connected-start-testing.test.ts    |  2 +-
 12 files changed, 188 insertions(+), 9 deletions(-)
 create mode 100644 src/electron/platform/android/setup/steps/prompt-choose-device.ts
 create mode 100644 src/tests/unit/tests/electron/platform/android/setup/steps/prompt-choose-device.test.ts

diff --git a/src/electron/flux/action-creator/android-setup-action-creator.ts b/src/electron/flux/action-creator/android-setup-action-creator.ts
index 364a9e734e0..0b6d2b54d21 100644
--- a/src/electron/flux/action-creator/android-setup-action-creator.ts
+++ b/src/electron/flux/action-creator/android-setup-action-creator.ts
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 import { AndroidSetupActions } from 'electron/flux/action/android-setup-actions';
+import { DeviceInfo } from 'electron/platform/android/android-service-configurator';
 
 export class AndroidSetupActionCreator {
     constructor(private readonly setupActions: AndroidSetupActions) {}
@@ -9,6 +10,6 @@ export class AndroidSetupActionCreator {
     public next = () => this.setupActions.next.invoke();
     public rescan = () => this.setupActions.rescan.invoke();
     public saveAdbPath = (newAdbPath: string) => this.setupActions.saveAdbPath.invoke(newAdbPath);
-    public setSelectedDevice = (selectedDeviceId: string) =>
-        this.setupActions.setSelectedDevice.invoke(selectedDeviceId);
+    public setSelectedDevice = (device: DeviceInfo) =>
+        this.setupActions.setSelectedDevice.invoke(device);
 }
diff --git a/src/electron/flux/action/android-setup-actions.ts b/src/electron/flux/action/android-setup-actions.ts
index 46eb58a5907..97500f98477 100644
--- a/src/electron/flux/action/android-setup-actions.ts
+++ b/src/electron/flux/action/android-setup-actions.ts
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 import { Action } from 'common/flux/action';
+import { DeviceInfo } from 'electron/platform/android/android-service-configurator';
 
 // This class needs only to represent possible simultaneously invokable actions
 // So, for example, the 'next' action may represent 'continue', 'str again', or 'start scanning'
@@ -9,5 +10,5 @@ export class AndroidSetupActions {
     public readonly next = new Action<void>();
     public readonly rescan = new Action<void>();
     public readonly saveAdbPath = new Action<string>();
-    public readonly setSelectedDevice = new Action<string>();
+    public readonly setSelectedDevice = new Action<DeviceInfo>();
 }
diff --git a/src/electron/flux/store/android-setup-store.ts b/src/electron/flux/store/android-setup-store.ts
index 03028645cd0..61041931ecf 100644
--- a/src/electron/flux/store/android-setup-store.ts
+++ b/src/electron/flux/store/android-setup-store.ts
@@ -6,6 +6,7 @@ import { AndroidSetupStepId } from 'electron/platform/android/setup/android-setu
 import { AndroidSetupActions } from '../action/android-setup-actions';
 import { AndroidSetupStoreData } from '../types/android-setup-store-data';
 
+import { DeviceInfo } from 'electron/platform/android/android-service-configurator';
 import {
     AndroidSetupStateMachine,
     AndroidSetupStateMachineFactory,
@@ -25,6 +26,8 @@ export class AndroidSetupStore extends BaseStoreImpl<AndroidSetupStoreData> {
         super.initialize(initialState);
         this.stateMachine = this.createAndroidSetupStateMachine({
             stepTransition: this.stepTransition,
+            setSelectedDevice: this.setSelectedDevice,
+            setAvailableDevices: this.setAvailableDevices,
         });
     }
 
@@ -54,4 +57,14 @@ export class AndroidSetupStore extends BaseStoreImpl<AndroidSetupStoreData> {
         this.state.currentStepId = nextStep;
         this.emitChanged();
     };
+
+    private setSelectedDevice = (device: DeviceInfo): void => {
+        // emitChange will be called from step transition when the step changes
+        this.state.selectedDevice = device;
+    };
+
+    private setAvailableDevices = (devices: DeviceInfo[]): void => {
+        // emitChange will be called from step transition when the step changes
+        this.state.availableDevices = devices;
+    };
 }
diff --git a/src/electron/flux/types/android-setup-state-machine-types.ts b/src/electron/flux/types/android-setup-state-machine-types.ts
index 46396111635..a51735f4cf0 100644
--- a/src/electron/flux/types/android-setup-state-machine-types.ts
+++ b/src/electron/flux/types/android-setup-state-machine-types.ts
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+import { DeviceInfo } from 'electron/platform/android/android-service-configurator';
 import { AndroidSetupStepId } from 'electron/platform/android/setup/android-setup-step-id';
 import { StateMachine } from 'electron/platform/android/setup/state-machine/state-machine';
 import { AndroidSetupActions } from '../action/android-setup-actions';
@@ -11,6 +12,8 @@ export type AndroidSetupStepTransitionCallback = (nextStep: AndroidSetupStepId)
 
 export type AndroidSetupStoreCallbacks = {
     stepTransition: AndroidSetupStepTransitionCallback;
+    setSelectedDevice: (device: DeviceInfo) => void;
+    setAvailableDevices: (devices: DeviceInfo[]) => void;
 };
 
 export type AndroidSetupStateMachineFactory = (
diff --git a/src/electron/flux/types/android-setup-store-data.ts b/src/electron/flux/types/android-setup-store-data.ts
index fb9efe02a11..a2e5b15f552 100644
--- a/src/electron/flux/types/android-setup-store-data.ts
+++ b/src/electron/flux/types/android-setup-store-data.ts
@@ -8,4 +8,6 @@ export type AndroidSetupStoreData = {
 
     // undefined if no device exists or if no device has been selected
     selectedDevice?: DeviceInfo;
+
+    availableDevices?: DeviceInfo[];
 };
diff --git a/src/electron/platform/android/setup/steps/detect-devices.ts b/src/electron/platform/android/setup/steps/detect-devices.ts
index 309532fd41b..0cee5a9e977 100644
--- a/src/electron/platform/android/setup/steps/detect-devices.ts
+++ b/src/electron/platform/android/setup/steps/detect-devices.ts
@@ -11,6 +11,9 @@ export const detectDevices: AndroidSetupStepConfig = deps => {
             },
         },
         onEnter: async () => {
+            deps.setSelectedDevice(null);
+            deps.setAvailableDevices([]);
+
             const devices = await deps.getDevices();
 
             switch (devices.length) {
@@ -20,10 +23,12 @@ export const detectDevices: AndroidSetupStepConfig = deps => {
                 }
                 case 1: {
                     deps.setSelectedDeviceId(devices[0].id);
+                    deps.setSelectedDevice(devices[0]);
                     deps.stepTransition('detect-service');
                     break;
                 }
                 default: {
+                    deps.setAvailableDevices(devices);
                     deps.stepTransition('prompt-choose-device');
                     break;
                 }
diff --git a/src/electron/platform/android/setup/steps/prompt-choose-device.ts b/src/electron/platform/android/setup/steps/prompt-choose-device.ts
new file mode 100644
index 00000000000..f769ae7da33
--- /dev/null
+++ b/src/electron/platform/android/setup/steps/prompt-choose-device.ts
@@ -0,0 +1,18 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import { DeviceInfo } from 'electron/platform/android/android-service-configurator';
+import { AndroidSetupStepConfig } from 'electron/platform/android/setup/android-setup-steps-configs';
+
+export const promptChooseDevice: AndroidSetupStepConfig = deps => {
+    return {
+        actions: {
+            rescan: () => deps.stepTransition('detect-devices'),
+            setSelectedDevice: (device: DeviceInfo) => {
+                deps.setSelectedDeviceId(device.id);
+                deps.setSelectedDevice(device);
+                deps.stepTransition('detect-service');
+            },
+        },
+    };
+};
diff --git a/src/tests/unit/tests/electron/flux/action-creator/android-setup-action-creator.test.ts b/src/tests/unit/tests/electron/flux/action-creator/android-setup-action-creator.test.ts
index e2bc69cbdbf..107d4dad23b 100644
--- a/src/tests/unit/tests/electron/flux/action-creator/android-setup-action-creator.test.ts
+++ b/src/tests/unit/tests/electron/flux/action-creator/android-setup-action-creator.test.ts
@@ -3,6 +3,7 @@
 import { Action } from 'common/flux/action';
 import { AndroidSetupActionCreator } from 'electron/flux/action-creator/android-setup-action-creator';
 import { AndroidSetupActions } from 'electron/flux/action/android-setup-actions';
+import { DeviceInfo } from 'electron/platform/android/android-service-configurator';
 import { IMock, Mock, Times } from 'typemoq';
 
 describe(AndroidSetupActionCreator, () => {
@@ -42,13 +43,19 @@ describe(AndroidSetupActionCreator, () => {
     });
 
     it('invokes setSelectedDevice action on setSelectedDevice', () => {
-        const actionMock = Mock.ofType<Action<string>>();
+        const testDevice: DeviceInfo = {
+            id: 'Robbie',
+            friendlyName: 'Robbie the robot',
+            isEmulator: true,
+        };
+
+        const actionMock = Mock.ofType<Action<DeviceInfo>>();
         androidSetupActionsMock
             .setup(actions => actions.setSelectedDevice)
             .returns(() => actionMock.object);
-        actionMock.setup(s => s.invoke('new-device-id')).verifiable(Times.once());
+        actionMock.setup(s => s.invoke(testDevice)).verifiable(Times.once());
 
-        testSubject.setSelectedDevice('new-device-id');
+        testSubject.setSelectedDevice(testDevice);
         actionMock.verifyAll();
     });
 
diff --git a/src/tests/unit/tests/electron/flux/store/android-setup-store.test.ts b/src/tests/unit/tests/electron/flux/store/android-setup-store.test.ts
index aa5eabea92b..774fbbcebdc 100644
--- a/src/tests/unit/tests/electron/flux/store/android-setup-store.test.ts
+++ b/src/tests/unit/tests/electron/flux/store/android-setup-store.test.ts
@@ -8,6 +8,7 @@ import {
     AndroidSetupStoreCallbacks,
 } from 'electron/flux/types/android-setup-state-machine-types';
 import { AndroidSetupStoreData } from 'electron/flux/types/android-setup-store-data';
+import { DeviceInfo } from 'electron/platform/android/android-service-configurator';
 import { createStoreWithNullParams, StoreTester } from 'tests/unit/common/store-tester';
 import { It, Mock, Times } from 'typemoq';
 
@@ -51,7 +52,7 @@ describe('AndroidSetupStore', () => {
         setupActions.next.invoke();
         setupActions.rescan.invoke();
         setupActions.saveAdbPath.invoke('');
-        setupActions.setSelectedDevice.invoke('');
+        setupActions.setSelectedDevice.invoke({} as DeviceInfo);
 
         stateMachineFactoryMock.verifyAll();
         stateMachineMock.verifyAll();
@@ -108,6 +109,81 @@ describe('AndroidSetupStore', () => {
         stateMachineMock.verifyAll();
     });
 
+    it('ensure setSelectedDevice function results in store update', () => {
+        const testDevice: DeviceInfo = {
+            id: 'r2d2',
+            friendlyName: 'little buddy',
+            isEmulator: true,
+        };
+
+        const initialData: AndroidSetupStoreData = { currentStepId: 'detect-adb' };
+        const expectedData: AndroidSetupStoreData = {
+            currentStepId: 'detect-adb',
+            selectedDevice: testDevice,
+        };
+
+        let storeCallbacks: AndroidSetupStoreCallbacks;
+
+        const stateMachineFactoryMock = Mock.ofInstance(mockableStateMachineFactory);
+        stateMachineFactoryMock
+            .setup(m => m(It.isAny()))
+            .callback(sc => (storeCallbacks = sc))
+            .verifiable(Times.once());
+
+        const store = new AndroidSetupStore(
+            new AndroidSetupActions(),
+            stateMachineFactoryMock.object,
+        );
+        store.initialize(initialData);
+
+        storeCallbacks.setSelectedDevice(testDevice);
+
+        expect(store.getState()).toEqual(expectedData);
+
+        stateMachineFactoryMock.verifyAll();
+    });
+
+    it('ensure setAvailableDevices function results in store update', () => {
+        const testDevices: DeviceInfo[] = [
+            {
+                id: 'r2d2',
+                friendlyName: 'little buddy',
+                isEmulator: true,
+            },
+            {
+                id: 'c3po',
+                friendlyName: '3po',
+                isEmulator: false,
+            },
+        ];
+
+        const initialData: AndroidSetupStoreData = { currentStepId: 'detect-adb' };
+        const expectedData: AndroidSetupStoreData = {
+            currentStepId: 'detect-adb',
+            availableDevices: testDevices,
+        };
+
+        let storeCallbacks: AndroidSetupStoreCallbacks;
+
+        const stateMachineFactoryMock = Mock.ofInstance(mockableStateMachineFactory);
+        stateMachineFactoryMock
+            .setup(m => m(It.isAny()))
+            .callback(sc => (storeCallbacks = sc))
+            .verifiable(Times.once());
+
+        const store = new AndroidSetupStore(
+            new AndroidSetupActions(),
+            stateMachineFactoryMock.object,
+        );
+        store.initialize(initialData);
+
+        storeCallbacks.setAvailableDevices(testDevices);
+
+        expect(store.getState()).toEqual(expectedData);
+
+        stateMachineFactoryMock.verifyAll();
+    });
+
     const createAndroidSetupStoreTester = (
         actionToInvoke: keyof AndroidSetupActions,
         stateMachineFactory: AndroidSetupStateMachineFactory,
diff --git a/src/tests/unit/tests/electron/platform/android/setup/steps/detect-devices.test.ts b/src/tests/unit/tests/electron/platform/android/setup/steps/detect-devices.test.ts
index 912be8b02ff..b4096fb08db 100644
--- a/src/tests/unit/tests/electron/platform/android/setup/steps/detect-devices.test.ts
+++ b/src/tests/unit/tests/electron/platform/android/setup/steps/detect-devices.test.ts
@@ -35,6 +35,8 @@ describe('Android setup step: detectDevices', () => {
             .returns(_ => p)
             .verifiable(Times.once());
 
+        depsMock.setup(m => m.setSelectedDevice(null)).verifiable(Times.once());
+        depsMock.setup(m => m.setAvailableDevices([])).verifiable(Times.once());
         depsMock.setup(m => m.stepTransition('prompt-connect-to-device')).verifiable(Times.once());
 
         const step = detectDevices(depsMock.object);
@@ -58,8 +60,11 @@ describe('Android setup step: detectDevices', () => {
             .returns(_ => p)
             .verifiable(Times.once());
 
-        depsMock.setup(m => m.stepTransition('detect-service')).verifiable(Times.once());
+        depsMock.setup(m => m.setSelectedDevice(null)).verifiable(Times.once());
+        depsMock.setup(m => m.setAvailableDevices([])).verifiable(Times.once());
         depsMock.setup(m => m.setSelectedDeviceId('device1')).verifiable(Times.once());
+        depsMock.setup(m => m.setSelectedDevice(devices[0])).verifiable(Times.once());
+        depsMock.setup(m => m.stepTransition('detect-service')).verifiable(Times.once());
 
         const step = detectDevices(depsMock.object);
         await step.onEnter();
@@ -85,6 +90,9 @@ describe('Android setup step: detectDevices', () => {
             .returns(_ => p)
             .verifiable(Times.once());
 
+        depsMock.setup(m => m.setSelectedDevice(null)).verifiable(Times.once());
+        depsMock.setup(m => m.setAvailableDevices([])).verifiable(Times.once());
+        depsMock.setup(m => m.setAvailableDevices(devices)).verifiable(Times.once());
         depsMock.setup(m => m.stepTransition('prompt-choose-device')).verifiable(Times.once());
 
         const step = detectDevices(depsMock.object);
diff --git a/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-choose-device.test.ts b/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-choose-device.test.ts
new file mode 100644
index 00000000000..0d2531044fd
--- /dev/null
+++ b/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-choose-device.test.ts
@@ -0,0 +1,45 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import { DeviceInfo } from 'electron/platform/android/android-service-configurator';
+import { AndroidSetupStepConfigDeps } from 'electron/platform/android/setup/android-setup-steps-configs';
+import { promptChooseDevice } from 'electron/platform/android/setup/steps/prompt-choose-device';
+import { Mock, MockBehavior, Times } from 'typemoq';
+import { checkExpectedActionsAreDefined } from './actions-tester';
+
+describe('Android setup step: promptChooseDevice', () => {
+    it('has expected properties', () => {
+        const deps = {} as AndroidSetupStepConfigDeps;
+        const step = promptChooseDevice(deps);
+        checkExpectedActionsAreDefined(step, ['rescan', 'setSelectedDevice']);
+        expect(step.onEnter).not.toBeDefined();
+    });
+
+    it('rescan transitions to detect-adb as expected', () => {
+        const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
+        depsMock.setup(m => m.stepTransition('detect-devices')).verifiable(Times.once());
+
+        const step = promptChooseDevice(depsMock.object);
+        step.actions.rescan();
+
+        depsMock.verifyAll();
+    });
+
+    it('setSelectedDevice transitions to detect-service as expected', () => {
+        const testDevice: DeviceInfo = {
+            id: 'Hal9000',
+            friendlyName: 'Hal',
+            isEmulator: true,
+        };
+
+        const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
+        depsMock.setup(m => m.stepTransition('detect-service')).verifiable(Times.once());
+        depsMock.setup(m => m.setSelectedDeviceId(testDevice.id)).verifiable(Times.once());
+        depsMock.setup(m => m.setSelectedDevice(testDevice)).verifiable(Times.once());
+
+        const step = promptChooseDevice(depsMock.object);
+        step.actions.setSelectedDevice(testDevice);
+
+        depsMock.verifyAll();
+    });
+});
diff --git a/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-connected-start-testing.test.ts b/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-connected-start-testing.test.ts
index 511f5e6a04a..ddd9f9b0398 100644
--- a/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-connected-start-testing.test.ts
+++ b/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-connected-start-testing.test.ts
@@ -14,7 +14,7 @@ describe('Android setup step: promptConnectedStartTesting', () => {
         expect(step.onEnter).not.toBeDefined();
     });
 
-    it('onEnter transitions to detect-adb as expected', () => {
+    it('rescan transitions to detect-adb as expected', () => {
         const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
         depsMock.setup(m => m.stepTransition('detect-adb')).verifiable(Times.once());
 

From 5d9905d52d1f72215438a16b23584c8e042cf456 Mon Sep 17 00:00:00 2001
From: Dave Tryon <45672944+DaveTryon@users.noreply.github.com>
Date: Tue, 16 Jun 2020 14:58:00 -0700
Subject: [PATCH 23/71] feat(android-setup): Connect steps to adb (#2884)

---
 src/background/actions/action-payloads.ts     |   4 +
 ...er-user-configuration-message-callbacks.ts |   4 +
 .../user-configuration-action-creator.ts      |   3 +
 .../user-config-message-creator.ts            |  12 +
 src/common/messages.ts                        |   1 +
 .../appium-service-configurator-factory.ts    |   8 +-
 .../android/appium-service-configurator.ts    |   5 +-
 .../android/setup/live-android-setup-deps.ts  | 128 ++++++
 src/electron/views/renderer-initializer.ts    |  26 +-
 .../user-configuration-action-creator.test.ts |  12 +
 .../user-config-message-creator.test.ts       |  19 +
 ...ppium-service-configurator-factory.test.ts |  21 +-
 .../appium-service-configurator.test.ts       |  86 ++--
 .../steps/live-android-setup-deps.test.ts     | 406 ++++++++++++++++++
 14 files changed, 696 insertions(+), 39 deletions(-)
 create mode 100644 src/electron/platform/android/setup/live-android-setup-deps.ts
 create mode 100644 src/tests/unit/tests/electron/platform/android/setup/steps/live-android-setup-deps.test.ts

diff --git a/src/background/actions/action-payloads.ts b/src/background/actions/action-payloads.ts
index d676fe23e34..8d8c8be44b1 100644
--- a/src/background/actions/action-payloads.ts
+++ b/src/background/actions/action-payloads.ts
@@ -170,6 +170,10 @@ export interface FileIssuePayload extends BaseActionPayload {
     toolData: ToolData;
 }
 
+export interface SetAdbLocationPayload extends BaseActionPayload {
+    adbLocation: string;
+}
+
 export interface UnifiedScanCompletedPayload extends BaseActionPayload {
     scanResult: UnifiedResult[];
     rules: UnifiedRule[];
diff --git a/src/background/global-action-creators/registrar/register-user-configuration-message-callbacks.ts b/src/background/global-action-creators/registrar/register-user-configuration-message-callbacks.ts
index f6c5fbff81d..c4e9eb3ba52 100644
--- a/src/background/global-action-creators/registrar/register-user-configuration-message-callbacks.ts
+++ b/src/background/global-action-creators/registrar/register-user-configuration-message-callbacks.ts
@@ -38,4 +38,8 @@ export const registerUserConfigurationMessageCallback = (
         Messages.UserConfig.SaveIssueFilingSettings,
         userConfigurationActionCreator.saveIssueFilingSettings,
     );
+    interpreter.registerTypeToPayloadCallback(
+        Messages.UserConfig.SetAdbLocationConfig,
+        userConfigurationActionCreator.setAdbLocation,
+    );
 };
diff --git a/src/background/global-action-creators/user-configuration-action-creator.ts b/src/background/global-action-creators/user-configuration-action-creator.ts
index 0f7754fa09e..37b7e730ebb 100644
--- a/src/background/global-action-creators/user-configuration-action-creator.ts
+++ b/src/background/global-action-creators/user-configuration-action-creator.ts
@@ -31,4 +31,7 @@ export class UserConfigurationActionCreator {
 
     public saveIssueFilingSettings = (payload: SaveIssueFilingSettingsPayload) =>
         this.userConfigActions.saveIssueFilingSettings.invoke(payload);
+
+    public setAdbLocation = (adbLocation: string) =>
+        this.userConfigActions.setAdbLocation.invoke(adbLocation);
 }
diff --git a/src/common/message-creators/user-config-message-creator.ts b/src/common/message-creators/user-config-message-creator.ts
index 45355cb400a..4bac7f0e64b 100644
--- a/src/common/message-creators/user-config-message-creator.ts
+++ b/src/common/message-creators/user-config-message-creator.ts
@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 import {
     SaveIssueFilingSettingsPayload,
+    SetAdbLocationPayload,
     SetHighContrastModePayload,
     SetIssueFilingServicePayload,
     SetIssueFilingServicePropertyPayload,
@@ -67,4 +68,15 @@ export class UserConfigMessageCreator {
             payload,
         });
     };
+
+    public setAdbLocation(adbLocation: string): void {
+        const payload: SetAdbLocationPayload = {
+            adbLocation,
+        };
+
+        this.dispatcher.dispatchMessage({
+            messageType: Messages.UserConfig.SetAdbLocationConfig,
+            payload,
+        });
+    }
 }
diff --git a/src/common/messages.ts b/src/common/messages.ts
index ebab4e4dd58..3f3e2ee24ae 100644
--- a/src/common/messages.ts
+++ b/src/common/messages.ts
@@ -99,6 +99,7 @@ export class Messages {
         SetIssueFilingService: `${messagePrefix}/userConfig/setIssueFilingService`,
         SetIssueFilingServiceProperty: `${messagePrefix}/userConfig/setIssueFilingServiceProperty`,
         SaveIssueFilingSettings: `${messagePrefix}/userConfig/saveIssueFilingSettings`,
+        SetAdbLocationConfig: `${messagePrefix}/userConfig/setAdbLocationConfig`,
     };
 
     public static readonly Popup = {
diff --git a/src/electron/platform/android/appium-service-configurator-factory.ts b/src/electron/platform/android/appium-service-configurator-factory.ts
index 8b303e4d3d1..383e9615085 100644
--- a/src/electron/platform/android/appium-service-configurator-factory.ts
+++ b/src/electron/platform/android/appium-service-configurator-factory.ts
@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 import ADB from 'appium-adb';
+import { AndroidServiceApkLocator } from 'electron/platform/android/android-service-apk-locator';
 import {
     AndroidServiceConfigurator,
     AndroidServiceConfiguratorFactory,
@@ -13,7 +14,10 @@ import {
 import { AppiumServiceConfigurator } from 'electron/platform/android/appium-service-configurator';
 
 export class AppiumServiceConfiguratorFactory implements AndroidServiceConfiguratorFactory {
-    public constructor(private readonly adbCreator: AppiumAdbCreator) {}
+    public constructor(
+        private readonly adbCreator: AppiumAdbCreator,
+        private readonly apkLocator: AndroidServiceApkLocator,
+    ) {}
 
     public getServiceConfigurator = async (
         sdkRoot: string,
@@ -26,6 +30,6 @@ export class AppiumServiceConfiguratorFactory implements AndroidServiceConfigura
 
         const adb: ADB = await this.adbCreator.createADB(parameters);
 
-        return new AppiumServiceConfigurator(adb);
+        return new AppiumServiceConfigurator(adb, this.apkLocator);
     };
 }
diff --git a/src/electron/platform/android/appium-service-configurator.ts b/src/electron/platform/android/appium-service-configurator.ts
index 9a324f94a39..29eaf3c107b 100644
--- a/src/electron/platform/android/appium-service-configurator.ts
+++ b/src/electron/platform/android/appium-service-configurator.ts
@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 import ADB from 'appium-adb';
+import { AndroidServiceApkLocator } from 'electron/platform/android/android-service-apk-locator';
 import {
     AndroidServiceConfigurator,
     DeviceInfo,
@@ -19,7 +20,7 @@ const servicePackageName: string = 'com.microsoft.accessibilityinsightsforandroi
 export class AppiumServiceConfigurator implements AndroidServiceConfigurator {
     private readonly portNumber: number = 62442;
 
-    constructor(private readonly adb: ADB) {}
+    constructor(private readonly adb: ADB, private readonly apkLocator: AndroidServiceApkLocator) {}
 
     public getConnectedDevices = async (): Promise<Array<DeviceInfo>> => {
         const detectedDevices: DictionaryStringTo<DeviceInfo> = {};
@@ -72,8 +73,8 @@ export class AppiumServiceConfigurator implements AndroidServiceConfigurator {
     };
 
     public installService = async (deviceId: string): Promise<void> => {
-        const pathToApk = './ServiceForAndroid/AccessibilityInsightsforAndroidService.apk';
         this.adb.setDeviceId(deviceId);
+        const pathToApk = (await this.apkLocator.locateBundledApk()).path;
         await this.adb.install(pathToApk);
     };
 
diff --git a/src/electron/platform/android/setup/live-android-setup-deps.ts b/src/electron/platform/android/setup/live-android-setup-deps.ts
new file mode 100644
index 00000000000..c79e422fd75
--- /dev/null
+++ b/src/electron/platform/android/setup/live-android-setup-deps.ts
@@ -0,0 +1,128 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import { UserConfigurationStore } from 'background/stores/global/user-configuration-store';
+import { Logger } from 'common/logging/logger';
+import { UserConfigMessageCreator } from 'common/message-creators/user-config-message-creator';
+import { AndroidServiceApkLocator } from 'electron/platform/android/android-service-apk-locator';
+import {
+    AndroidServiceConfigurator,
+    AndroidServiceConfiguratorFactory,
+    DeviceInfo,
+    PackageInfo,
+    PermissionInfo,
+} from 'electron/platform/android/android-service-configurator';
+import { AndroidSetupDeps } from 'electron/platform/android/setup/android-setup-deps';
+
+export class LiveAndroidSetupDeps implements AndroidSetupDeps {
+    private serviceConfig: AndroidServiceConfigurator;
+    private selectedDeviceId: string;
+
+    constructor(
+        private readonly configFactory: AndroidServiceConfiguratorFactory,
+        private readonly configStore: UserConfigurationStore,
+        private readonly apkLocator: AndroidServiceApkLocator,
+        private readonly userConfigMessageCreator: UserConfigMessageCreator,
+        private readonly logger: Logger,
+    ) {}
+
+    public hasAdbPath = async (): Promise<boolean> => {
+        try {
+            const adbLocation = this.configStore.getState().adbLocation;
+            this.serviceConfig = await this.configFactory.getServiceConfigurator(adbLocation);
+            return true;
+        } catch (error) {
+            this.logger.log(error);
+            return false;
+        }
+    };
+
+    public setAdbPath = (adbLocation: string): void => {
+        this.userConfigMessageCreator.setAdbLocation(adbLocation);
+    };
+
+    public getDevices = async (): Promise<DeviceInfo[]> => {
+        return await this.serviceConfig.getConnectedDevices();
+    };
+
+    public setSelectedDeviceId = (id: string): void => {
+        this.selectedDeviceId = id;
+    };
+
+    public hasExpectedServiceVersion = async (): Promise<boolean> => {
+        try {
+            const installedVersion: string = await this.getInstalledVersion();
+            if (installedVersion) {
+                return installedVersion === (await this.getTargetVersion());
+            }
+        } catch (error) {
+            this.logger.log(error);
+        }
+        return false;
+    };
+
+    public installService = async (): Promise<boolean> => {
+        try {
+            const installedVersion: string = await this.getInstalledVersion();
+            if (installedVersion) {
+                const targetVersion: string = await this.getTargetVersion();
+                if (this.compareVersions(installedVersion, targetVersion) > 0) {
+                    await this.serviceConfig.uninstallService(this.selectedDeviceId);
+                }
+            }
+
+            await this.serviceConfig.installService(this.selectedDeviceId);
+            return true;
+        } catch (error) {
+            this.logger.log(error);
+        }
+        return false;
+    };
+
+    public hasExpectedPermissions = async (): Promise<boolean> => {
+        try {
+            const info: PermissionInfo = await this.serviceConfig.getPermissionInfo(
+                this.selectedDeviceId,
+            );
+            return info.screenshotGranted;
+        } catch (error) {
+            this.logger.log(error);
+        }
+        return false;
+    };
+
+    private async getInstalledVersion(): Promise<string> {
+        const info: PackageInfo = await this.serviceConfig.getPackageInfo(this.selectedDeviceId);
+        return info?.versionName;
+    }
+
+    private async getTargetVersion(): Promise<string> {
+        return (await this.apkLocator.locateBundledApk()).versionName;
+    }
+
+    private compareVersions(v1: string, v2: string): number {
+        const radix: number = 10;
+        const v1Parts: string[] = v1.split('.');
+        const v2Parts: string[] = v2.split('.');
+
+        for (let loop = 0; loop < 3; loop++) {
+            const v1Part = v1Parts[loop];
+            const v2Part = v2Parts[loop];
+
+            if (!v1Part && !v2Part) {
+                break;
+            }
+            const v1Value = parseInt(v1Part, radix);
+            const v2Value = parseInt(v2Part, radix);
+
+            if (v1Value > v2Value) {
+                return 1;
+            }
+            if (v1Value < v2Value) {
+                return -1;
+            }
+        }
+
+        return 0;
+    }
+}
diff --git a/src/electron/views/renderer-initializer.ts b/src/electron/views/renderer-initializer.ts
index 77e795655a6..d54133d464f 100644
--- a/src/electron/views/renderer-initializer.ts
+++ b/src/electron/views/renderer-initializer.ts
@@ -70,11 +70,14 @@ import { ScanStore } from 'electron/flux/store/scan-store';
 import { WindowStateStore } from 'electron/flux/store/window-state-store';
 import { IpcMessageReceiver } from 'electron/ipc/ipc-message-receiver';
 import { IpcRendererShim } from 'electron/ipc/ipc-renderer-shim';
+import { AndroidServiceApkLocator } from 'electron/platform/android/android-service-apk-locator';
+import { AppiumServiceConfiguratorFactory } from 'electron/platform/android/appium-service-configurator-factory';
 import { createDeviceConfigFetcher } from 'electron/platform/android/device-config-fetcher';
 import { createScanResultsFetcher } from 'electron/platform/android/fetch-scan-results';
+import { LiveAppiumAdbCreator } from 'electron/platform/android/live-appium-adb-creator';
 import { ScanController } from 'electron/platform/android/scan-controller';
-import { AndroidSetupDeps } from 'electron/platform/android/setup/android-setup-deps';
 import { createAndroidSetupStateMachineFactory } from 'electron/platform/android/setup/android-setup-state-machine-factory';
+import { LiveAndroidSetupDeps } from 'electron/platform/android/setup/live-android-setup-deps';
 import { createDefaultBuilder } from 'electron/platform/android/unified-result-builder';
 import { UnifiedSettingsProvider } from 'electron/settings/unified-settings-provider';
 import { defaultAndroidSetupComponents } from 'electron/views/device-connect-view/components/android-setup/default-android-setup-components';
@@ -187,9 +190,24 @@ getPersistedData(indexedDBInstance, indexedDBDataKeysToFetch).then(
         const deviceStore = new DeviceStore(deviceActions);
         deviceStore.initialize();
 
+        const interpreter = new Interpreter();
+        const dispatcher = new DirectActionMessageDispatcher(interpreter);
+        const userConfigMessageCreator = new UserConfigMessageCreator(dispatcher);
+
+        const apkLocator: AndroidServiceApkLocator = new AndroidServiceApkLocator(
+            ipcRendererShim.getAppPath,
+        );
         const androidSetupStore = new AndroidSetupStore(
             androidSetupActions,
-            createAndroidSetupStateMachineFactory({} as AndroidSetupDeps),
+            createAndroidSetupStateMachineFactory(
+                new LiveAndroidSetupDeps(
+                    new AppiumServiceConfiguratorFactory(new LiveAppiumAdbCreator(), apkLocator),
+                    userConfigurationStore,
+                    apkLocator,
+                    userConfigMessageCreator,
+                    logger,
+                ),
+            ),
         );
         androidSetupStore.initialize();
 
@@ -242,12 +260,8 @@ getPersistedData(indexedDBInstance, indexedDBDataKeysToFetch).then(
         const fetchScanResults = createScanResultsFetcher(axios.get);
         const fetchDeviceConfig = createDeviceConfigFetcher(axios.get);
 
-        const interpreter = new Interpreter();
-
         const featureFlagsController = new FeatureFlagsController(featureFlagStore, interpreter);
 
-        const dispatcher = new DirectActionMessageDispatcher(interpreter);
-        const userConfigMessageCreator = new UserConfigMessageCreator(dispatcher);
         const userConfigurationActionCreator = new UserConfigurationActionCreator(
             userConfigActions,
         );
diff --git a/src/tests/unit/tests/background/global-action-creators/user-configuration-action-creator.test.ts b/src/tests/unit/tests/background/global-action-creators/user-configuration-action-creator.test.ts
index d7fb830412c..bb8f2f29dc6 100644
--- a/src/tests/unit/tests/background/global-action-creators/user-configuration-action-creator.test.ts
+++ b/src/tests/unit/tests/background/global-action-creators/user-configuration-action-creator.test.ts
@@ -117,6 +117,18 @@ describe('UserConfigurationActionCreator', () => {
         setIssueFilingSettings.verifyAll();
     });
 
+    it('should SetAdbLocation Message', () => {
+        const expectedAdbLocation = 'Somewhere over the rainbow';
+
+        const setAdbLocationConfigMock = createActionMock(expectedAdbLocation);
+        const actionsMock = createActionsMock('setAdbLocation', setAdbLocationConfigMock.object);
+        const testSubject = new UserConfigurationActionCreator(actionsMock.object);
+
+        testSubject.setAdbLocation(expectedAdbLocation);
+
+        setAdbLocationConfigMock.verifyAll();
+    });
+
     function createActionsMock<ActionName extends keyof UserConfigurationActions>(
         actionName: ActionName,
         action: UserConfigurationActions[ActionName],
diff --git a/src/tests/unit/tests/common/message-creators/user-config-message-creator.test.ts b/src/tests/unit/tests/common/message-creators/user-config-message-creator.test.ts
index 61d59d0e5c3..dab077a962c 100644
--- a/src/tests/unit/tests/common/message-creators/user-config-message-creator.test.ts
+++ b/src/tests/unit/tests/common/message-creators/user-config-message-creator.test.ts
@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 import {
     SaveIssueFilingSettingsPayload,
+    SetAdbLocationPayload,
     SetHighContrastModePayload,
     SetIssueFilingServicePayload,
     SetIssueFilingServicePropertyPayload,
@@ -135,4 +136,22 @@ describe('UserConfigMessageCreator', () => {
             Times.once(),
         );
     });
+
+    it('dispatches message for setAdbLocation', () => {
+        const adbLocation = 'This is where adb lives on the disk';
+        const payload: SetAdbLocationPayload = {
+            adbLocation,
+        };
+        const expectedMessage: Message = {
+            messageType: Messages.UserConfig.SetAdbLocationConfig,
+            payload,
+        };
+
+        testSubject.setAdbLocation(adbLocation);
+
+        dispatcherMock.verify(
+            dispatcher => dispatcher.dispatchMessage(expectedMessage),
+            Times.once(),
+        );
+    });
 });
diff --git a/src/tests/unit/tests/electron/platform/android/appium-service-configurator-factory.test.ts b/src/tests/unit/tests/electron/platform/android/appium-service-configurator-factory.test.ts
index 494693c97c7..f050e77aabe 100644
--- a/src/tests/unit/tests/electron/platform/android/appium-service-configurator-factory.test.ts
+++ b/src/tests/unit/tests/electron/platform/android/appium-service-configurator-factory.test.ts
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+import { AndroidServiceApkLocator } from 'electron/platform/android/android-service-apk-locator';
 import { AppiumAdbCreator } from 'electron/platform/android/appium-adb-creator';
 import { AppiumServiceConfigurator } from 'electron/platform/android/appium-service-configurator';
 import { AppiumServiceConfiguratorFactory } from 'electron/platform/android/appium-service-configurator-factory';
@@ -8,9 +9,11 @@ import { IMock, Mock, MockBehavior, Times } from 'typemoq';
 
 describe('AppiumServiceConfiguratorFactory tests', () => {
     let adbCreatorMock: IMock<AppiumAdbCreator>;
+    let apkLocatorMock: IMock<AndroidServiceApkLocator>;
 
     beforeEach(() => {
         adbCreatorMock = Mock.ofType<AppiumAdbCreator>(undefined, MockBehavior.Strict);
+        apkLocatorMock = Mock.ofType<AndroidServiceApkLocator>(undefined, MockBehavior.Strict);
     });
 
     it('getServiceConfigurator creates without parameters if no sdkRoot is provided', async () => {
@@ -18,13 +21,17 @@ describe('AppiumServiceConfiguratorFactory tests', () => {
             .setup(m => m.createADB(undefined))
             .returns(() => null)
             .verifiable(Times.once());
-        const factory = new AppiumServiceConfiguratorFactory(adbCreatorMock.object);
+        const factory = new AppiumServiceConfiguratorFactory(
+            adbCreatorMock.object,
+            apkLocatorMock.object,
+        );
 
         expect(await factory.getServiceConfigurator(null)).toBeInstanceOf(
             AppiumServiceConfigurator,
         );
 
         adbCreatorMock.verifyAll();
+        apkLocatorMock.verifyAll();
     });
 
     it('getServiceConfigurator creates with sdkRoot if it is provided', async () => {
@@ -33,13 +40,17 @@ describe('AppiumServiceConfiguratorFactory tests', () => {
             .setup(m => m.createADB({ sdkRoot: expectedSdkRoot }))
             .returns(() => null)
             .verifiable(Times.once());
-        const factory = new AppiumServiceConfiguratorFactory(adbCreatorMock.object);
+        const factory = new AppiumServiceConfiguratorFactory(
+            adbCreatorMock.object,
+            apkLocatorMock.object,
+        );
 
         expect(await factory.getServiceConfigurator(expectedSdkRoot)).toBeInstanceOf(
             AppiumServiceConfigurator,
         );
 
         adbCreatorMock.verifyAll();
+        apkLocatorMock.verifyAll();
     });
 
     it('getServiceConfigurator propagates error to caller', async () => {
@@ -48,10 +59,14 @@ describe('AppiumServiceConfiguratorFactory tests', () => {
             .setup(m => m.createADB(undefined))
             .throws(new Error(expectedMessage))
             .verifiable(Times.once());
-        const factory = new AppiumServiceConfiguratorFactory(adbCreatorMock.object);
+        const factory = new AppiumServiceConfiguratorFactory(
+            adbCreatorMock.object,
+            apkLocatorMock.object,
+        );
 
         await expect(factory.getServiceConfigurator(null)).rejects.toThrowError(expectedMessage);
 
         adbCreatorMock.verifyAll();
+        apkLocatorMock.verifyAll();
     });
 });
diff --git a/src/tests/unit/tests/electron/platform/android/appium-service-configurator.test.ts b/src/tests/unit/tests/electron/platform/android/appium-service-configurator.test.ts
index ef918a7dab1..765839b3710 100644
--- a/src/tests/unit/tests/electron/platform/android/appium-service-configurator.test.ts
+++ b/src/tests/unit/tests/electron/platform/android/appium-service-configurator.test.ts
@@ -2,6 +2,10 @@
 // Licensed under the MIT License.
 
 import ADB from 'appium-adb';
+import {
+    AndroidServiceApkInfo,
+    AndroidServiceApkLocator,
+} from 'electron/platform/android/android-service-apk-locator';
 import {
     PackageInfo,
     PermissionInfo,
@@ -11,6 +15,7 @@ import { IMock, Mock, MockBehavior, Times } from 'typemoq';
 
 describe('AppiumServiceConfigurator tests', () => {
     let adbMock: IMock<ADB>;
+    let apkLocatorMock: IMock<AndroidServiceApkLocator>;
     let testSubject: AppiumServiceConfigurator;
 
     const emulatorId: string = 'id1';
@@ -20,16 +25,17 @@ describe('AppiumServiceConfigurator tests', () => {
     const servicePackageName: string = 'com.microsoft.accessibilityinsightsforandroidservice';
     const dumpsysAccessibilitySnippetWithServiceRunning: string =
         'Service[label=Accessibility Insights for';
-    const pathToApk: string = './ServiceForAndroid/AccessibilityInsightsforAndroidService.apk';
+    const expectedPathToApk: string = './some/path/package.apk';
     const expectedPortNumber: number = 62442;
 
     beforeEach(() => {
         adbMock = Mock.ofType<ADB>(undefined, MockBehavior.Strict);
-        testSubject = new AppiumServiceConfigurator(adbMock.object);
+        apkLocatorMock = Mock.ofType<AndroidServiceApkLocator>(undefined, MockBehavior.Strict);
+        testSubject = new AppiumServiceConfigurator(adbMock.object, apkLocatorMock.object);
     });
 
     it('getConnectedDevices, propagates error', async () => {
-        const expectedMessage = 'No devices connected';
+        const expectedMessage = 'Thrown during getConnectedDevices';
         adbMock
             .setup(m => m.getConnectedEmulators())
             .throws(new Error(expectedMessage))
@@ -38,6 +44,7 @@ describe('AppiumServiceConfigurator tests', () => {
         await expect(testSubject.getConnectedDevices()).rejects.toThrowError(expectedMessage);
 
         adbMock.verifyAll();
+        apkLocatorMock.verifyAll();
     });
 
     it('getConnectedDevices, No devices detected', async () => {
@@ -55,6 +62,7 @@ describe('AppiumServiceConfigurator tests', () => {
         expect(devices.length).toBe(0);
 
         adbMock.verifyAll();
+        apkLocatorMock.verifyAll();
     });
 
     it('getConnectedDevices, 1 emulator detected', async () => {
@@ -81,6 +89,7 @@ describe('AppiumServiceConfigurator tests', () => {
         expect(devices[0].friendlyName).toBe(emulatorModel);
 
         adbMock.verifyAll();
+        apkLocatorMock.verifyAll();
     });
 
     it('getConnectedDevices, 1 physical device detected', async () => {
@@ -107,6 +116,7 @@ describe('AppiumServiceConfigurator tests', () => {
         expect(devices[0].friendlyName).toBe(deviceModel);
 
         adbMock.verifyAll();
+        apkLocatorMock.verifyAll();
     });
 
     it('getConnectedDevices, 1 emulator and 1 physical device detected', async () => {
@@ -140,19 +150,20 @@ describe('AppiumServiceConfigurator tests', () => {
         expect(devices[1].friendlyName).toBe(deviceModel);
 
         adbMock.verifyAll();
+        apkLocatorMock.verifyAll();
     });
 
     it('getPackageInfo, propagates error', async () => {
-        const expectedMessage = 'Package not found';
-        adbMock.setup(m => m.setDeviceId(emulatorId)).verifiable(Times.once());
+        const expectedMessage = 'Thrown during getPackageInfo';
         adbMock
-            .setup(m => m.getPackageInfo(servicePackageName))
+            .setup(m => m.setDeviceId(emulatorId))
             .throws(new Error(expectedMessage))
             .verifiable(Times.once());
 
         await expect(testSubject.getPackageInfo(emulatorId)).rejects.toThrowError(expectedMessage);
 
         adbMock.verifyAll();
+        apkLocatorMock.verifyAll();
     });
 
     it('getPackageInfo, contains neither versionName nor versionCode', async () => {
@@ -168,6 +179,7 @@ describe('AppiumServiceConfigurator tests', () => {
         expect(info.versionName).toBeUndefined();
 
         adbMock.verifyAll();
+        apkLocatorMock.verifyAll();
     });
 
     it('getPackageInfo, contains only versionName', async () => {
@@ -184,6 +196,7 @@ describe('AppiumServiceConfigurator tests', () => {
         expect(info.versionName).toBe(versionName);
 
         adbMock.verifyAll();
+        apkLocatorMock.verifyAll();
     });
 
     it('getPackageInfo, contains only versionCode', async () => {
@@ -200,13 +213,13 @@ describe('AppiumServiceConfigurator tests', () => {
         expect(info.versionName).toBeUndefined();
 
         adbMock.verifyAll();
+        apkLocatorMock.verifyAll();
     });
 
     it('getPermissionInfo, propagates error', async () => {
-        const expectedMessage = 'Something bad happened';
-        adbMock.setup(m => m.setDeviceId(emulatorId)).verifiable(Times.once());
+        const expectedMessage = 'Thrown during getPermissionInfo';
         adbMock
-            .setup(m => m.shell(['dumpsys', 'accessibility']))
+            .setup(m => m.setDeviceId(emulatorId))
             .throws(new Error(expectedMessage))
             .verifiable(Times.once());
 
@@ -215,6 +228,7 @@ describe('AppiumServiceConfigurator tests', () => {
         );
 
         adbMock.verifyAll();
+        apkLocatorMock.verifyAll();
     });
 
     it('getPermissionInfo, service is not running', async () => {
@@ -229,6 +243,7 @@ describe('AppiumServiceConfigurator tests', () => {
         );
 
         adbMock.verifyAll();
+        apkLocatorMock.verifyAll();
     });
 
     it('getPermissionInfo, service is running without screenshot permission', async () => {
@@ -247,6 +262,7 @@ describe('AppiumServiceConfigurator tests', () => {
         expect(permissionInfo.screenshotGranted).toBe(false);
 
         adbMock.verifyAll();
+        apkLocatorMock.verifyAll();
     });
 
     it('getPermissionInfo, service is running with screenshot permission', async () => {
@@ -269,44 +285,55 @@ describe('AppiumServiceConfigurator tests', () => {
         expect(permissionInfo.screenshotGranted).toBe(true);
 
         adbMock.verifyAll();
+        apkLocatorMock.verifyAll();
     });
 
     it('installService, propagates error', async () => {
-        const expectedError: string = 'Oops';
-        adbMock.setup(m => m.setDeviceId(emulatorId)).verifiable(Times.once());
+        const expectedMessage: string = 'Thrown during installService';
         adbMock
-            .setup(m => m.install(pathToApk))
-            .throws(new Error(expectedError))
+            .setup(m => m.setDeviceId(emulatorId))
+            .throws(new Error(expectedMessage))
             .verifiable(Times.once());
 
-        await expect(testSubject.installService(emulatorId)).rejects.toThrowError(expectedError);
+        await expect(testSubject.installService(emulatorId)).rejects.toThrowError(expectedMessage);
 
         adbMock.verifyAll();
+        apkLocatorMock.verifyAll();
     });
 
     it('installService, succeeds', async () => {
+        const apkInfo: AndroidServiceApkInfo = {
+            path: expectedPathToApk,
+        } as AndroidServiceApkInfo;
         adbMock.setup(m => m.setDeviceId(emulatorId)).verifiable(Times.once());
         adbMock
-            .setup(m => m.install(pathToApk))
+            .setup(m => m.install(expectedPathToApk))
             .returns(() => '')
             .verifiable(Times.once());
+        apkLocatorMock
+            .setup(m => m.locateBundledApk())
+            .returns(() => Promise.resolve(apkInfo))
+            .verifiable(Times.once());
 
         await testSubject.installService(emulatorId);
 
         adbMock.verifyAll();
+        apkLocatorMock.verifyAll();
     });
 
     it('uninstallService, propagates error', async () => {
-        const expectedError: string = 'Oops';
-        adbMock.setup(m => m.setDeviceId(emulatorId)).verifiable(Times.once());
+        const expectedMessage: string = 'Thrown during uninstallService';
         adbMock
-            .setup(m => m.uninstallApk(servicePackageName))
-            .throws(new Error(expectedError))
+            .setup(m => m.setDeviceId(emulatorId))
+            .throws(new Error(expectedMessage))
             .verifiable(Times.once());
 
-        await expect(testSubject.uninstallService(emulatorId)).rejects.toThrowError(expectedError);
+        await expect(testSubject.uninstallService(emulatorId)).rejects.toThrowError(
+            expectedMessage,
+        );
 
         adbMock.verifyAll();
+        apkLocatorMock.verifyAll();
     });
 
     it('uninstallService, succeeds', async () => {
@@ -319,18 +346,22 @@ describe('AppiumServiceConfigurator tests', () => {
         await testSubject.uninstallService(emulatorId);
 
         adbMock.verifyAll();
+        apkLocatorMock.verifyAll();
     });
 
     it('setTcpForwarding, propagates error', async () => {
-        const expectedError: string = 'Oops';
+        const expectedMessage: string = 'Thrown duriung setTcpForwarding';
         adbMock
             .setup(m => m.setDeviceId(emulatorId))
-            .throws(new Error(expectedError))
+            .throws(new Error(expectedMessage))
             .verifiable(Times.once());
 
-        await expect(testSubject.setTcpForwarding(emulatorId)).rejects.toThrowError(expectedError);
+        await expect(testSubject.setTcpForwarding(emulatorId)).rejects.toThrowError(
+            expectedMessage,
+        );
 
         adbMock.verifyAll();
+        apkLocatorMock.verifyAll();
     });
 
     it('setTcpForwarding, succeeds', async () => {
@@ -342,20 +373,22 @@ describe('AppiumServiceConfigurator tests', () => {
         await testSubject.setTcpForwarding(emulatorId);
 
         adbMock.verifyAll();
+        apkLocatorMock.verifyAll();
     });
 
     it('removeTcpForwarding, propagates error', async () => {
-        const expectedError: string = 'Oops';
+        const expectedMessage: string = 'Thrown during removeTcpForwarding';
         adbMock
             .setup(m => m.setDeviceId(emulatorId))
-            .throws(new Error(expectedError))
+            .throws(new Error(expectedMessage))
             .verifiable(Times.once());
 
         await expect(testSubject.removeTcpForwarding(emulatorId)).rejects.toThrowError(
-            expectedError,
+            expectedMessage,
         );
 
         adbMock.verifyAll();
+        apkLocatorMock.verifyAll();
     });
 
     it('removeTcpForwarding, succeeds', async () => {
@@ -365,6 +398,7 @@ describe('AppiumServiceConfigurator tests', () => {
         await testSubject.removeTcpForwarding(emulatorId);
 
         adbMock.verifyAll();
+        apkLocatorMock.verifyAll();
     });
     /*
     // For live testing, set ANDROID_HOME or ANDROID_SDK_ROOT to point
diff --git a/src/tests/unit/tests/electron/platform/android/setup/steps/live-android-setup-deps.test.ts b/src/tests/unit/tests/electron/platform/android/setup/steps/live-android-setup-deps.test.ts
new file mode 100644
index 00000000000..10a224ac5e8
--- /dev/null
+++ b/src/tests/unit/tests/electron/platform/android/setup/steps/live-android-setup-deps.test.ts
@@ -0,0 +1,406 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import { UserConfigurationStore } from 'background/stores/global/user-configuration-store';
+import { Logger } from 'common/logging/logger';
+import { UserConfigMessageCreator } from 'common/message-creators/user-config-message-creator';
+import { UserConfigurationStoreData } from 'common/types/store-data/user-configuration-store';
+import {
+    AndroidServiceApkInfo,
+    AndroidServiceApkLocator,
+} from 'electron/platform/android/android-service-apk-locator';
+import {
+    AndroidServiceConfigurator,
+    AndroidServiceConfiguratorFactory,
+    DeviceInfo,
+    PackageInfo,
+    PermissionInfo,
+} from 'electron/platform/android/android-service-configurator';
+import { LiveAndroidSetupDeps } from 'electron/platform/android/setup/live-android-setup-deps';
+import { IMock, Mock, MockBehavior, Times } from 'typemoq';
+
+describe('LiveAndroidSetupDeps', () => {
+    const expectedAdbLocation = 'Expected ADB location';
+
+    let serviceConfigFactoryMock: IMock<AndroidServiceConfiguratorFactory>;
+    let serviceConfigMock: IMock<AndroidServiceConfigurator>;
+    let configStoreMock: IMock<UserConfigurationStore>;
+    let apkLocatorMock: IMock<AndroidServiceApkLocator>;
+    let configMessageCreatorMock: IMock<UserConfigMessageCreator>;
+    let loggerMock: IMock<Logger>;
+    let testSubject: LiveAndroidSetupDeps;
+
+    beforeEach(() => {
+        serviceConfigFactoryMock = Mock.ofType<AndroidServiceConfiguratorFactory>(
+            undefined,
+            MockBehavior.Strict,
+        );
+        serviceConfigMock = Mock.ofType<AndroidServiceConfigurator>(undefined, MockBehavior.Strict);
+        configStoreMock = Mock.ofType<UserConfigurationStore>(undefined, MockBehavior.Strict);
+        apkLocatorMock = Mock.ofType<AndroidServiceApkLocator>(undefined, MockBehavior.Strict);
+        configMessageCreatorMock = Mock.ofType<UserConfigMessageCreator>(
+            undefined,
+            MockBehavior.Strict,
+        );
+        loggerMock = Mock.ofType<Logger>();
+        testSubject = new LiveAndroidSetupDeps(
+            serviceConfigFactoryMock.object,
+            configStoreMock.object,
+            apkLocatorMock.object,
+            configMessageCreatorMock.object,
+            loggerMock.object,
+        );
+    });
+
+    function verifyAllMocks(): void {
+        serviceConfigFactoryMock.verifyAll();
+        serviceConfigMock.verifyAll();
+        configStoreMock.verifyAll();
+        configMessageCreatorMock.verifyAll();
+        apkLocatorMock.verifyAll();
+    }
+
+    async function initializeServiceConfig(): Promise<void> {
+        const stateData = { adbLocation: expectedAdbLocation } as UserConfigurationStoreData;
+        configStoreMock
+            .setup(m => m.getState())
+            .returns(() => stateData)
+            .verifiable(Times.once());
+        serviceConfigFactoryMock
+            .setup(m => m.getServiceConfigurator(expectedAdbLocation))
+            .returns(() => Promise.resolve(serviceConfigMock.object))
+            .verifiable(Times.once());
+        serviceConfigMock.setup((m: any) => m.then).returns(() => undefined);
+        await testSubject.hasAdbPath();
+    }
+
+    it('hasAdbPath returns false on error', async () => {
+        configStoreMock
+            .setup(m => m.getState())
+            .throws(new Error('Threw during hasAdbPath'))
+            .verifiable(Times.once());
+
+        const success: boolean = await testSubject.hasAdbPath();
+        expect(success).toBe(false);
+
+        verifyAllMocks();
+    });
+
+    it('hasAdbPath chains and returns true on success', async () => {
+        const stateData = { adbLocation: expectedAdbLocation } as UserConfigurationStoreData;
+
+        serviceConfigMock.setup((m: any) => m.then).returns(() => undefined);
+        configStoreMock
+            .setup(m => m.getState())
+            .returns(() => stateData)
+            .verifiable(Times.once());
+        serviceConfigFactoryMock
+            .setup(m => m.getServiceConfigurator(expectedAdbLocation))
+            .returns(() => Promise.resolve(serviceConfigMock.object))
+            .verifiable(Times.once());
+
+        const success: boolean = await testSubject.hasAdbPath();
+        expect(success).toBe(true);
+
+        verifyAllMocks();
+    });
+
+    it('setAdbPath chains to UserConfigMessageCreator', () => {
+        configMessageCreatorMock
+            .setup(m => m.setAdbLocation(expectedAdbLocation))
+            .verifiable(Times.once());
+
+        testSubject.setAdbPath(expectedAdbLocation);
+
+        verifyAllMocks();
+    });
+
+    it('getDevices returns info from AndroidServiceConfigurator', async () => {
+        const expectedDevices: DeviceInfo[] = [
+            {
+                id: 'emulator1',
+                isEmulator: true,
+                friendlyName: 'an emulator',
+            },
+            {
+                id: 'phone123',
+                isEmulator: false,
+                friendlyName: 'a device',
+            },
+        ];
+        serviceConfigMock
+            .setup(m => m.getConnectedDevices())
+            .returns(() => Promise.resolve(expectedDevices))
+            .verifiable(Times.once());
+
+        await initializeServiceConfig();
+        const actualDevices = await testSubject.getDevices();
+
+        expect(actualDevices).toBe(expectedDevices);
+
+        verifyAllMocks();
+    });
+
+    it('setSelectedDeviceId persists correctly', async () => {
+        // Note: We can only validate this indirectly. We set the expected ID,
+        // then confirm that it gets passed to getPackageInfo.
+        const expectedDeviceId: string = 'abc-123';
+        serviceConfigMock
+            .setup(m => m.getPackageInfo(expectedDeviceId))
+            .throws(new Error('Threw validating setSeletedDeviceId'))
+            .verifiable(Times.once());
+
+        await initializeServiceConfig();
+        testSubject.setSelectedDeviceId(expectedDeviceId);
+        await testSubject.hasExpectedServiceVersion();
+
+        verifyAllMocks();
+    });
+
+    it('hasExpectedServiceVersion returns false on error', async () => {
+        serviceConfigMock
+            .setup(m => m.getPackageInfo(undefined))
+            .throws(new Error('Threw during hasExpectedServiceVersion'))
+            .verifiable(Times.once());
+
+        await initializeServiceConfig();
+        const success = await testSubject.hasExpectedServiceVersion();
+
+        expect(success).toBe(false);
+
+        verifyAllMocks();
+    });
+
+    it('hasExpectedServiceVersion returns false if installed package has no versionName', async () => {
+        const packageInfo: PackageInfo = {};
+        serviceConfigMock
+            .setup(m => m.getPackageInfo(undefined))
+            .returns(() => Promise.resolve(packageInfo))
+            .verifiable(Times.once());
+        await initializeServiceConfig();
+
+        const success = await testSubject.hasExpectedServiceVersion();
+
+        expect(success).toBe(false);
+
+        verifyAllMocks();
+    });
+
+    it('hasExpectedServiceVersion returns false if versionNames are different', async () => {
+        const packageInfo: PackageInfo = {
+            versionName: '1.2.2',
+        };
+        const apkInfo: AndroidServiceApkInfo = {
+            versionName: '1.2.3',
+        } as AndroidServiceApkInfo;
+        serviceConfigMock
+            .setup(m => m.getPackageInfo(undefined))
+            .returns(() => Promise.resolve(packageInfo))
+            .verifiable(Times.once());
+        apkLocatorMock
+            .setup(m => m.locateBundledApk())
+            .returns(() => Promise.resolve(apkInfo))
+            .verifiable(Times.once());
+        await initializeServiceConfig();
+
+        const success = await testSubject.hasExpectedServiceVersion();
+
+        expect(success).toBe(false);
+
+        verifyAllMocks();
+    });
+
+    it('hasExpectedServiceVersion returns true if versionNames are same', async () => {
+        const packageInfo: PackageInfo = {
+            versionName: '1.2.3',
+        };
+        const apkInfo: AndroidServiceApkInfo = {
+            versionName: '1.2.3',
+        } as AndroidServiceApkInfo;
+        serviceConfigMock
+            .setup(m => m.getPackageInfo(undefined))
+            .returns(() => Promise.resolve(packageInfo))
+            .verifiable(Times.once());
+        apkLocatorMock
+            .setup(m => m.locateBundledApk())
+            .returns(() => Promise.resolve(apkInfo))
+            .verifiable(Times.once());
+        await initializeServiceConfig();
+
+        const success = await testSubject.hasExpectedServiceVersion();
+
+        expect(success).toBe(true);
+
+        verifyAllMocks();
+    });
+
+    it('installService returns false on error', async () => {
+        serviceConfigMock
+            .setup(m => m.getPackageInfo(undefined))
+            .throws(new Error('Threw during installService'))
+            .verifiable(Times.once());
+
+        await initializeServiceConfig();
+        const success = await testSubject.installService();
+
+        expect(success).toBe(false);
+
+        verifyAllMocks();
+    });
+
+    it('installService installs (no uninstall) if installed version does not exist', async () => {
+        const installedPackageInfo: PackageInfo = {};
+        serviceConfigMock
+            .setup(m => m.getPackageInfo(undefined))
+            .returns(() => Promise.resolve(installedPackageInfo))
+            .verifiable(Times.once());
+        serviceConfigMock.setup(m => m.installService(undefined)).verifiable(Times.once());
+        await initializeServiceConfig();
+
+        const success = await testSubject.installService();
+
+        expect(success).toBe(true);
+
+        verifyAllMocks();
+    });
+
+    it('installService installs (no uninstall) if installed version is older than Apk version', async () => {
+        const installedPackageInfo: PackageInfo = {
+            versionName: '1.2.2',
+        };
+        const apkInfo: AndroidServiceApkInfo = {
+            versionName: '1.2.3',
+        } as AndroidServiceApkInfo;
+        serviceConfigMock
+            .setup(m => m.getPackageInfo(undefined))
+            .returns(() => Promise.resolve(installedPackageInfo))
+            .verifiable(Times.once());
+        serviceConfigMock.setup(m => m.installService(undefined)).verifiable(Times.once());
+        apkLocatorMock
+            .setup(m => m.locateBundledApk())
+            .returns(() => Promise.resolve(apkInfo))
+            .verifiable(Times.once());
+        await initializeServiceConfig();
+
+        const success = await testSubject.installService();
+
+        expect(success).toBe(true);
+
+        verifyAllMocks();
+    });
+
+    it('installService installs (no uninstall) if installed version is same as Apk version', async () => {
+        const installedPackageInfo: PackageInfo = {
+            versionName: '1.2',
+        };
+        const apkInfo: AndroidServiceApkInfo = {
+            versionName: '1.2',
+        } as AndroidServiceApkInfo;
+        serviceConfigMock
+            .setup(m => m.getPackageInfo(undefined))
+            .returns(() => Promise.resolve(installedPackageInfo))
+            .verifiable(Times.once());
+        serviceConfigMock.setup(m => m.installService(undefined)).verifiable(Times.once());
+        apkLocatorMock
+            .setup(m => m.locateBundledApk())
+            .returns(() => Promise.resolve(apkInfo))
+            .verifiable(Times.once());
+        await initializeServiceConfig();
+
+        const success = await testSubject.installService();
+
+        expect(success).toBe(true);
+
+        verifyAllMocks();
+    });
+
+    it('installService uninstalls then installs if installed version is newer than Apk version', async () => {
+        let callbackCount: number = 0;
+        let uninstallOrder: number = undefined;
+        let installOrder: number = undefined;
+        const installedPackageInfo: PackageInfo = {
+            versionName: '1.2.3',
+        };
+        const apkInfo: AndroidServiceApkInfo = {
+            versionName: '1.2.2',
+        } as AndroidServiceApkInfo;
+        serviceConfigMock
+            .setup(m => m.getPackageInfo(undefined))
+            .returns(() => Promise.resolve(installedPackageInfo))
+            .verifiable(Times.once());
+        serviceConfigMock
+            .setup(m => m.uninstallService(undefined))
+            .callback(() => {
+                uninstallOrder = callbackCount++;
+            })
+            .verifiable(Times.once());
+        serviceConfigMock
+            .setup(m => m.installService(undefined))
+            .callback(() => {
+                installOrder = callbackCount++;
+            })
+            .verifiable(Times.once());
+        apkLocatorMock
+            .setup(m => m.locateBundledApk())
+            .returns(() => Promise.resolve(apkInfo))
+            .verifiable(Times.once());
+        await initializeServiceConfig();
+
+        const success = await testSubject.installService();
+
+        expect(success).toBe(true);
+        expect(uninstallOrder).toBe(0);
+        expect(installOrder).toBe(1);
+        expect(callbackCount).toBe(2);
+
+        verifyAllMocks();
+    });
+
+    it('hasExpectedPermissions returns false on error', async () => {
+        serviceConfigMock
+            .setup(m => m.getPermissionInfo(undefined))
+            .throws(new Error('Threw during hasExpectedPermissions'))
+            .verifiable(Times.once());
+        await initializeServiceConfig();
+
+        const success = await testSubject.hasExpectedPermissions();
+
+        expect(success).toBe(false);
+
+        verifyAllMocks();
+    });
+
+    it('hasExpectedPermissions returns false on error', async () => {
+        const permissionInfo: PermissionInfo = {
+            screenshotGranted: false,
+        };
+        serviceConfigMock
+            .setup(m => m.getPermissionInfo(undefined))
+            .returns(() => Promise.resolve(permissionInfo))
+            .verifiable(Times.once());
+        await initializeServiceConfig();
+
+        const success = await testSubject.hasExpectedPermissions();
+
+        expect(success).toBe(false);
+
+        verifyAllMocks();
+    });
+
+    it('hasExpectedPermissions returns false on error', async () => {
+        const permissionInfo: PermissionInfo = {
+            screenshotGranted: true,
+        };
+        serviceConfigMock
+            .setup(m => m.getPermissionInfo(undefined))
+            .returns(() => Promise.resolve(permissionInfo))
+            .verifiable(Times.once());
+        await initializeServiceConfig();
+
+        const success = await testSubject.hasExpectedPermissions();
+
+        expect(success).toBe(true);
+
+        verifyAllMocks();
+    });
+});

From aa9d44f8a2b1ccbd6e958fe1683348789070dd32 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 16 Jun 2020 23:24:05 +0000
Subject: [PATCH 24/71] chore(deps-dev): bump puppeteer from 3.3.0 to 4.0.0
 (#2886)

---
 package.json |  2 +-
 yarn.lock    | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 1823f95caba..1b2532d095e 100644
--- a/package.json
+++ b/package.json
@@ -114,7 +114,7 @@
         "npm-run-all": "^4.1.5",
         "preprocess": "^3.2.0",
         "prettier": "^2.0.5",
-        "puppeteer": "^3.3.0",
+        "puppeteer": "^4.0.0",
         "react-devtools": "^4.7.0",
         "regenerator-runtime": "^0.13.5",
         "sass-loader": "^8.0.2",
diff --git a/yarn.lock b/yarn.lock
index 7250dd1e753..e11d0011d09 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7333,6 +7333,11 @@ mississippi@^3.0.0:
     stream-each "^1.1.0"
     through2 "^2.0.0"
 
+mitt@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/mitt/-/mitt-2.0.1.tgz#9e8a075b4daae82dd91aac155a0ece40ca7cb393"
+  integrity sha512-FhuJY+tYHLnPcBHQhbUFzscD5512HumCPE4URXZUgPi3IvOJi4Xva5IIgy3xX56GqCmw++MAm5UURG6kDBYTdg==
+
 mixin-deep@^1.2.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
@@ -8709,15 +8714,16 @@ pupa@^2.0.1:
   dependencies:
     escape-goat "^2.0.0"
 
-puppeteer@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-3.3.0.tgz#95839af9fdc0aa4de7e5ee073a4c0adeb9e2d3d7"
-  integrity sha512-23zNqRltZ1PPoK28uRefWJ/zKb5Jhnzbbwbpcna2o5+QMn17F0khq5s1bdH3vPlyj+J36pubccR8wiNA/VE0Vw==
+puppeteer@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-4.0.0.tgz#96d647c3546119f8e670493bcebf9ddb044a2367"
+  integrity sha512-yNshT0M5DWfZ8DQoduZuGYpcwqXxKOZdgt5G0IF5VEKbydaDbWP/f5pQRfzQ4e+a4w0Rge3uzcogHeUPQM8nCA==
   dependencies:
     debug "^4.1.0"
     extract-zip "^2.0.0"
     https-proxy-agent "^4.0.0"
     mime "^2.0.3"
+    mitt "^2.0.1"
     progress "^2.0.1"
     proxy-from-env "^1.0.0"
     rimraf "^3.0.2"

From 81fedeea5053a0fe1e9a631ac6f431c21bfe8df6 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 16 Jun 2020 23:24:40 +0000
Subject: [PATCH 25/71] chore(deps-dev): bump @types/chrome from 0.0.114 to
 0.0.115 (#2888)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 1b2532d095e..4444d4302bc 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
         "7zip-bin": "^5.0.3",
         "@electron/get": "^1.12.2",
         "@types/applicationinsights-js": "^1.0.7",
-        "@types/chrome": "0.0.114",
+        "@types/chrome": "0.0.115",
         "@types/enzyme": "^3.10.5",
         "@types/enzyme-adapter-react-16": "^1.0.6",
         "@types/jest": "^26.0.0",
diff --git a/yarn.lock b/yarn.lock
index e11d0011d09..c224920d86c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -978,10 +978,10 @@
   dependencies:
     "@types/node" "*"
 
-"@types/chrome@0.0.114":
-  version "0.0.114"
-  resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.114.tgz#8ceb33fa261f4b9e307fa7344ba8182d8d410d4e"
-  integrity sha512-i7qRr74IrxHtbnrZSKUuP5Uvd5EOKwlwJq/yp7+yTPihOXnPhNQO4Z5bqb1XTnrjdbUKEJicaVVbhcgtRijmLA==
+"@types/chrome@0.0.115":
+  version "0.0.115"
+  resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.115.tgz#dde40ff715a76d8c8125b0fe35287b9fdbc9f3de"
+  integrity sha512-pNoYoYgGuI1/kiz53kjrXrKIjn2H8YWOI+vxVTOubX6arCHk/m/jInoyflKiP2qZHZf8+P+hh6d2y9tjaG4BPQ==
   dependencies:
     "@types/filesystem" "*"
     "@types/har-format" "*"

From 3db47b7b45a6ed3917badd2ab16d612efee45961 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 16 Jun 2020 23:26:31 +0000
Subject: [PATCH 26/71] chore(deps-dev): bump fork-ts-checker-webpack-plugin
 from 4.1.6 to 5.0.1 (#2891)

---
 package.json |  2 +-
 yarn.lock    | 84 +++++++++++++++++++++++++++++++++++++++-------------
 2 files changed, 65 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index 4444d4302bc..a160e59da68 100644
--- a/package.json
+++ b/package.json
@@ -92,7 +92,7 @@
         "express": "^4.16.4",
         "extract-zip": "^2.0.1",
         "fake-indexeddb": "^3.0.2",
-        "fork-ts-checker-webpack-plugin": "^4.1.6",
+        "fork-ts-checker-webpack-plugin": "^5.0.1",
         "grunt": "^1.1.0",
         "grunt-bom-removal": "1.0.1",
         "grunt-cli": "^1.3.1",
diff --git a/yarn.lock b/yarn.lock
index c224920d86c..77e876dc6f7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1150,6 +1150,11 @@
   resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
   integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
 
+"@types/parse-json@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
+  integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
+
 "@types/parse5@*":
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-5.0.2.tgz#a877a4658f8238c8266faef300ae41c84d72ec8a"
@@ -3164,6 +3169,17 @@ core-util-is@1.0.2, core-util-is@~1.0.0:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
+cosmiconfig@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982"
+  integrity sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==
+  dependencies:
+    "@types/parse-json" "^4.0.0"
+    import-fresh "^3.1.0"
+    parse-json "^5.0.0"
+    path-type "^4.0.0"
+    yaml "^1.7.2"
+
 crc32-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-2.0.0.tgz#e3cdd3b4df3168dd74e3de3fbbcb7b297fe908f4"
@@ -4640,18 +4656,21 @@ forever-agent@~0.6.1:
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
   integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
-fork-ts-checker-webpack-plugin@^4.1.6:
-  version "4.1.6"
-  resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-4.1.6.tgz#5055c703febcf37fa06405d400c122b905167fc5"
-  integrity sha512-DUxuQaKoqfNne8iikd14SAkh5uw4+8vNifp6gmA73yYNS6ywLIWSLD/n/mBzHQRpW3J7rbATEakmiA8JvkTyZw==
+fork-ts-checker-webpack-plugin@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.0.1.tgz#21adab94c30340c50dc5a3d36c25d180a8bb29e5"
+  integrity sha512-bys+hPwlPckrSCzNkg0BSUTsCRZWS6qIRiwk+8AjKitLWTqokda0QVImCx/Vm9cL/OGZZUnrFXazsVc99nijKQ==
   dependencies:
-    "@babel/code-frame" "^7.5.5"
+    "@babel/code-frame" "^7.8.3"
     chalk "^2.4.1"
-    micromatch "^3.1.10"
+    cosmiconfig "^6.0.0"
+    deepmerge "^4.2.2"
+    fs-extra "^9.0.0"
+    memfs "^3.1.2"
     minimatch "^3.0.4"
+    schema-utils "1.0.0"
     semver "^5.6.0"
     tapable "^1.0.0"
-    worker-rpc "^0.1.0"
 
 form-data@^3.0.0:
   version "3.0.0"
@@ -4743,6 +4762,11 @@ fs-minipass@^2.0.0:
   dependencies:
     minipass "^3.0.0"
 
+fs-monkey@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.1.tgz#4a82f36944365e619f4454d9fff106553067b781"
+  integrity sha512-fcSa+wyTqZa46iWweI7/ZiUfegOZl0SG8+dltIwFXo7+zYU9J9kpS3NB6pZcSlJdhvIwp81Adx2XhZorncxiaA==
+
 fs-write-stream-atomic@^1.0.8:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
@@ -5573,6 +5597,14 @@ ignore@^5.1.1, ignore@^5.1.2:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf"
   integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==
 
+import-fresh@^3.1.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66"
+  integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==
+  dependencies:
+    parent-module "^1.0.0"
+    resolve-from "^4.0.0"
+
 import-lazy@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
@@ -7085,6 +7117,13 @@ media-typer@0.3.0:
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
+memfs@^3.1.2:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.2.0.tgz#f9438e622b5acd1daa8a4ae160c496fdd1325b26"
+  integrity sha512-f/xxz2TpdKv6uDn6GtHee8ivFyxwxmPuXatBb1FBwxYNuVpbM3k/Y1Z+vC0mH/dIXXrukYfe3qe5J32Dfjg93A==
+  dependencies:
+    fs-monkey "1.0.1"
+
 memory-fs@^0.4.0, memory-fs@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
@@ -7142,11 +7181,6 @@ methods@~1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
 
-microevent.ts@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/microevent.ts/-/microevent.ts-0.1.1.tgz#70b09b83f43df5172d0205a63025bce0f7357fa0"
-  integrity sha512-jo1OfR4TaEwd5HOrt5+tAZ9mqT4jmpNAusXtyfNzqVm9uiSYFZlKM1wYL4oU7azZW/PxQW53wM0S6OR1JHNa2g==
-
 micromatch@4.x, micromatch@^4.0.0, micromatch@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
@@ -8057,6 +8091,13 @@ param-case@^3.0.2:
     dot-case "^3.0.2"
     tslib "^1.10.0"
 
+parent-module@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
+  integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
+  dependencies:
+    callsites "^3.0.0"
+
 parse-asn1@^5.0.0:
   version "5.1.5"
   resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.5.tgz#003271343da58dc94cace494faef3d2147ecea0e"
@@ -9327,6 +9368,11 @@ resolve-from@^3.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
   integrity sha1-six699nWiBvItuZTM17rywoYh0g=
 
+resolve-from@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
+  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
+
 resolve-from@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
@@ -9581,7 +9627,7 @@ scheduler@^0.19.1:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
-schema-utils@^1.0.0:
+schema-utils@1.0.0, schema-utils@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
   integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==
@@ -11454,13 +11500,6 @@ worker-farm@^1.7.0:
   dependencies:
     errno "~0.1.7"
 
-worker-rpc@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/worker-rpc/-/worker-rpc-0.1.1.tgz#cb565bd6d7071a8f16660686051e969ad32f54d5"
-  integrity sha512-P1WjMrUB3qgJNI9jfmpZ/htmBEjFh//6l/5y8SD9hg1Ef5zTTVVoRjTrTEzPrNBQvmhMxkoTsjOXN10GWU7aCg==
-  dependencies:
-    microevent.ts "~0.1.1"
-
 wrap-ansi@^6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
@@ -11599,6 +11638,11 @@ yallist@^4.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
+yaml@^1.7.2:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e"
+  integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==
+
 yargs-parser@18.x, yargs-parser@^18.1.1:
   version "18.1.3"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"

From d29009dcb755cdced9dcd27cf579b66c07bbeda6 Mon Sep 17 00:00:00 2001
From: Dan Bjorge <danielbj@microsoft.com>
Date: Tue, 16 Jun 2020 16:42:00 -0700
Subject: [PATCH 27/71] chore: start incremental migration to strictNullChecks
 (#2835)

#### Description of changes

This PR, plus the scripts in [dbjorge/aiweb-strict-null-check-migration-tools](https://github.com/dbjorge/aiweb-strict-null-check-migration-tools), creates the initial infrastructure for an incremental migration to `strictNullChecks: true`, following the [same strategy that VS Code used](https://code.visualstudio.com/blogs/2019/05/23/strict-null).

* Adds a secondary `tsconfig` file at `tsconfig.strictNullChecks.json` which is the same as our main/normal tsconfig file except that it enables `strictNullChecks` and only runs on the already-compliant parts of our code
* Populates the initial `files` and `includes` of the `strictNullChecks` config with the subset of `/src/` that is already compliant (by using `autoAdd` from [aiweb-strict-null-check-migration-tools](https://github.com/dbjorge/aiweb-strict-null-check-migration-tools)
* Adds a new `yarn null:check` command to compile against the new strictNullChecks config (note, an especially useful option during cleanup work is `yarn null:check --watch`)
* Adds `yarn null:check` into `yarn fastpass`
* Adds `yarn null:check` into PR/CI build

The ongoing effort to incrementally bring the codebase to null safety would amount to iteratively using [aiweb-strict-null-check-migration-tools](https://github.com/dbjorge/aiweb-strict-null-check-migration-tools) to find the next candidate files, fixing up null safety issues there, and using that repo's `autoAdd` tool to bring in any transitively-fixed cases.

#### Pull request checklist
<!-- If a checklist item is not applicable to this change, write "n/a" in the checkbox -->
- [x] Addresses an existing issue: #2869
- [x] Ran `yarn fastpass`
- [n/a] Added/updated relevant unit test(s) (and ran `yarn test`)
- [n/a] Verified code coverage for the changes made. Check coverage report at: `<rootDir>/test-results/unit/coverage`
- [x] PR title *AND* final merge commit title both start with a semantic tag (`fix:`, `chore:`, `feat(feature-name):`, `refactor:`). See `CONTRIBUTING.md`.
- [n/a] (UI changes only) Added screenshots/GIFs to description above
- [n/a] (UI changes only) Verified usability with NVDA/JAWS
---
 build.yaml                     |   4 +
 package.json                   |   3 +-
 tsconfig.strictNullChecks.json | 288 +++++++++++++++++++++++++++++++++
 3 files changed, 294 insertions(+), 1 deletion(-)
 create mode 100644 tsconfig.strictNullChecks.json

diff --git a/build.yaml b/build.yaml
index c90b7b5fb30..33d6178056a 100644
--- a/build.yaml
+++ b/build.yaml
@@ -35,6 +35,10 @@ jobs:
             displayName: generate typings for scss files
             timeoutInMinutes: 3
 
+          - script: yarn null:check
+            displayName: check for strictNullChecks violations
+            timeoutInMinutes: 5
+
           - script: yarn test --ci
             displayName: run unit tests
             timeoutInMinutes: 10
diff --git a/package.json b/package.json
index a160e59da68..e26703e09c2 100644
--- a/package.json
+++ b/package.json
@@ -26,12 +26,13 @@
         "copyright:check": "license-check-and-add check -f copyright-header.config.json",
         "copyright:fix": "license-check-and-add add -f copyright-header.config.json",
         "download:electron-mirror": "node ./pipeline/scripts/download-electron-mirror.js",
-        "fastpass": "npm-run-all --print-label scss:clean --parallel copyright:check lint:check format:check && grunt ada-cat",
+        "fastpass": "npm-run-all --print-label --parallel copyright:check lint:check format:check null:check && grunt ada-cat",
         "fastpass:fix": "npm-run-all --print-label --serial scss:clean copyright:fix lint:fix format:fix",
         "format:check": "prettier --config prettier.config.js --check \"**/*\"",
         "format:fix": "prettier --config prettier.config.js --write \"**/*\"",
         "lint:check": "tslint -c ./tslint.json -p ./tsconfig.json",
         "lint:fix": "tslint --fix -c ./tslint.json -p ./tsconfig.json",
+        "null:check": "tsc -p ./tsconfig.strictNullChecks.json",
         "react-devtools": "react-devtools",
         "scss:build": "tsm \"src/**/*.scss\"",
         "scss:clean": "grunt clean:scss",
diff --git a/tsconfig.strictNullChecks.json b/tsconfig.strictNullChecks.json
new file mode 100644
index 00000000000..77b7bfdb17e
--- /dev/null
+++ b/tsconfig.strictNullChecks.json
@@ -0,0 +1,288 @@
+{
+    "extends": "./tsconfig.json",
+    "compilerOptions": {
+        "strictNullChecks": true
+    },
+    "files": [
+        "./src/DetailsView/bundled-details-view-styles.ts",
+        "./src/DetailsView/components/action-and-cancel-buttons-component.tsx",
+        "./src/DetailsView/components/assessment-instance-details-column.tsx",
+        "./src/DetailsView/components/assessment-instance-selected-button.tsx",
+        "./src/DetailsView/components/base-left-nav.tsx",
+        "./src/DetailsView/components/failure-instance-panel-details.tsx",
+        "./src/DetailsView/components/generic-dialog.tsx",
+        "./src/DetailsView/components/generic-panel.tsx",
+        "./src/DetailsView/components/generic-toggle.tsx",
+        "./src/DetailsView/components/left-nav/details-view-right-content-panel-type.ts",
+        "./src/DetailsView/components/left-nav/getting-started-nav-link.tsx",
+        "./src/DetailsView/components/left-nav/overview-left-nav-link.tsx",
+        "./src/DetailsView/components/left-nav/test-view-left-nav-link.tsx",
+        "./src/DetailsView/components/narrow-mode-detector.tsx",
+        "./src/DetailsView/components/no-content-available/no-content-available.tsx",
+        "./src/DetailsView/components/overview-content/overview-heading.tsx",
+        "./src/DetailsView/components/switcher-style-names.ts",
+        "./src/DetailsView/components/target-page-hidden-bar.tsx",
+        "./src/Devtools/target-page-inspector.ts",
+        "./src/ad-hoc-visualizations/issues/get-notification-message.ts",
+        "./src/assessments/audio-video-only/test-steps/test-steps.ts",
+        "./src/assessments/auto-pass-if-no-results.ts",
+        "./src/assessments/color/test-steps/test-steps.tsx",
+        "./src/assessments/common/assisted-test-record-your-results.tsx",
+        "./src/assessments/common/instructions-and-labels-note.tsx",
+        "./src/assessments/common/manual-test-record-your-results.tsx",
+        "./src/assessments/contrast/test-steps/test-steps.ts",
+        "./src/assessments/custom-widgets/design-pattern.ts",
+        "./src/assessments/custom-widgets/test-steps/test-steps.ts",
+        "./src/assessments/errors/test-steps/test-steps.ts",
+        "./src/assessments/headings/test-steps/test-steps.ts",
+        "./src/assessments/images/test-steps/test-steps.ts",
+        "./src/assessments/keyboard-interaction/test-steps/test-steps.ts",
+        "./src/assessments/landmarks/test-steps/test-steps.ts",
+        "./src/assessments/language/test-steps/test-steps.ts",
+        "./src/assessments/links/test-steps/test-steps.ts",
+        "./src/assessments/live-multimedia/test-steps/test-steps.ts",
+        "./src/assessments/markup.tsx",
+        "./src/assessments/native-widgets/test-steps/test-steps.ts",
+        "./src/assessments/page/test-steps/test-steps.ts",
+        "./src/assessments/parsing/test-steps/test-steps.ts",
+        "./src/assessments/pointer-motion/test-steps/test-steps.ts",
+        "./src/assessments/prerecorded-multimedia/test-steps/test-steps.ts",
+        "./src/assessments/repetitive-content/test-steps/test-steps.ts",
+        "./src/assessments/semantics/test-steps/test-steps.ts",
+        "./src/assessments/sequence/test-steps/test-steps.ts",
+        "./src/assessments/text-legibility/test-steps/test-step.ts",
+        "./src/assessments/timed-events/test-steps/test-steps.ts",
+        "./src/assessments/visible-focus-order/test-steps/test-steps.ts",
+        "./src/background/IndexedDBDataKeys.ts",
+        "./src/background/details-view-controller.ts",
+        "./src/background/feature-flag-checker.ts",
+        "./src/background/injector/content-script-injector.ts",
+        "./src/background/inspect-modes.ts",
+        "./src/background/install-data-generator.ts",
+        "./src/background/installation-data.ts",
+        "./src/background/instance-identifier-generator.ts",
+        "./src/background/local-storage-data-keys.ts",
+        "./src/background/scoping-input-types.ts",
+        "./src/background/shortcuts-page-controller.ts",
+        "./src/background/stores/side-panel.ts",
+        "./src/background/stores/store-hub.ts",
+        "./src/background/telemetry/multiplexing-telemetry-client.ts",
+        "./src/background/telemetry/telemetry-base-data.ts",
+        "./src/background/telemetry/telemetry-client.ts",
+        "./src/background/usage-logger.ts",
+        "./src/background/user-stored-data-cleaner.ts",
+        "./src/common/base-store.ts",
+        "./src/common/blob-provider.ts",
+        "./src/common/browser-adapters/app-data-adapter.ts",
+        "./src/common/browser-adapters/browser-adapter.ts",
+        "./src/common/browser-adapters/commands-adapter.ts",
+        "./src/common/browser-adapters/storage-adapter.ts",
+        "./src/common/components/blocking-dialog.tsx",
+        "./src/common/components/cards/card-interaction-support.ts",
+        "./src/common/components/cards/simple-card-row.tsx",
+        "./src/common/components/controls/insights-command-button.tsx",
+        "./src/common/components/external-link.tsx",
+        "./src/common/components/issue-filing-needs-settings-help-text.tsx",
+        "./src/common/components/left-nav-hamburger-button.tsx",
+        "./src/common/components/new-tab-link.tsx",
+        "./src/common/components/null-component.tsx",
+        "./src/common/components/privacy-statement-text.tsx",
+        "./src/common/components/scanning-spinner/scanning-spinner.tsx",
+        "./src/common/components/telemetry-notice.tsx",
+        "./src/common/components/visualization-toggle.tsx",
+        "./src/common/configs/adhoc-test-keys.ts",
+        "./src/common/configs/test-mode.ts",
+        "./src/common/configuration/configuration-defaults.ts",
+        "./src/common/configuration/configuration-types.ts",
+        "./src/common/date-provider.ts",
+        "./src/common/document-manipulator.ts",
+        "./src/common/enum-helper.ts",
+        "./src/common/fabric-icons.ts",
+        "./src/common/file-url-provider.ts",
+        "./src/common/flux/event-handler-list.ts",
+        "./src/common/get-inner-text-from-jsx-element.ts",
+        "./src/common/is-supported-browser.ts",
+        "./src/common/itab.ts",
+        "./src/common/message-creators/store-action-message-creator.ts",
+        "./src/common/message.ts",
+        "./src/common/messages.ts",
+        "./src/common/platform.ts",
+        "./src/common/stores/client-stores-hub.ts",
+        "./src/common/stores/store-names.ts",
+        "./src/common/types/deep-partial.ts",
+        "./src/common/types/details-view-pivot-type.ts",
+        "./src/common/types/dev-tools-open-message.ts",
+        "./src/common/types/idefault-constructor.ts",
+        "./src/common/types/link-component-type.ts",
+        "./src/common/types/manual-test-status.ts",
+        "./src/common/types/property-bag/column-value-bag.ts",
+        "./src/common/types/property-bag/contrast.ts",
+        "./src/common/types/property-bag/cues.ts",
+        "./src/common/types/property-bag/custom-widgets-property-bag.ts",
+        "./src/common/types/property-bag/default-widget.ts",
+        "./src/common/types/property-bag/image-function.ts",
+        "./src/common/types/property-bag/link-function-property-bag.ts",
+        "./src/common/types/property-bag/link-purpose-property-bag.ts",
+        "./src/common/types/property-bag/meaningful-image.ts",
+        "./src/common/types/property-bag/text-alternative-property-bag.ts",
+        "./src/common/types/property-bag/widget-function-property-bag.ts",
+        "./src/common/types/scan-incomplete-warnings.ts",
+        "./src/common/types/store-data/assessment-result-data.ts",
+        "./src/common/types/store-data/card-selection-store-data.ts",
+        "./src/common/types/store-data/command-store-data.ts",
+        "./src/common/types/store-data/current-panel.ts",
+        "./src/common/types/store-data/details-view-store-data.ts",
+        "./src/common/types/store-data/dev-tool-store-data.ts",
+        "./src/common/types/store-data/displayable-feature-flag.ts",
+        "./src/common/types/store-data/feature-flag-store-data.ts",
+        "./src/common/types/store-data/inspect-store-data.ts",
+        "./src/common/types/store-data/path-snippet-store-data.ts",
+        "./src/common/types/store-data/permissions-state-store-data.ts",
+        "./src/common/types/store-data/scoping-store-data.ts",
+        "./src/common/types/store-data/tab-store-data.ts",
+        "./src/common/types/store-data/user-configuration-store.ts",
+        "./src/common/types/store-data/visualization-store-data.ts",
+        "./src/common/types/store-type.ts",
+        "./src/common/types/store-update-message.ts",
+        "./src/common/types/visualization-type.ts",
+        "./src/common/uid-generator.ts",
+        "./src/common/url-validator.ts",
+        "./src/common/window-utils.ts",
+        "./src/content/guidance-tags.ts",
+        "./src/content/test/common/test-automatically-passed-notice.tsx",
+        "./src/content/test/contrast/state-changes.tsx",
+        "./src/electron/adapters/electron-storage-adapter.ts",
+        "./src/electron/adapters/null-details-view-controller.ts",
+        "./src/electron/adapters/null-store-action-message-creator.ts",
+        "./src/electron/common/electron-telemetry-events.ts",
+        "./src/electron/flux/action/device-action-payloads.ts",
+        "./src/electron/flux/action/route-payloads.ts",
+        "./src/electron/flux/action/window-frame-actions-payloads.ts",
+        "./src/electron/flux/action/window-state-payload.ts",
+        "./src/electron/flux/types/android-setup-store-data.ts",
+        "./src/electron/flux/types/device-connect-state.tsx",
+        "./src/electron/flux/types/device-store-data.ts",
+        "./src/electron/flux/types/scan-status.ts",
+        "./src/electron/flux/types/scan-store-data.ts",
+        "./src/electron/flux/types/window-state-store-data.ts",
+        "./src/electron/ipc/ipc-channel-names.ts",
+        "./src/electron/main/main-window-config.ts",
+        "./src/electron/main/main-window-renderer-message-handlers.ts",
+        "./src/electron/platform/android/android-service-apk-locator.ts",
+        "./src/electron/platform/android/android-service-configurator.ts",
+        "./src/electron/platform/android/appium-adb-creator.ts",
+        "./src/electron/platform/android/appium-service-configurator.ts",
+        "./src/electron/platform/android/device-config.ts",
+        "./src/electron/platform/android/live-appium-adb-creator.ts",
+        "./src/electron/platform/android/setup/android-setup-deps.ts",
+        "./src/electron/platform/android/setup/android-setup-step-id.ts",
+        "./src/electron/views/automated-checks/components/header-section.tsx",
+        "./src/electron/views/bundled-renderer-styles.ts",
+        "./src/electron/views/device-connect-view/components/android-setup/android-setup-spinner.tsx",
+        "./src/electron/views/device-connect-view/components/android-setup/android-setup-step-layout.tsx",
+        "./src/electron/views/device-connect-view/components/android-setup/folder-picker.tsx",
+        "./src/electron/views/device-connect-view/components/device-connect-header.tsx",
+        "./src/electron/views/device-connect-view/components/electron-external-link.tsx",
+        "./src/electron/views/device-disconnected-popup/status-caution-icon.tsx",
+        "./src/electron/views/report/unified-report-head.tsx",
+        "./src/electron/views/screenshot/screenshot.tsx",
+        "./src/injected/constants.ts",
+        "./src/injected/frameCommunicators/error-message-content.ts",
+        "./src/injected/frameCommunicators/window-message.ts",
+        "./src/injected/iframe-detector.ts",
+        "./src/injected/scan-incomplete-warning-detector.ts",
+        "./src/injected/stylesheet-init.ts",
+        "./src/injected/tab-order-property-bag.ts",
+        "./src/injected/visualization/focus-indicator.ts",
+        "./src/injected/visualization/point.ts",
+        "./src/injected/visualization/svg-constants.ts",
+        "./src/injected/visualization/tabbed-item.ts",
+        "./src/issue-filing/common/create-settings-getter.ts",
+        "./src/issue-filing/common/http-query-builder.ts",
+        "./src/issue-filing/common/markup/markup-formatter.ts",
+        "./src/issue-filing/common/markup/plain-text-formatter.ts",
+        "./src/issue-filing/common/markup/truncate-snippet.ts",
+        "./src/issue-filing/services/azure-boards/azure-boards-issue-filing-settings.tsx",
+        "./src/issue-filing/services/github/github-issue-filing-settings.tsx",
+        "./src/issue-filing/services/github/github-url-rectifier.ts",
+        "./src/popup/components/header.tsx",
+        "./src/popup/components/launch-pad-item-row.tsx",
+        "./src/reports/assessment-report.styles.ts",
+        "./src/reports/automated-checks-report.styles.ts",
+        "./src/reports/components/assessment-report-body-header.tsx",
+        "./src/reports/components/assessment-report-footer.tsx",
+        "./src/reports/components/formatted-date.tsx",
+        "./src/reports/components/inline-image.tsx",
+        "./src/reports/components/instance-outcome-type.ts",
+        "./src/reports/components/report-head.tsx",
+        "./src/reports/components/report-sections/body-section.tsx",
+        "./src/reports/components/report-sections/content-container.tsx",
+        "./src/reports/components/report-sections/report-footer.tsx",
+        "./src/reports/components/report-sections/title-section.tsx",
+        "./src/reports/react-static-renderer.ts",
+        "./src/reports/report-name-generator-builder.ts",
+        "./src/reports/report-name-generator.ts",
+        "./src/scanner/axe-options.ts",
+        "./src/scanner/axe-rule-overrides.ts",
+        "./src/scanner/document-utils.ts",
+        "./src/scanner/scan-options.ts",
+        "./src/tests/common/get-automation-id-selector.ts",
+        "./src/tests/electron/common/element-identifiers/common-selectors.ts",
+        "./src/tests/electron/common/view-controllers/spectron-async-client.ts",
+        "./src/tests/electron/setup/test-resource-server-config.ts",
+        "./src/tests/electron/setup/test-setup.ts",
+        "./src/tests/electron/setup/timeouts.ts",
+        "./src/tests/end-to-end/common/element-identifiers/common-selectors.ts",
+        "./src/tests/end-to-end/common/element-identifiers/popup-page-element-identifiers.ts",
+        "./src/tests/end-to-end/common/element-identifiers/target-page-selectors.ts",
+        "./src/tests/end-to-end/common/force-test-failure.ts",
+        "./src/tests/end-to-end/common/prepare-test-result-file-path.ts",
+        "./src/tests/end-to-end/common/timeouts.ts",
+        "./src/tests/end-to-end/setup/test-resource-server-config.ts",
+        "./src/tests/end-to-end/setup/test-setup.ts",
+        "./src/tests/miscellaneous/test-resource-server/resource-server-config.ts",
+        "./src/tests/miscellaneous/test-resource-server/resource-server.ts",
+        "./src/tests/unit/common/axe-internals.ts",
+        "./src/tests/unit/common/base-data-builder.ts",
+        "./src/tests/unit/common/event-stub-factory.ts",
+        "./src/tests/unit/common/html-collection-of-builder.ts",
+        "./src/tests/unit/common/it-is-function.ts",
+        "./src/tests/unit/common/node-list-builder.ts",
+        "./src/tests/unit/common/sample-test-data.ts",
+        "./src/tests/unit/common/test-document-creator.ts",
+        "./src/tests/unit/common/tick.ts",
+        "./src/tests/unit/common/typemoq-helper.ts",
+        "./src/tests/unit/jest-setup.ts",
+        "./src/tests/unit/mock-helpers/chrome-event-mock.ts",
+        "./src/tests/unit/mock-helpers/port-on-disconnect-mock.ts",
+        "./src/tests/unit/mock-helpers/port-on-message-mock.ts",
+        "./src/tests/unit/stubs/chrome-adapter-stub.ts",
+        "./src/tests/unit/stubs/port-stub.ts",
+        "./src/tests/unit/stubs/q-stub.ts",
+        "./src/tests/unit/tests/assessments/common/renderer-wrapper.tsx",
+        "./src/tests/unit/tests/electron/flux/action-creator/scan-result-example.ts",
+        "./src/tests/unit/tests/reports/package/scans/scan-issues.ts",
+        "./src/tests/unit/tests/reports/package/scans/scan-no-issues.ts",
+        "./src/views/content/guidance-title.tsx",
+        "./src/views/content/markup/code-example.tsx"
+    ],
+    "include": [
+        "src/common/action/**/*",
+        "src/common/icons/**/*",
+        "src/common/constants/**/*",
+        "src/common/indexedDB/**/*",
+        "src/common/logging/**/*",
+        "src/common/promises/**/*",
+        "src/common/react/**/*",
+        "src/common/styles/**/*",
+        "src/content/settings/**/*",
+        "src/content/strings/**/*",
+        "src/debug-tools/controllers/**/*",
+        "src/electron/auto-update/**/*",
+        "src/report-export/services/**/*",
+        "src/report-export/types/**/*",
+        "src/icons/**/*",
+        "src/types/**/*",
+        "src/tests/miscellaneous/test-resource-server/**/*"
+    ]
+}

From b0798d815b59f20bd7bb29395ed55f07ddaeb1ec Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 16 Jun 2020 23:42:21 +0000
Subject: [PATCH 28/71] chore(deps-dev): bump terser-webpack-plugin from 3.0.3
 to 3.0.5 (#2889)

---
 package.json |  2 +-
 yarn.lock    | 29 ++++++++++++++++++-----------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index e26703e09c2..8018829edc0 100644
--- a/package.json
+++ b/package.json
@@ -124,7 +124,7 @@
         "simple-git": "^2.6.0",
         "source-map-loader": "^1.0.0",
         "spectron": "^10.0.1",
-        "terser-webpack-plugin": "^3.0.3",
+        "terser-webpack-plugin": "^3.0.5",
         "ts-jest": "^26.1.0",
         "ts-loader": "^7.0.5",
         "tslint": "^5.20.1",
diff --git a/yarn.lock b/yarn.lock
index 77e876dc6f7..ef3296978d0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8007,13 +8007,20 @@ p-finally@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
   integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
-p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.3.0:
+p-limit@^2.0.0, p-limit@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
   integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
   dependencies:
     p-try "^2.0.0"
 
+p-limit@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.0.1.tgz#584784ac0722d1aed09f19f90ed2999af6ce2839"
+  integrity sha512-mw/p92EyOzl2MhauKodw54Rx5ZK4624rNfgNaBguFZkHzyUG9WsDzFF5/yQVEJinbJDdP4jEfMN+uBquiGnaLg==
+  dependencies:
+    p-try "^2.0.0"
+
 p-locate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
@@ -9729,10 +9736,10 @@ serialize-javascript@^2.1.2:
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
   integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
 
-serialize-javascript@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-3.1.0.tgz#8bf3a9170712664ef2561b44b691eafe399214ea"
-  integrity sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==
+serialize-javascript@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
+  integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==
   dependencies:
     randombytes "^2.1.0"
 
@@ -10521,17 +10528,17 @@ terser-webpack-plugin@^1.4.3:
     webpack-sources "^1.4.0"
     worker-farm "^1.7.0"
 
-terser-webpack-plugin@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-3.0.3.tgz#23bda2687b197f878a743373b9411d917adc2e45"
-  integrity sha512-bZFnotuIKq5Rqzrs+qIwFzGdKdffV9epG5vDSEbYzvKAhPeR5RbbrQysfPgbIIMhNAQtZD2hGwBfSKUXjXZZZw==
+terser-webpack-plugin@^3.0.5:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-3.0.5.tgz#f048cfbddd6098b10a8737f3165344529656daad"
+  integrity sha512-pyHUyfQUZB3ciYL81GgXzDh8Qb3fGED77xDjZVSFYSN1cQnWgC51OMPKj7vBWVZx0GGuYhpa9+Vz2KxkzXWhBA==
   dependencies:
     cacache "^15.0.4"
     find-cache-dir "^3.3.1"
     jest-worker "^26.0.0"
-    p-limit "^2.3.0"
+    p-limit "^3.0.1"
     schema-utils "^2.6.6"
-    serialize-javascript "^3.1.0"
+    serialize-javascript "^4.0.0"
     source-map "^0.6.1"
     terser "^4.6.13"
     webpack-sources "^1.4.3"

From ed39cebf72d91d65dbba85374e822c933e88266f Mon Sep 17 00:00:00 2001
From: Wahaj <32555133+waabid@users.noreply.github.com>
Date: Tue, 16 Jun 2020 17:17:50 -0700
Subject: [PATCH 29/71] refactor: clean up css in left nav + requirement link
 scss (#2892)

---
 .../left-nav/details-view-left-nav.scss       | 21 ++++++++-------
 .../components/requirement-link.scss          | 26 +++++++++++++++++++
 .../components/requirement-link.tsx           |  2 +-
 .../requirement-link.test.tsx.snap            |  4 +--
 4 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/src/DetailsView/components/left-nav/details-view-left-nav.scss b/src/DetailsView/components/left-nav/details-view-left-nav.scss
index 23b4d9061cf..a0dc6b6ee12 100644
--- a/src/DetailsView/components/left-nav/details-view-left-nav.scss
+++ b/src/DetailsView/components/left-nav/details-view-left-nav.scss
@@ -6,17 +6,17 @@
 
 :global(.reflow-ui) {
     .left-nav {
-        :global {
-            .ms-Nav-compositeLink {
-                &.is-selected {
+        li {
+            :global {
+                .is-selected {
                     background-color: $communication-tint-20;
                     a,
                     button {
                         background-color: $communication-tint-20 !important;
                     }
                 }
-                &.is-expanded,
-                &.is-expanded + ul {
+                .is-expanded,
+                .is-expanded + ul {
                     background-color: $communication-tint-40;
                     .index-circle {
                         color: $neutral-0;
@@ -24,11 +24,12 @@
                         border-color: $neutral-0;
                     }
                 }
-                &:hover {
-                    a,
-                    button {
-                        background-color: $nav-link-hover !important;
-                    }
+            }
+
+            > div:hover {
+                a,
+                button {
+                    background-color: $nav-link-hover !important;
                 }
             }
         }
diff --git a/src/DetailsView/components/requirement-link.scss b/src/DetailsView/components/requirement-link.scss
index 4c037a3d746..e550f27a75c 100644
--- a/src/DetailsView/components/requirement-link.scss
+++ b/src/DetailsView/components/requirement-link.scss
@@ -1,5 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
+
+@import '../../common/styles/colors.scss';
+
 .req-description {
     line-height: initial;
     text-align: left;
@@ -18,3 +21,26 @@
         margin-right: 3px;
     }
 }
+
+.requirement-link {
+    :global {
+        .status-icon {
+            color: $primary-text;
+            margin-left: 24px;
+            font-size: 18px;
+            &.negative-outcome-icon {
+                color: $negative-outcome;
+            }
+            &.positive-outcome-icon {
+                color: $positive-outcome;
+            }
+        }
+    }
+
+    display: flex;
+    flex-wrap: nowrap;
+    justify-content: flex-start;
+    height: 100%;
+    align-items: center;
+    width: 100%;
+}
diff --git a/src/DetailsView/components/requirement-link.tsx b/src/DetailsView/components/requirement-link.tsx
index bc6f5241443..6eb2add9159 100644
--- a/src/DetailsView/components/requirement-link.tsx
+++ b/src/DetailsView/components/requirement-link.tsx
@@ -17,7 +17,7 @@ export interface RequirementLinkProps {
 export class RequirementLink extends React.Component<RequirementLinkProps> {
     public render(): JSX.Element {
         return (
-            <span className={'button-flex-container'} aria-hidden="true">
+            <span className={styles.requirementLink} aria-hidden="true">
                 {this.props.renderRequirementDescription(this)}
                 <StatusIcon status={this.props.status} level="requirement" />
             </span>
diff --git a/src/tests/unit/tests/DetailsView/components/__snapshots__/requirement-link.test.tsx.snap b/src/tests/unit/tests/DetailsView/components/__snapshots__/requirement-link.test.tsx.snap
index 6def7f74d8d..b88b0e0291a 100644
--- a/src/tests/unit/tests/DetailsView/components/__snapshots__/requirement-link.test.tsx.snap
+++ b/src/tests/unit/tests/DetailsView/components/__snapshots__/requirement-link.test.tsx.snap
@@ -3,7 +3,7 @@
 exports[`RequirementLink renders with index 1`] = `
 <span
   aria-hidden="true"
-  className="button-flex-container"
+  className="requirementLink"
 >
   <span
     className="ms-Button-label reqDescription"
@@ -33,7 +33,7 @@ exports[`RequirementLink renders with index 1`] = `
 exports[`RequirementLink renders without index 1`] = `
 <span
   aria-hidden="true"
-  className="button-flex-container"
+  className="requirementLink"
 >
   <span
     className="ms-Button-label reqDescription"

From 8a8f4846ce109ec10cf9be7eb9c7a5f20606f99a Mon Sep 17 00:00:00 2001
From: Wahaj <32555133+waabid@users.noreply.github.com>
Date: Tue, 16 Jun 2020 19:37:26 -0700
Subject: [PATCH 30/71] refactor: remove buttonflexcontainer classes and add
 css modules instead (#2893)

* refactor: remove buttonflexcontainer classes and add css modules instead

* remove not used scss
---
 src/DetailsView/Styles/detailsview.scss       | 23 ------------------
 .../left-nav/common-left-nav-link.scss        | 24 +++++++++++++++++++
 .../left-nav/details-view-left-nav.scss       | 19 ---------------
 .../left-nav/nav-link-renderer.scss           |  6 +----
 .../components/left-nav/nav-link-renderer.tsx |  3 ++-
 .../left-nav/overview-left-nav-link.tsx       |  6 ++---
 .../left-nav/test-view-left-nav-link.tsx      |  4 ++--
 .../components/requirement-link.tsx           |  1 -
 .../nav-link-renderer.test.tsx.snap           |  1 +
 .../overview-left-nav-link.test.tsx.snap      |  4 ++--
 .../test-view-left-nav-link.test.tsx.snap     |  2 +-
 11 files changed, 36 insertions(+), 57 deletions(-)
 create mode 100644 src/DetailsView/components/left-nav/common-left-nav-link.scss

diff --git a/src/DetailsView/Styles/detailsview.scss b/src/DetailsView/Styles/detailsview.scss
index b84bce77806..428a2bb9061 100644
--- a/src/DetailsView/Styles/detailsview.scss
+++ b/src/DetailsView/Styles/detailsview.scss
@@ -279,17 +279,6 @@ div.insights-file-issue-details-dialog-container {
             .ms-Nav-navItems {
                 margin-bottom: 0px;
             }
-            .button-flex-container .status-icon {
-                color: $primary-text;
-                margin-left: 24px;
-                font-size: 18px;
-                &.negative-outcome-icon {
-                    color: $negative-outcome;
-                }
-                &.positive-outcome-icon {
-                    color: $positive-outcome;
-                }
-            }
         }
         .test-step-view {
             padding-left: 0.75vw;
@@ -397,11 +386,6 @@ div.insights-file-issue-details-dialog-container {
             padding-left: calc(0.5vw + 13px); // 13px is Chevron width.
         }
         .test-step-nav {
-            .ms-Nav-compositeLink {
-                .button-flex-container {
-                    width: 100%;
-                }
-            }
             z-index: 100;
             background-color: $neutral-0;
             .index-circle {
@@ -425,13 +409,6 @@ div.insights-file-issue-details-dialog-container {
                 .ms-Button-label {
                     color: $neutral-100;
                 }
-                .button-flex-container {
-                    display: flex;
-                    flex-wrap: nowrap;
-                    justify-content: flex-start;
-                    height: 100%;
-                    align-items: center;
-                }
                 &.is-selected {
                     a {
                         background-color: $communication-tint-40;
diff --git a/src/DetailsView/components/left-nav/common-left-nav-link.scss b/src/DetailsView/components/left-nav/common-left-nav-link.scss
new file mode 100644
index 00000000000..f424b86c19e
--- /dev/null
+++ b/src/DetailsView/components/left-nav/common-left-nav-link.scss
@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+@import '../../../common/styles/colors.scss';
+@import '../../../common/styles/common.scss';
+
+:global(.is-selected) .left-nav-link-container {
+    color: $always-black;
+}
+
+.left-nav-link-container {
+    padding-left: 5%;
+    padding-right: 8%;
+    width: $detailsViewLeftNavWidth;
+    color: $primary-text;
+    display: flex;
+    flex-wrap: nowrap;
+    justify-content: flex-start;
+    height: 100%;
+    align-items: center;
+    .link-icon {
+        font-size: 24px;
+    }
+}
diff --git a/src/DetailsView/components/left-nav/details-view-left-nav.scss b/src/DetailsView/components/left-nav/details-view-left-nav.scss
index a0dc6b6ee12..365427a0e7d 100644
--- a/src/DetailsView/components/left-nav/details-view-left-nav.scss
+++ b/src/DetailsView/components/left-nav/details-view-left-nav.scss
@@ -55,18 +55,6 @@
         .ms-Nav-groupContent {
             margin-bottom: 0px;
         }
-        .is-selected .button-flex-container {
-            color: $always-black;
-        }
-        .button-flex-container {
-            padding-left: 5%;
-            padding-right: 8%;
-            width: $detailsViewLeftNavWidth;
-            color: $primary-text;
-            .status-icon {
-                font-size: 24px;
-            }
-        }
         .ms-Nav-link {
             height: fit-content;
         }
@@ -114,13 +102,6 @@
             .ms-Button-label {
                 color: $neutral-100;
             }
-            .button-flex-container {
-                display: flex;
-                flex-wrap: nowrap;
-                justify-content: flex-start;
-                height: 100%;
-                align-items: center;
-            }
             .index-circle {
                 color: $secondary-text;
                 background: $neutral-0;
diff --git a/src/DetailsView/components/left-nav/nav-link-renderer.scss b/src/DetailsView/components/left-nav/nav-link-renderer.scss
index 701b1fc1c91..fa365b26628 100644
--- a/src/DetailsView/components/left-nav/nav-link-renderer.scss
+++ b/src/DetailsView/components/left-nav/nav-link-renderer.scss
@@ -1,10 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-/*
-Specificity due to clashes with details-view.scss & avoiding use of !important
-*/
-:global(#details-container .details-view-body-nav-content-layout .left-nav .button-flex-container)
-    .requirement-status-icon {
+.requirement-status-icon {
     font-size: 20px;
 }
diff --git a/src/DetailsView/components/left-nav/nav-link-renderer.tsx b/src/DetailsView/components/left-nav/nav-link-renderer.tsx
index 728a8bf0d33..c27c3a9b7fa 100644
--- a/src/DetailsView/components/left-nav/nav-link-renderer.tsx
+++ b/src/DetailsView/components/left-nav/nav-link-renderer.tsx
@@ -7,6 +7,7 @@ import {
     AssessmentLeftNavLink,
     TestRequirementLeftNavLink,
 } from 'DetailsView/components/left-nav/assessment-left-nav';
+import * as commonLeftNavLinkStyles from 'DetailsView/components/left-nav/common-left-nav-link.scss';
 import { GettingStartedNavLink } from 'DetailsView/components/left-nav/getting-started-nav-link';
 import { LeftNavIndexIcon, LeftNavStatusIcon } from 'DetailsView/components/left-nav/left-nav-icon';
 import * as styles from 'DetailsView/components/left-nav/nav-link-renderer.scss';
@@ -48,6 +49,6 @@ export class NavLinkRenderer {
             return <LeftNavIndexIcon item={link} />;
         }
 
-        return <LeftNavStatusIcon item={link} />;
+        return <LeftNavStatusIcon className={commonLeftNavLinkStyles.linkIcon} item={link} />;
     };
 }
diff --git a/src/DetailsView/components/left-nav/overview-left-nav-link.tsx b/src/DetailsView/components/left-nav/overview-left-nav-link.tsx
index 3605d611e1e..b59f7663408 100644
--- a/src/DetailsView/components/left-nav/overview-left-nav-link.tsx
+++ b/src/DetailsView/components/left-nav/overview-left-nav-link.tsx
@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 import { css } from '@uifabric/utilities';
+import * as styles from 'DetailsView/components/left-nav/common-left-nav-link.scss';
 import { Icon } from 'office-ui-fabric-react';
 import * as React from 'react';
-
 import { NamedFC } from '../../../common/react/named-fc';
 import { BaseLeftNavLinkProps } from '../base-left-nav';
 
@@ -11,9 +11,9 @@ export const OverviewLeftNavLink = NamedFC<Pick<BaseLeftNavLinkProps, 'link'>>(
     'OverviewLeftNavLink',
     ({ link }) => {
         return (
-            <span className={'button-flex-container'} aria-hidden="true">
+            <span className={styles.leftNavLinkContainer} aria-hidden="true">
                 <span>
-                    <Icon iconName="home" className={css('status-icon', 'dark-gray')} />
+                    <Icon iconName="home" className={css(styles.linkIcon, 'dark-gray')} />
                 </span>
                 <span className="ms-Button-label overview-label">
                     <span className="overview-name">{link.name}</span>
diff --git a/src/DetailsView/components/left-nav/test-view-left-nav-link.tsx b/src/DetailsView/components/left-nav/test-view-left-nav-link.tsx
index e101b219c07..aceb3f521a3 100644
--- a/src/DetailsView/components/left-nav/test-view-left-nav-link.tsx
+++ b/src/DetailsView/components/left-nav/test-view-left-nav-link.tsx
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
+import * as styles from 'DetailsView/components/left-nav/common-left-nav-link.scss';
 import * as React from 'react';
-
 import { NamedFC } from '../../../common/react/named-fc';
 import { BaseLeftNavLinkProps } from '../base-left-nav';
 
@@ -9,7 +9,7 @@ export const TestViewLeftNavLink = NamedFC<BaseLeftNavLinkProps>(
     'TestViewLeftNavLink',
     ({ link, renderIcon }) => {
         return (
-            <span className={'button-flex-container'} aria-hidden="true">
+            <span className={styles.leftNavLinkContainer} aria-hidden="true">
                 {renderIcon(link)}
                 <span className={'ms-Button-label test-name'}>{link.name}</span>
             </span>
diff --git a/src/DetailsView/components/requirement-link.tsx b/src/DetailsView/components/requirement-link.tsx
index 6eb2add9159..1fcf16b9ba0 100644
--- a/src/DetailsView/components/requirement-link.tsx
+++ b/src/DetailsView/components/requirement-link.tsx
@@ -3,7 +3,6 @@
 import { css } from '@uifabric/utilities';
 import { INavLink } from 'office-ui-fabric-react';
 import * as React from 'react';
-
 import { ManualTestStatus } from '../../common/types/manual-test-status';
 import * as styles from './requirement-link.scss';
 import { StatusIcon } from './status-icon';
diff --git a/src/tests/unit/tests/DetailsView/components/left-nav/__snapshots__/nav-link-renderer.test.tsx.snap b/src/tests/unit/tests/DetailsView/components/left-nav/__snapshots__/nav-link-renderer.test.tsx.snap
index 5a303270c1d..88458a09320 100644
--- a/src/tests/unit/tests/DetailsView/components/left-nav/__snapshots__/nav-link-renderer.test.tsx.snap
+++ b/src/tests/unit/tests/DetailsView/components/left-nav/__snapshots__/nav-link-renderer.test.tsx.snap
@@ -26,6 +26,7 @@ exports[`NavLinkRenderer renderAssessmentTestLink render status icon with link 1
 
 exports[`NavLinkRenderer renderAssessmentTestLink render status icon with link 2`] = `
 <LeftNavStatusIcon
+  className="linkIcon"
   item={
     Object {
       "status": 0,
diff --git a/src/tests/unit/tests/DetailsView/components/left-nav/__snapshots__/overview-left-nav-link.test.tsx.snap b/src/tests/unit/tests/DetailsView/components/left-nav/__snapshots__/overview-left-nav-link.test.tsx.snap
index cc16295918e..950afd4f0ef 100644
--- a/src/tests/unit/tests/DetailsView/components/left-nav/__snapshots__/overview-left-nav-link.test.tsx.snap
+++ b/src/tests/unit/tests/DetailsView/components/left-nav/__snapshots__/overview-left-nav-link.test.tsx.snap
@@ -3,11 +3,11 @@
 exports[`OverviewLeftNavLink renders 1`] = `
 <span
   aria-hidden="true"
-  className="button-flex-container"
+  className="leftNavLinkContainer"
 >
   <span>
     <StyledIconBase
-      className="status-icon dark-gray"
+      className="linkIcon dark-gray"
       iconName="home"
     />
   </span>
diff --git a/src/tests/unit/tests/DetailsView/components/left-nav/__snapshots__/test-view-left-nav-link.test.tsx.snap b/src/tests/unit/tests/DetailsView/components/left-nav/__snapshots__/test-view-left-nav-link.test.tsx.snap
index 97ebeec6555..d9aa09031ca 100644
--- a/src/tests/unit/tests/DetailsView/components/left-nav/__snapshots__/test-view-left-nav-link.test.tsx.snap
+++ b/src/tests/unit/tests/DetailsView/components/left-nav/__snapshots__/test-view-left-nav-link.test.tsx.snap
@@ -3,7 +3,7 @@
 exports[`TestViewLeftNavLink renders 1`] = `
 <span
   aria-hidden="true"
-  className="button-flex-container"
+  className="leftNavLinkContainer"
 >
   <i>
     test-props-renderIcon

From 47821c886f32af2bac9371905d69194602394465 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 17 Jun 2020 15:26:21 +0000
Subject: [PATCH 31/71] chore(deps): bump appium-adb from 8.6.0 to 8.6.1
 (#2894)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 8018829edc0..c0970921d3c 100644
--- a/package.json
+++ b/package.json
@@ -139,7 +139,7 @@
     },
     "dependencies": {
         "accessibility-insights-for-android-service-bin": "^1.2.0",
-        "appium-adb": "^8.6.0",
+        "appium-adb": "^8.6.1",
         "applicationinsights-js": "^1.0.21",
         "axe-core": "3.5.1",
         "axios": "^0.19.2",
diff --git a/yarn.lock b/yarn.lock
index ef3296978d0..f87a6e51e3d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1759,10 +1759,10 @@ app-builder-lib@22.7.0, app-builder-lib@^22.6.1:
     semver "^7.3.2"
     temp-file "^3.3.7"
 
-appium-adb@^8.6.0:
-  version "8.6.0"
-  resolved "https://registry.yarnpkg.com/appium-adb/-/appium-adb-8.6.0.tgz#c172f0961108845e9dc200c414ac770d40183955"
-  integrity sha512-LLNjpJyebJvJiyewil5j32I3Zjp0T8QY+kRdtosEM3bFALYzKbBXbZildhzuDPN+5g2+FTb2rLd/KbyPo/ZjGw==
+appium-adb@^8.6.1:
+  version "8.6.1"
+  resolved "https://registry.yarnpkg.com/appium-adb/-/appium-adb-8.6.1.tgz#1cb41c2f98ce40fccdf84c23dc65cc34f18dc2b2"
+  integrity sha512-Klz6M05dA1xKfoUVURTCx6tfaIUl/IoLDekI/g06PBhUB5AcaxfmZirY+ZMcTcc8uGr0CN9pqIqI7GvhSMjxhg==
   dependencies:
     "@babel/runtime" "^7.0.0"
     adbkit-apkreader "^3.1.2"

From f38d104fb5d90b3b2b82cbc8401c628516aaee7b Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 17 Jun 2020 17:19:54 +0000
Subject: [PATCH 32/71] chore(deps-dev): bump @types/react from 16.9.36 to
 16.9.37 (#2898)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index c0970921d3c..511e21ccef6 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
         "@types/moment": "^2.13.0",
         "@types/puppeteer": "^3.0.0",
         "@types/q": "^1.5.4",
-        "@types/react": "^16.9.36",
+        "@types/react": "^16.9.37",
         "@types/react-copy-to-clipboard": "^4.3.0",
         "@types/react-dom": "^16.9.8",
         "@types/react-helmet": "^6.0.0",
diff --git a/yarn.lock b/yarn.lock
index f87a6e51e3d..89646f44bb3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1232,10 +1232,10 @@
     "@types/history" "*"
     "@types/react" "*"
 
-"@types/react@*", "@types/react@^16.9.36":
-  version "16.9.36"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.36.tgz#ade589ff51e2a903e34ee4669e05dbfa0c1ce849"
-  integrity sha512-mGgUb/Rk/vGx4NCvquRuSH0GHBQKb1OqpGS9cT9lFxlTLHZgkksgI60TuIxubmn7JuCb+sENHhQciqa0npm0AQ==
+"@types/react@*", "@types/react@^16.9.37":
+  version "16.9.37"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.37.tgz#8fb93e7dbd5b1d3796f69aa979a7fe0439bc7bea"
+  integrity sha512-ZqnAXallQiZ08LTSqMfWMNvAfJEzRLOxdlbbbCIJlYGjU98BEU6bE2uBpKPGeWn+v3hIgCraHKtqUcKZBzMP/Q==
   dependencies:
     "@types/prop-types" "*"
     csstype "^2.2.0"

From 0ee82f5b70a4e5f4e10bca229265bdccd80054a3 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 17 Jun 2020 17:20:07 +0000
Subject: [PATCH 33/71] chore(deps-dev): bump simple-git from 2.6.0 to 2.7.0
 (#2896)

---
 package.json |  2 +-
 yarn.lock    | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 511e21ccef6..dae67c79301 100644
--- a/package.json
+++ b/package.json
@@ -121,7 +121,7 @@
         "sass-loader": "^8.0.2",
         "script-loader": "0.7.2",
         "serve-static": "^1.13.2",
-        "simple-git": "^2.6.0",
+        "simple-git": "^2.7.0",
         "source-map-loader": "^1.0.0",
         "spectron": "^10.0.1",
         "terser-webpack-plugin": "^3.0.5",
diff --git a/yarn.lock b/yarn.lock
index 89646f44bb3..aae52f1ac56 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -869,6 +869,13 @@
     core-js "^3.4.1"
     regenerator-runtime "^0.13.3"
 
+"@kwsites/file-exists@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@kwsites/file-exists/-/file-exists-1.1.1.tgz#ad1efcac13e1987d8dbaf235ef3be5b0d96faa99"
+  integrity sha512-m9/5YGR18lIwxSFDwfE3oA7bWuq9kdau6ugN4H2rJeyhFQZcG9AgSHkQtSD15a8WvTgfz9aikZMrKPHvbpqFiw==
+  dependencies:
+    debug "^4.1.1"
+
 "@microsoft/load-themed-styles@^1.10.26":
   version "1.10.29"
   resolved "https://registry.yarnpkg.com/@microsoft/load-themed-styles/-/load-themed-styles-1.10.29.tgz#2d8505a36b70a2efff9f03a842843d9d9ca31cd3"
@@ -9832,10 +9839,13 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
   integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
 
-simple-git@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-2.6.0.tgz#04b554d1038e6036af2ae4d67a30bc5fd75f4fcd"
-  integrity sha512-eplWRfu6RTfoAzGl7I0+g06MvYauXaNpjeuhFiOYZO9hevnH54RkkStOkEevWwqBWfdzWNO9ocffbdtxFzBqXQ==
+simple-git@^2.7.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-2.7.0.tgz#b555392021f5553c14530c917eae1d6f914b1672"
+  integrity sha512-NpNNe0hOz3DMRWB9ewK83p/nMAkGrNO/VlWhMDaI3OdUO3UNoMv5+XlMOzO52jCyl+RZbVrIuNMpxtR4C1TQXw==
+  dependencies:
+    "@kwsites/file-exists" "^1.1.1"
+    debug "^4.1.1"
 
 single-line-log@^1.1.2:
   version "1.1.2"

From 585490523f7ba8b8bcc1d08df26a65ece2d367b0 Mon Sep 17 00:00:00 2001
From: Karan <karansin@microsoft.com>
Date: Wed, 17 Jun 2020 10:34:08 -0700
Subject: [PATCH 34/71]  feat(android-setup): add android setup UI component
 for detect-permissions (#2899)

---
 .../android-setup/android-setup-types.ts      |  6 +-----
 .../default-android-setup-components.ts       |  2 ++
 .../android-setup/detect-permissions-step.tsx | 17 +++++++++++++++++
 .../detect-permissions-step.test.tsx.snap     | 19 +++++++++++++++++++
 .../android-setup-step-container.test.tsx     | 19 +++++++++++--------
 .../detect-permissions-step.test.tsx          | 15 +++++++++++++++
 6 files changed, 65 insertions(+), 13 deletions(-)
 create mode 100644 src/electron/views/device-connect-view/components/android-setup/detect-permissions-step.tsx
 create mode 100644 src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/detect-permissions-step.test.tsx.snap
 create mode 100644 src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/detect-permissions-step.test.tsx

diff --git a/src/electron/views/device-connect-view/components/android-setup/android-setup-types.ts b/src/electron/views/device-connect-view/components/android-setup/android-setup-types.ts
index e9e44b8d41a..4a639655a29 100644
--- a/src/electron/views/device-connect-view/components/android-setup/android-setup-types.ts
+++ b/src/electron/views/device-connect-view/components/android-setup/android-setup-types.ts
@@ -24,8 +24,4 @@ export type AndroidSetupPageDeps = {
     startTesting: () => void;
 } & FolderPickerDeps;
 
-// 'Partial' is used to allow missing step IDs as they get implemented.
-// Once all step IDs have components, we should remove 'Partial'
-export type AndroidSetupStepComponentProvider = Partial<
-    Record<AndroidSetupStepId, AndroidSetupStep>
->;
+export type AndroidSetupStepComponentProvider = Record<AndroidSetupStepId, AndroidSetupStep>;
diff --git a/src/electron/views/device-connect-view/components/android-setup/default-android-setup-components.ts b/src/electron/views/device-connect-view/components/android-setup/default-android-setup-components.ts
index 071168920ce..ed6d40958ce 100644
--- a/src/electron/views/device-connect-view/components/android-setup/default-android-setup-components.ts
+++ b/src/electron/views/device-connect-view/components/android-setup/default-android-setup-components.ts
@@ -3,6 +3,7 @@
 import { AndroidSetupStepComponentProvider } from 'electron/views/device-connect-view/components/android-setup/android-setup-types';
 import { DetectAdbStep } from 'electron/views/device-connect-view/components/android-setup/detect-adb-step';
 import { DetectDevicesStep } from 'electron/views/device-connect-view/components/android-setup/detect-devices-step';
+import { DetectPermissionsStep } from 'electron/views/device-connect-view/components/android-setup/detect-permissions-step';
 import { DetectServiceStep } from 'electron/views/device-connect-view/components/android-setup/detect-service-step';
 import { InstallingServiceStep } from 'electron/views/device-connect-view/components/android-setup/installing-service-step';
 import { PromptChooseDeviceStep } from 'electron/views/device-connect-view/components/android-setup/prompt-choose-device-step';
@@ -21,6 +22,7 @@ export const defaultAndroidSetupComponents: AndroidSetupStepComponentProvider =
     'prompt-install-service': PromptInstallServiceStep,
     'prompt-install-failed': PromptInstallFailedStep,
     'prompt-grant-permissions': PromptGrantPermissionsStep,
+    'detect-permissions': DetectPermissionsStep,
     'installing-service': InstallingServiceStep,
     'detect-devices': DetectDevicesStep,
     'detect-service': DetectServiceStep,
diff --git a/src/electron/views/device-connect-view/components/android-setup/detect-permissions-step.tsx b/src/electron/views/device-connect-view/components/android-setup/detect-permissions-step.tsx
new file mode 100644
index 00000000000..3e43975f7ae
--- /dev/null
+++ b/src/electron/views/device-connect-view/components/android-setup/detect-permissions-step.tsx
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+import { NamedFC } from 'common/react/named-fc';
+import * as React from 'react';
+import { AndroidSetupSpinnerStep } from './android-setup-spinner-step';
+import { CommonAndroidSetupStepProps } from './android-setup-types';
+
+export const DetectPermissionsStep = NamedFC<CommonAndroidSetupStepProps>(
+    'DetectPermissionsStep',
+    (props: CommonAndroidSetupStepProps) => {
+        return (
+            <main>
+                <AndroidSetupSpinnerStep deps={props.deps} spinnerLabel="Checking permissions..." />
+            </main>
+        );
+    },
+);
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/detect-permissions-step.test.tsx.snap b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/detect-permissions-step.test.tsx.snap
new file mode 100644
index 00000000000..64d218812d6
--- /dev/null
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/detect-permissions-step.test.tsx.snap
@@ -0,0 +1,19 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`DetectDevicesStep renders 1`] = `
+<main>
+  <AndroidSetupSpinnerStep
+    deps={
+      Object {
+        "LinkComponent": [Function],
+        "androidSetupActionCreator": null,
+        "androidSetupStepComponentProvider": null,
+        "closeApp": null,
+        "showOpenFileDialog": null,
+        "startTesting": null,
+      }
+    }
+    spinnerLabel="Checking permissions..."
+  />
+</main>
+`;
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/android-setup-step-container.test.tsx b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/android-setup-step-container.test.tsx
index 10f0a216046..8e2bede0a1f 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/android-setup-step-container.test.tsx
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/android-setup-step-container.test.tsx
@@ -2,20 +2,23 @@
 // Licensed under the MIT License.
 import { NamedFC } from 'common/react/named-fc';
 import { AndroidSetupStepContainer } from 'electron/views/device-connect-view/components/android-setup/android-setup-step-container';
+import { AndroidSetupStepComponentProvider } from 'electron/views/device-connect-view/components/android-setup/android-setup-types';
 import { render, shallow } from 'enzyme';
 import * as React from 'react';
 import { AndroidSetupStepPropsBuilder } from 'tests/unit/common/android-setup-step-props-builder';
 
 describe('AndroidSetupStepContainer', () => {
+    const provider = {
+        'detect-adb': NamedFC('DetectTestComponent', p => (
+            <>test component A {p.androidSetupStoreData.currentStepId}</>
+        )),
+        'prompt-locate-adb': NamedFC('PromptTestComponent', p => (
+            <>test component B {p.androidSetupStoreData.currentStepId}</>
+        )),
+    } as AndroidSetupStepComponentProvider;
+
     const props = new AndroidSetupStepPropsBuilder('detect-adb')
-        .withDep('androidSetupStepComponentProvider', {
-            'detect-adb': NamedFC('DetectTestComponent', p => (
-                <>test component A {p.androidSetupStoreData.currentStepId}</>
-            )),
-            'prompt-locate-adb': NamedFC('PromptTestComponent', p => (
-                <>test component B {p.androidSetupStoreData.currentStepId}</>
-            )),
-        })
+        .withDep('androidSetupStepComponentProvider', provider)
         .build();
 
     it('passes common props and deps through', () => {
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/detect-permissions-step.test.tsx b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/detect-permissions-step.test.tsx
new file mode 100644
index 00000000000..e1c26c6d600
--- /dev/null
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/detect-permissions-step.test.tsx
@@ -0,0 +1,15 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+import { DetectPermissionsStep } from 'electron/views/device-connect-view/components/android-setup/detect-permissions-step';
+import { shallow } from 'enzyme';
+import * as React from 'react';
+import { AndroidSetupStepPropsBuilder } from 'tests/unit/common/android-setup-step-props-builder';
+
+describe('DetectDevicesStep', () => {
+    const props = new AndroidSetupStepPropsBuilder('detect-permissions').build();
+
+    it('renders', () => {
+        const rendered = shallow(<DetectPermissionsStep {...props} />);
+        expect(rendered.getElement()).toMatchSnapshot();
+    });
+});

From 8edde43d54db6bb979f7c9403ff14c7875d51059 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 17 Jun 2020 18:23:09 +0000
Subject: [PATCH 35/71] chore(deps): bump electron-log from 4.2.1 to 4.2.2
 (#2895)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index dae67c79301..29bb2953b08 100644
--- a/package.json
+++ b/package.json
@@ -145,7 +145,7 @@
         "axios": "^0.19.2",
         "classnames": "^2.2.6",
         "electron": "8.2.2",
-        "electron-log": "^4.2.1",
+        "electron-log": "^4.2.2",
         "electron-updater": "^4.3.1",
         "idb-keyval": "^3.2.0",
         "lodash": "^4.17.15",
diff --git a/yarn.lock b/yarn.lock
index aae52f1ac56..867f40e8db0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3867,10 +3867,10 @@ electron-download@^4.1.0, electron-download@^4.1.1:
     semver "^5.4.1"
     sumchecker "^2.0.2"
 
-electron-log@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-4.2.1.tgz#a5e9f5b7a9c8cffb6ae5af78b76e68012d5e68da"
-  integrity sha512-tUI9w3kUP3qhwXJ92RDUPFVZfwtBwKCy/1TsSHndXYLlNCB/7+vkiQG0uxv9D2Leuxc/DJKfYyrdEBpzi/vyZg==
+electron-log@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-4.2.2.tgz#b358dc6d1e4772465609ee3d8ad9f594d9e742c8"
+  integrity sha512-lBpLh1Q8qayrTxFIrTPcNjSHsosvUfOYyZ8glhiLcx7zCNPDGuj8+nXlEaaSS6LRiQQbLgLG+wKpuvztNzBIrA==
 
 electron-publish@22.7.0:
   version "22.7.0"

From b7398dbb7a2ee04cc1326218c908c2be23fe6002 Mon Sep 17 00:00:00 2001
From: Dave Tryon <45672944+DaveTryon@users.noreply.github.com>
Date: Wed, 17 Jun 2020 11:30:00 -0700
Subject: [PATCH 36/71] feat(android-setup): Fix adbLocation-related problems
 (#2900)

---
 .../register-user-configuration-message-callbacks.ts  |  6 +++---
 .../user-configuration-action-creator.ts              |  4 +++-
 .../platform/android/setup/steps/prompt-locate-adb.ts |  2 +-
 .../action-creator-test-helpers.ts                    | 11 +++++++++--
 .../user-configuration-action-creator.test.ts         |  5 ++++-
 .../android/setup/steps/prompt-locate-adb.test.ts     |  2 +-
 6 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/background/global-action-creators/registrar/register-user-configuration-message-callbacks.ts b/src/background/global-action-creators/registrar/register-user-configuration-message-callbacks.ts
index c4e9eb3ba52..4377ced05f5 100644
--- a/src/background/global-action-creators/registrar/register-user-configuration-message-callbacks.ts
+++ b/src/background/global-action-creators/registrar/register-user-configuration-message-callbacks.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 import { getStoreStateMessage, Messages } from '../../../common/messages';
 import { StoreNames } from '../../../common/stores/store-names';
-import { SetTelemetryStatePayload } from '../../actions/action-payloads';
+import { SetAdbLocationPayload, SetTelemetryStatePayload } from '../../actions/action-payloads';
 import { Interpreter } from '../../interpreter';
 import { UserConfigurationActionCreator } from '../user-configuration-action-creator';
 
@@ -38,8 +38,8 @@ export const registerUserConfigurationMessageCallback = (
         Messages.UserConfig.SaveIssueFilingSettings,
         userConfigurationActionCreator.saveIssueFilingSettings,
     );
-    interpreter.registerTypeToPayloadCallback(
+    interpreter.registerTypeToPayloadCallback<SetAdbLocationPayload>(
         Messages.UserConfig.SetAdbLocationConfig,
-        userConfigurationActionCreator.setAdbLocation,
+        payload => userConfigurationActionCreator.setAdbLocation(payload.adbLocation),
     );
 };
diff --git a/src/background/global-action-creators/user-configuration-action-creator.ts b/src/background/global-action-creators/user-configuration-action-creator.ts
index 37b7e730ebb..3b9dc5be962 100644
--- a/src/background/global-action-creators/user-configuration-action-creator.ts
+++ b/src/background/global-action-creators/user-configuration-action-creator.ts
@@ -10,6 +10,8 @@ import {
 import { UserConfigurationActions } from '../actions/user-configuration-actions';
 
 export class UserConfigurationActionCreator {
+    private readonly currentScope: string = 'UserConfigurationActionCreator';
+
     constructor(private readonly userConfigActions: UserConfigurationActions) {}
 
     public getUserConfigurationState = () => this.userConfigActions.getCurrentState.invoke(null);
@@ -33,5 +35,5 @@ export class UserConfigurationActionCreator {
         this.userConfigActions.saveIssueFilingSettings.invoke(payload);
 
     public setAdbLocation = (adbLocation: string) =>
-        this.userConfigActions.setAdbLocation.invoke(adbLocation);
+        this.userConfigActions.setAdbLocation.invoke(adbLocation, this.currentScope);
 }
diff --git a/src/electron/platform/android/setup/steps/prompt-locate-adb.ts b/src/electron/platform/android/setup/steps/prompt-locate-adb.ts
index 38db3d2e70a..6faf3342e97 100644
--- a/src/electron/platform/android/setup/steps/prompt-locate-adb.ts
+++ b/src/electron/platform/android/setup/steps/prompt-locate-adb.ts
@@ -8,7 +8,7 @@ export const promptLocateAdb: AndroidSetupStepConfig = deps => {
         actions: {
             saveAdbPath: (path: string) => {
                 deps.setAdbPath(path);
-                deps.stepTransition('prompt-connect-to-device');
+                deps.stepTransition('detect-adb');
             },
         },
     };
diff --git a/src/tests/unit/tests/background/global-action-creators/action-creator-test-helpers.ts b/src/tests/unit/tests/background/global-action-creators/action-creator-test-helpers.ts
index 8e7818e8830..72ffade04b9 100644
--- a/src/tests/unit/tests/background/global-action-creators/action-creator-test-helpers.ts
+++ b/src/tests/unit/tests/background/global-action-creators/action-creator-test-helpers.ts
@@ -5,9 +5,16 @@ import { Action } from 'common/flux/action';
 import { isFunction } from 'lodash';
 import { IMock, It, Mock, Times } from 'typemoq';
 
-export const createActionMock = <Payload>(payload: Payload): IMock<Action<Payload>> => {
+export const createActionMock = <Payload>(
+    payload: Payload,
+    scope: string = null,
+): IMock<Action<Payload>> => {
     const actionMock = Mock.ofType<Action<Payload>>(Action);
-    actionMock.setup(action => action.invoke(payload)).verifiable(Times.once());
+    if (scope) {
+        actionMock.setup(action => action.invoke(payload, scope)).verifiable(Times.once());
+    } else {
+        actionMock.setup(action => action.invoke(payload)).verifiable(Times.once());
+    }
     return actionMock;
 };
 
diff --git a/src/tests/unit/tests/background/global-action-creators/user-configuration-action-creator.test.ts b/src/tests/unit/tests/background/global-action-creators/user-configuration-action-creator.test.ts
index bb8f2f29dc6..cd580daae4b 100644
--- a/src/tests/unit/tests/background/global-action-creators/user-configuration-action-creator.test.ts
+++ b/src/tests/unit/tests/background/global-action-creators/user-configuration-action-creator.test.ts
@@ -120,7 +120,10 @@ describe('UserConfigurationActionCreator', () => {
     it('should SetAdbLocation Message', () => {
         const expectedAdbLocation = 'Somewhere over the rainbow';
 
-        const setAdbLocationConfigMock = createActionMock(expectedAdbLocation);
+        const setAdbLocationConfigMock = createActionMock(
+            expectedAdbLocation,
+            'UserConfigurationActionCreator',
+        );
         const actionsMock = createActionsMock('setAdbLocation', setAdbLocationConfigMock.object);
         const testSubject = new UserConfigurationActionCreator(actionsMock.object);
 
diff --git a/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-locate-adb.test.ts b/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-locate-adb.test.ts
index 491d4fb1094..00950743e17 100644
--- a/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-locate-adb.test.ts
+++ b/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-locate-adb.test.ts
@@ -19,7 +19,7 @@ describe('Android setup step: promptLocateAdb', () => {
 
         const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
         depsMock.setup(m => m.setAdbPath(testPath)).verifiable(Times.once());
-        depsMock.setup(m => m.stepTransition('prompt-connect-to-device')).verifiable(Times.once());
+        depsMock.setup(m => m.stepTransition('detect-adb')).verifiable(Times.once());
 
         const step = promptLocateAdb(depsMock.object);
         step.actions.saveAdbPath(testPath);

From 9a27a187e34c080d97247444fdfd54a0f2c3650a Mon Sep 17 00:00:00 2001
From: Dan Bjorge <danielbj@microsoft.com>
Date: Wed, 17 Jun 2020 14:11:21 -0700
Subject: [PATCH 37/71] fix(android-setup): remove extra main elements in
 AndroidSetupSpinnerStep UIs (#2906)

#### Description of changes

Several of the steps that are based on `AndroidSetupSpinnerStep` were wrapping it in a `<main>` element, but it already is based on `AndroidSetupStepLayout` which provides a `<main>` element. This removes the extra landmark.

No visual change.

#### Pull request checklist
<!-- If a checklist item is not applicable to this change, write "n/a" in the checkbox -->
- [n/a] Addresses an existing issue: #0000
- [x] Ran `yarn fastpass`
- [x] Added/updated relevant unit test(s) (and ran `yarn test`)
- [x] Verified code coverage for the changes made. Check coverage report at: `<rootDir>/test-results/unit/coverage`
- [x] PR title *AND* final merge commit title both start with a semantic tag (`fix:`, `chore:`, `feat(feature-name):`, `refactor:`). See `CONTRIBUTING.md`.
- [n/a] (UI changes only) Added screenshots/GIFs to description above
- [x] (UI changes only) Verified usability with NVDA/JAWS
---
 .../android-setup/detect-devices-step.tsx     |  6 +---
 .../android-setup/detect-permissions-step.tsx |  6 +---
 .../android-setup/detect-service-step.tsx     | 12 ++++----
 .../android-setup/installing-service-step.tsx | 10 +++----
 .../detect-devices-step.test.tsx.snap         | 26 ++++++++---------
 .../detect-permissions-step.test.tsx.snap     | 26 ++++++++---------
 .../detect-service-step.test.tsx.snap         | 28 +++++++++----------
 .../installing-service-step.test.tsx.snap     | 26 ++++++++---------
 8 files changed, 60 insertions(+), 80 deletions(-)

diff --git a/src/electron/views/device-connect-view/components/android-setup/detect-devices-step.tsx b/src/electron/views/device-connect-view/components/android-setup/detect-devices-step.tsx
index 651096d5cef..ba9382575f2 100644
--- a/src/electron/views/device-connect-view/components/android-setup/detect-devices-step.tsx
+++ b/src/electron/views/device-connect-view/components/android-setup/detect-devices-step.tsx
@@ -8,10 +8,6 @@ import { CommonAndroidSetupStepProps } from './android-setup-types';
 export const DetectDevicesStep = NamedFC<CommonAndroidSetupStepProps>(
     'DetectDevicesStep',
     (props: CommonAndroidSetupStepProps) => {
-        return (
-            <main>
-                <AndroidSetupSpinnerStep deps={props.deps} spinnerLabel="Scanning for devices..." />
-            </main>
-        );
+        return <AndroidSetupSpinnerStep deps={props.deps} spinnerLabel="Scanning for devices..." />;
     },
 );
diff --git a/src/electron/views/device-connect-view/components/android-setup/detect-permissions-step.tsx b/src/electron/views/device-connect-view/components/android-setup/detect-permissions-step.tsx
index 3e43975f7ae..eb6e418118f 100644
--- a/src/electron/views/device-connect-view/components/android-setup/detect-permissions-step.tsx
+++ b/src/electron/views/device-connect-view/components/android-setup/detect-permissions-step.tsx
@@ -8,10 +8,6 @@ import { CommonAndroidSetupStepProps } from './android-setup-types';
 export const DetectPermissionsStep = NamedFC<CommonAndroidSetupStepProps>(
     'DetectPermissionsStep',
     (props: CommonAndroidSetupStepProps) => {
-        return (
-            <main>
-                <AndroidSetupSpinnerStep deps={props.deps} spinnerLabel="Checking permissions..." />
-            </main>
-        );
+        return <AndroidSetupSpinnerStep deps={props.deps} spinnerLabel="Checking permissions..." />;
     },
 );
diff --git a/src/electron/views/device-connect-view/components/android-setup/detect-service-step.tsx b/src/electron/views/device-connect-view/components/android-setup/detect-service-step.tsx
index a537e1da2c6..c71e19aa4ec 100644
--- a/src/electron/views/device-connect-view/components/android-setup/detect-service-step.tsx
+++ b/src/electron/views/device-connect-view/components/android-setup/detect-service-step.tsx
@@ -9,13 +9,11 @@ export const DetectServiceStep = NamedFC<CommonAndroidSetupStepProps>(
     'DetectServiceStep',
     (props: CommonAndroidSetupStepProps) => {
         return (
-            <main>
-                <AndroidSetupSpinnerStep
-                    deps={props.deps}
-                    spinnerLabel="Scanning for devices..."
-                    disableCancel={true}
-                />
-            </main>
+            <AndroidSetupSpinnerStep
+                deps={props.deps}
+                spinnerLabel="Scanning for devices..."
+                disableCancel={true}
+            />
         );
     },
 );
diff --git a/src/electron/views/device-connect-view/components/android-setup/installing-service-step.tsx b/src/electron/views/device-connect-view/components/android-setup/installing-service-step.tsx
index 51b3a3c66d7..5e1d429069e 100644
--- a/src/electron/views/device-connect-view/components/android-setup/installing-service-step.tsx
+++ b/src/electron/views/device-connect-view/components/android-setup/installing-service-step.tsx
@@ -9,12 +9,10 @@ export const InstallingServiceStep = NamedFC<CommonAndroidSetupStepProps>(
     'InstallingServiceStep',
     (props: CommonAndroidSetupStepProps) => {
         return (
-            <main>
-                <AndroidSetupSpinnerStep
-                    deps={props.deps}
-                    spinnerLabel="Installing on your device..."
-                />
-            </main>
+            <AndroidSetupSpinnerStep
+                deps={props.deps}
+                spinnerLabel="Installing on your device..."
+            />
         );
     },
 );
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/detect-devices-step.test.tsx.snap b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/detect-devices-step.test.tsx.snap
index e461dde4fb9..47238568417 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/detect-devices-step.test.tsx.snap
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/detect-devices-step.test.tsx.snap
@@ -1,19 +1,17 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`DetectDevicesStep renders 1`] = `
-<main>
-  <AndroidSetupSpinnerStep
-    deps={
-      Object {
-        "LinkComponent": [Function],
-        "androidSetupActionCreator": null,
-        "androidSetupStepComponentProvider": null,
-        "closeApp": null,
-        "showOpenFileDialog": null,
-        "startTesting": null,
-      }
+<AndroidSetupSpinnerStep
+  deps={
+    Object {
+      "LinkComponent": [Function],
+      "androidSetupActionCreator": null,
+      "androidSetupStepComponentProvider": null,
+      "closeApp": null,
+      "showOpenFileDialog": null,
+      "startTesting": null,
     }
-    spinnerLabel="Scanning for devices..."
-  />
-</main>
+  }
+  spinnerLabel="Scanning for devices..."
+/>
 `;
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/detect-permissions-step.test.tsx.snap b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/detect-permissions-step.test.tsx.snap
index 64d218812d6..b29b1b1f327 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/detect-permissions-step.test.tsx.snap
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/detect-permissions-step.test.tsx.snap
@@ -1,19 +1,17 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`DetectDevicesStep renders 1`] = `
-<main>
-  <AndroidSetupSpinnerStep
-    deps={
-      Object {
-        "LinkComponent": [Function],
-        "androidSetupActionCreator": null,
-        "androidSetupStepComponentProvider": null,
-        "closeApp": null,
-        "showOpenFileDialog": null,
-        "startTesting": null,
-      }
+<AndroidSetupSpinnerStep
+  deps={
+    Object {
+      "LinkComponent": [Function],
+      "androidSetupActionCreator": null,
+      "androidSetupStepComponentProvider": null,
+      "closeApp": null,
+      "showOpenFileDialog": null,
+      "startTesting": null,
     }
-    spinnerLabel="Checking permissions..."
-  />
-</main>
+  }
+  spinnerLabel="Checking permissions..."
+/>
 `;
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/detect-service-step.test.tsx.snap b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/detect-service-step.test.tsx.snap
index ac075439ff0..b887f20aaf5 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/detect-service-step.test.tsx.snap
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/detect-service-step.test.tsx.snap
@@ -1,20 +1,18 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`DetectServiceStep renders 1`] = `
-<main>
-  <AndroidSetupSpinnerStep
-    deps={
-      Object {
-        "LinkComponent": [Function],
-        "androidSetupActionCreator": null,
-        "androidSetupStepComponentProvider": null,
-        "closeApp": null,
-        "showOpenFileDialog": null,
-        "startTesting": null,
-      }
+<AndroidSetupSpinnerStep
+  deps={
+    Object {
+      "LinkComponent": [Function],
+      "androidSetupActionCreator": null,
+      "androidSetupStepComponentProvider": null,
+      "closeApp": null,
+      "showOpenFileDialog": null,
+      "startTesting": null,
     }
-    disableCancel={true}
-    spinnerLabel="Scanning for devices..."
-  />
-</main>
+  }
+  disableCancel={true}
+  spinnerLabel="Scanning for devices..."
+/>
 `;
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/installing-service-step.test.tsx.snap b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/installing-service-step.test.tsx.snap
index 4ef6d777c2f..a8f73362915 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/installing-service-step.test.tsx.snap
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/installing-service-step.test.tsx.snap
@@ -1,19 +1,17 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`InstallingServiceStep renders 1`] = `
-<main>
-  <AndroidSetupSpinnerStep
-    deps={
-      Object {
-        "LinkComponent": [Function],
-        "androidSetupActionCreator": null,
-        "androidSetupStepComponentProvider": null,
-        "closeApp": null,
-        "showOpenFileDialog": null,
-        "startTesting": null,
-      }
+<AndroidSetupSpinnerStep
+  deps={
+    Object {
+      "LinkComponent": [Function],
+      "androidSetupActionCreator": null,
+      "androidSetupStepComponentProvider": null,
+      "closeApp": null,
+      "showOpenFileDialog": null,
+      "startTesting": null,
     }
-    spinnerLabel="Installing on your device..."
-  />
-</main>
+  }
+  spinnerLabel="Installing on your device..."
+/>
 `;

From 5d978424e5487ac39c9977d8020a733faf49ac97 Mon Sep 17 00:00:00 2001
From: Karan <karansin@microsoft.com>
Date: Wed, 17 Jun 2020 14:29:55 -0700
Subject: [PATCH 38/71] feat(android-setup): set default device connect port to
 62442 (#2904)

---
 src/electron/flux/store/device-store.ts                    | 3 ++-
 .../platform/android/appium-service-configurator.ts        | 7 +++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/electron/flux/store/device-store.ts b/src/electron/flux/store/device-store.ts
index 71b293a6bca..ce8d774e0bf 100644
--- a/src/electron/flux/store/device-store.ts
+++ b/src/electron/flux/store/device-store.ts
@@ -3,6 +3,7 @@
 import { BaseStoreImpl } from 'background/stores/base-store-impl';
 import { StoreNames } from 'common/stores/store-names';
 
+import { defaultAdbPortNumber } from 'electron/platform/android/appium-service-configurator';
 import { ConnectedDevicePayload, PortPayload } from '../action/device-action-payloads';
 import { DeviceActions } from '../action/device-actions';
 import { DeviceConnectState } from '../types/device-connect-state';
@@ -17,7 +18,7 @@ export class DeviceStore extends BaseStoreImpl<DeviceStoreData> {
         return {
             deviceConnectState: DeviceConnectState.Default,
             connectedDevice: null,
-            port: null,
+            port: defaultAdbPortNumber,
         };
     }
 
diff --git a/src/electron/platform/android/appium-service-configurator.ts b/src/electron/platform/android/appium-service-configurator.ts
index 29eaf3c107b..1f8e333a344 100644
--- a/src/electron/platform/android/appium-service-configurator.ts
+++ b/src/electron/platform/android/appium-service-configurator.ts
@@ -17,9 +17,8 @@ type AdbDevice = {
 
 const servicePackageName: string = 'com.microsoft.accessibilityinsightsforandroidservice';
 
+export const defaultAdbPortNumber: number = 62442;
 export class AppiumServiceConfigurator implements AndroidServiceConfigurator {
-    private readonly portNumber: number = 62442;
-
     constructor(private readonly adb: ADB, private readonly apkLocator: AndroidServiceApkLocator) {}
 
     public getConnectedDevices = async (): Promise<Array<DeviceInfo>> => {
@@ -85,11 +84,11 @@ export class AppiumServiceConfigurator implements AndroidServiceConfigurator {
 
     public setTcpForwarding = async (deviceId: string): Promise<void> => {
         this.adb.setDeviceId(deviceId);
-        await this.adb.forwardPort(this.portNumber, this.portNumber);
+        await this.adb.forwardPort(defaultAdbPortNumber, defaultAdbPortNumber);
     };
 
     public removeTcpForwarding = async (deviceId: string): Promise<void> => {
         this.adb.setDeviceId(deviceId);
-        await this.adb.removePortForward(this.portNumber);
+        await this.adb.removePortForward(defaultAdbPortNumber);
     };
 }

From 3831b1c15f6b943ed1c3b61a0623f3fe3c2b20a6 Mon Sep 17 00:00:00 2001
From: Dan Bjorge <danielbj@microsoft.com>
Date: Wed, 17 Jun 2020 14:31:07 -0700
Subject: [PATCH 39/71] feat(android-setup): add UI for
 configuring-port-forwarding step (#2905)

#### Description of changes

Adds a new loading spinner screen UI for the step where we configure port forwarding in ADB.

![screenshot of new loading spinner](https://user-images.githubusercontent.com/376284/84947086-80c5f600-b09e-11ea-91ae-0352243f49f7.png)

#### Pull request checklist
<!-- If a checklist item is not applicable to this change, write "n/a" in the checkbox -->
- [n/a] Addresses an existing issue: #0000
- [x] Ran `yarn fastpass`
- [x] Added/updated relevant unit test(s) (and ran `yarn test`)
- [x] Verified code coverage for the changes made. Check coverage report at: `<rootDir>/test-results/unit/coverage`
- [x] PR title *AND* final merge commit title both start with a semantic tag (`fix:`, `chore:`, `feat(feature-name):`, `refactor:`). See `CONTRIBUTING.md`.
- [x] (UI changes only) Added screenshots/GIFs to description above
- [x] (UI changes only) Verified usability with NVDA/JAWS
---
 .../android/setup/android-setup-step-id.ts      |  1 +
 .../setup/android-setup-steps-configs.ts        |  1 +
 .../configuring-port-forwarding-step.tsx        | 13 +++++++++++++
 .../default-android-setup-components.ts         |  2 ++
 ...nfiguring-port-forwarding-step.test.tsx.snap | 17 +++++++++++++++++
 .../configuring-port-forwarding-step.test.tsx   | 15 +++++++++++++++
 6 files changed, 49 insertions(+)
 create mode 100644 src/electron/views/device-connect-view/components/android-setup/configuring-port-forwarding-step.tsx
 create mode 100644 src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/configuring-port-forwarding-step.test.tsx.snap
 create mode 100644 src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/configuring-port-forwarding-step.test.tsx

diff --git a/src/electron/platform/android/setup/android-setup-step-id.ts b/src/electron/platform/android/setup/android-setup-step-id.ts
index 45da0dce89d..e41bd878363 100644
--- a/src/electron/platform/android/setup/android-setup-step-id.ts
+++ b/src/electron/platform/android/setup/android-setup-step-id.ts
@@ -12,4 +12,5 @@ export type AndroidSetupStepId =
     | 'prompt-install-failed'
     | 'detect-permissions'
     | 'prompt-grant-permissions'
+    | 'configuring-port-forwarding'
     | 'prompt-connected-start-testing';
diff --git a/src/electron/platform/android/setup/android-setup-steps-configs.ts b/src/electron/platform/android/setup/android-setup-steps-configs.ts
index edab0ea211e..e8888eb8dbd 100644
--- a/src/electron/platform/android/setup/android-setup-steps-configs.ts
+++ b/src/electron/platform/android/setup/android-setup-steps-configs.ts
@@ -45,5 +45,6 @@ export const allAndroidSetupStepConfigs: AndroidSetupStepConfigs = {
     'prompt-install-failed': promptInstallService,
     'detect-permissions': detectPermissions,
     'prompt-grant-permissions': promptGrantPermissions,
+    'configuring-port-forwarding': null, // to be implemented in future feature work
     'prompt-connected-start-testing': promptConnectedStartTesting,
 };
diff --git a/src/electron/views/device-connect-view/components/android-setup/configuring-port-forwarding-step.tsx b/src/electron/views/device-connect-view/components/android-setup/configuring-port-forwarding-step.tsx
new file mode 100644
index 00000000000..19150a546bd
--- /dev/null
+++ b/src/electron/views/device-connect-view/components/android-setup/configuring-port-forwarding-step.tsx
@@ -0,0 +1,13 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+import { NamedFC } from 'common/react/named-fc';
+import * as React from 'react';
+import { AndroidSetupSpinnerStep } from './android-setup-spinner-step';
+import { CommonAndroidSetupStepProps } from './android-setup-types';
+
+export const ConfiguringPortForwardingStep = NamedFC<CommonAndroidSetupStepProps>(
+    'ConfiguringPortForwardingStep',
+    (props: CommonAndroidSetupStepProps) => {
+        return <AndroidSetupSpinnerStep deps={props.deps} spinnerLabel="Configuring ports..." />;
+    },
+);
diff --git a/src/electron/views/device-connect-view/components/android-setup/default-android-setup-components.ts b/src/electron/views/device-connect-view/components/android-setup/default-android-setup-components.ts
index ed6d40958ce..f4d51726f00 100644
--- a/src/electron/views/device-connect-view/components/android-setup/default-android-setup-components.ts
+++ b/src/electron/views/device-connect-view/components/android-setup/default-android-setup-components.ts
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 import { AndroidSetupStepComponentProvider } from 'electron/views/device-connect-view/components/android-setup/android-setup-types';
+import { ConfiguringPortForwardingStep } from 'electron/views/device-connect-view/components/android-setup/configuring-port-forwarding-step';
 import { DetectAdbStep } from 'electron/views/device-connect-view/components/android-setup/detect-adb-step';
 import { DetectDevicesStep } from 'electron/views/device-connect-view/components/android-setup/detect-devices-step';
 import { DetectPermissionsStep } from 'electron/views/device-connect-view/components/android-setup/detect-permissions-step';
@@ -26,5 +27,6 @@ export const defaultAndroidSetupComponents: AndroidSetupStepComponentProvider =
     'installing-service': InstallingServiceStep,
     'detect-devices': DetectDevicesStep,
     'detect-service': DetectServiceStep,
+    'configuring-port-forwarding': ConfiguringPortForwardingStep,
     'prompt-connected-start-testing': PromptConnectedStartTestingStep,
 };
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/configuring-port-forwarding-step.test.tsx.snap b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/configuring-port-forwarding-step.test.tsx.snap
new file mode 100644
index 00000000000..9e0405233a3
--- /dev/null
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/configuring-port-forwarding-step.test.tsx.snap
@@ -0,0 +1,17 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ConfiguringPortForwardingStep renders 1`] = `
+<AndroidSetupSpinnerStep
+  deps={
+    Object {
+      "LinkComponent": [Function],
+      "androidSetupActionCreator": null,
+      "androidSetupStepComponentProvider": null,
+      "closeApp": null,
+      "showOpenFileDialog": null,
+      "startTesting": null,
+    }
+  }
+  spinnerLabel="Configuring ports..."
+/>
+`;
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/configuring-port-forwarding-step.test.tsx b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/configuring-port-forwarding-step.test.tsx
new file mode 100644
index 00000000000..dda2f3c1c7c
--- /dev/null
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/configuring-port-forwarding-step.test.tsx
@@ -0,0 +1,15 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+import { ConfiguringPortForwardingStep } from 'electron/views/device-connect-view/components/android-setup/configuring-port-forwarding-step';
+import { shallow } from 'enzyme';
+import * as React from 'react';
+import { AndroidSetupStepPropsBuilder } from 'tests/unit/common/android-setup-step-props-builder';
+
+describe('ConfiguringPortForwardingStep', () => {
+    const props = new AndroidSetupStepPropsBuilder('configuring-port-forwarding').build();
+
+    it('renders', () => {
+        const rendered = shallow(<ConfiguringPortForwardingStep {...props} />);
+        expect(rendered.getElement()).toMatchSnapshot();
+    });
+});

From 879db4b51f1ec76d48df94f09588b28f3b959274 Mon Sep 17 00:00:00 2001
From: Dan Bjorge <danielbj@microsoft.com>
Date: Wed, 17 Jun 2020 14:56:01 -0700
Subject: [PATCH 40/71] chore: address deprecated button warning in unified dev
 console (#2903)

#### Description of changes

Fixes this warning in the dev console when hitting the prompt-connected-start-testing-step:

`warn.js:13 The Button component has been deprecated. Use specific variants instead. (PrimaryButton, DefaultButton, IconButton, ActionButton, etc.)`

#### Pull request checklist
<!-- If a checklist item is not applicable to this change, write "n/a" in the checkbox -->
- [n/a] Addresses an existing issue: #0000
- [x] Ran `yarn fastpass`
- [x] Added/updated relevant unit test(s) (and ran `yarn test`)
- [x] Verified code coverage for the changes made. Check coverage report at: `<rootDir>/test-results/unit/coverage`
- [x] PR title *AND* final merge commit title both start with a semantic tag (`fix:`, `chore:`, `feat(feature-name):`, `refactor:`). See `CONTRIBUTING.md`.
- [n/a] (UI changes only) Added screenshots/GIFs to description above
- [n/a] (UI changes only) Verified usability with NVDA/JAWS
---
 .../android-setup/prompt-connected-start-testing-step.tsx     | 4 ++--
 .../prompt-connected-start-testing-step.test.tsx.snap         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.tsx b/src/electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.tsx
index 3ff11dcf0ff..99cac8a7f50 100644
--- a/src/electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.tsx
+++ b/src/electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.tsx
@@ -6,7 +6,7 @@ import {
     DeviceDescriptionProps,
 } from 'electron/views/device-connect-view/components/android-setup/device-description';
 import * as styles from 'electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.scss';
-import { Button } from 'office-ui-fabric-react';
+import { DefaultButton } from 'office-ui-fabric-react';
 import * as React from 'react';
 
 import { AndroidSetupStepLayout, AndroidSetupStepLayoutProps } from './android-setup-step-layout';
@@ -43,7 +43,7 @@ export const PromptConnectedStartTestingStep = NamedFC<CommonAndroidSetupStepPro
         return (
             <AndroidSetupStepLayout {...layoutProps}>
                 <DeviceDescription {...descriptionProps}></DeviceDescription>
-                <Button
+                <DefaultButton
                     className={styles.rescanButton}
                     text="Rescan devices"
                     onClick={props.deps.androidSetupActionCreator.rescan}
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-connected-start-testing-step.test.tsx.snap b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-connected-start-testing-step.test.tsx.snap
index ffb663596cb..61c0ea2de9c 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-connected-start-testing-step.test.tsx.snap
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-connected-start-testing-step.test.tsx.snap
@@ -30,7 +30,7 @@ exports[`PromptConnectedStartTestingStep renders with device 1`] = `
     id="1"
     isEmulator={false}
   />
-  <Button
+  <CustomizedDefaultButton
     className="rescanButton"
     onClick={[Function]}
     text="Rescan devices"
@@ -68,7 +68,7 @@ exports[`PromptConnectedStartTestingStep renders with emulator 1`] = `
     id="1"
     isEmulator={true}
   />
-  <Button
+  <CustomizedDefaultButton
     className="rescanButton"
     onClick={[Function]}
     text="Rescan devices"

From 0f6e5326fa7b9b0a0e61d4851f15188846949bde Mon Sep 17 00:00:00 2001
From: Dan Bjorge <danielbj@microsoft.com>
Date: Wed, 17 Jun 2020 15:09:11 -0700
Subject: [PATCH 41/71] feat(android-setup): UI for
 prompt-configuring-port-forwarding-failed-step (#2909)

#### Description of changes

Adds a new UI for when setting up port forwarding fails based on the similar UI for when installing the service fails.

screenshot of proposed UI for error screen (in actual use there will be a device name to the right of the icon, it's missing here because I skipped directly to the new step for testing):

![image](https://user-images.githubusercontent.com/376284/84954691-ba046300-b0aa-11ea-90e5-e0601e3cfff9.png)

#### Pull request checklist
<!-- If a checklist item is not applicable to this change, write "n/a" in the checkbox -->
- [n/a] Addresses an existing issue: #0000
- [x] Ran `yarn fastpass`
- [x] Added/updated relevant unit test(s) (and ran `yarn test`)
- [x] Verified code coverage for the changes made. Check coverage report at: `<rootDir>/test-results/unit/coverage`
- [x] PR title *AND* final merge commit title both start with a semantic tag (`fix:`, `chore:`, `feat(feature-name):`, `refactor:`). See `CONTRIBUTING.md`.
- [x] (UI changes only) Added screenshots/GIFs to description above
- [x] (UI changes only) Verified usability with NVDA/JAWS
---
 .../android/setup/android-setup-step-id.ts    |  1 +
 .../setup/android-setup-steps-configs.ts      |  1 +
 .../default-android-setup-components.ts       |  2 +
 ...nfiguring-port-forwarding-failed-step.scss |  8 ++
 ...onfiguring-port-forwarding-failed-step.tsx | 58 +++++++++++++
 ...-port-forwarding-failed-step.test.tsx.snap | 83 +++++++++++++++++++
 ...uring-port-forwarding-failed-step.test.tsx | 58 +++++++++++++
 7 files changed, 211 insertions(+)
 create mode 100644 src/electron/views/device-connect-view/components/android-setup/prompt-configuring-port-forwarding-failed-step.scss
 create mode 100644 src/electron/views/device-connect-view/components/android-setup/prompt-configuring-port-forwarding-failed-step.tsx
 create mode 100644 src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-configuring-port-forwarding-failed-step.test.tsx.snap
 create mode 100644 src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-configuring-port-forwarding-failed-step.test.tsx

diff --git a/src/electron/platform/android/setup/android-setup-step-id.ts b/src/electron/platform/android/setup/android-setup-step-id.ts
index e41bd878363..fe5f2d6c914 100644
--- a/src/electron/platform/android/setup/android-setup-step-id.ts
+++ b/src/electron/platform/android/setup/android-setup-step-id.ts
@@ -13,4 +13,5 @@ export type AndroidSetupStepId =
     | 'detect-permissions'
     | 'prompt-grant-permissions'
     | 'configuring-port-forwarding'
+    | 'prompt-configuring-port-forwarding-failed'
     | 'prompt-connected-start-testing';
diff --git a/src/electron/platform/android/setup/android-setup-steps-configs.ts b/src/electron/platform/android/setup/android-setup-steps-configs.ts
index e8888eb8dbd..c3a536d625b 100644
--- a/src/electron/platform/android/setup/android-setup-steps-configs.ts
+++ b/src/electron/platform/android/setup/android-setup-steps-configs.ts
@@ -46,5 +46,6 @@ export const allAndroidSetupStepConfigs: AndroidSetupStepConfigs = {
     'detect-permissions': detectPermissions,
     'prompt-grant-permissions': promptGrantPermissions,
     'configuring-port-forwarding': null, // to be implemented in future feature work
+    'prompt-configuring-port-forwarding-failed': null, // to be implemented in future feature work
     'prompt-connected-start-testing': promptConnectedStartTesting,
 };
diff --git a/src/electron/views/device-connect-view/components/android-setup/default-android-setup-components.ts b/src/electron/views/device-connect-view/components/android-setup/default-android-setup-components.ts
index f4d51726f00..d52cb8a1bdd 100644
--- a/src/electron/views/device-connect-view/components/android-setup/default-android-setup-components.ts
+++ b/src/electron/views/device-connect-view/components/android-setup/default-android-setup-components.ts
@@ -8,6 +8,7 @@ import { DetectPermissionsStep } from 'electron/views/device-connect-view/compon
 import { DetectServiceStep } from 'electron/views/device-connect-view/components/android-setup/detect-service-step';
 import { InstallingServiceStep } from 'electron/views/device-connect-view/components/android-setup/installing-service-step';
 import { PromptChooseDeviceStep } from 'electron/views/device-connect-view/components/android-setup/prompt-choose-device-step';
+import { PromptConfiguringPortForwardingFailedStep } from 'electron/views/device-connect-view/components/android-setup/prompt-configuring-port-forwarding-failed-step';
 import { PromptConnectToDeviceStep } from 'electron/views/device-connect-view/components/android-setup/prompt-connect-to-device-step';
 import { PromptConnectedStartTestingStep } from 'electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step';
 import { PromptGrantPermissionsStep } from 'electron/views/device-connect-view/components/android-setup/prompt-grant-permissions-step';
@@ -28,5 +29,6 @@ export const defaultAndroidSetupComponents: AndroidSetupStepComponentProvider =
     'detect-devices': DetectDevicesStep,
     'detect-service': DetectServiceStep,
     'configuring-port-forwarding': ConfiguringPortForwardingStep,
+    'prompt-configuring-port-forwarding-failed': PromptConfiguringPortForwardingFailedStep,
     'prompt-connected-start-testing': PromptConnectedStartTestingStep,
 };
diff --git a/src/electron/views/device-connect-view/components/android-setup/prompt-configuring-port-forwarding-failed-step.scss b/src/electron/views/device-connect-view/components/android-setup/prompt-configuring-port-forwarding-failed-step.scss
new file mode 100644
index 00000000000..c8dfe9d4088
--- /dev/null
+++ b/src/electron/views/device-connect-view/components/android-setup/prompt-configuring-port-forwarding-failed-step.scss
@@ -0,0 +1,8 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+@import '../../../../../common/styles/fonts.scss';
+
+.device-description {
+    margin-top: 16px;
+    margin-bottom: 16px;
+}
diff --git a/src/electron/views/device-connect-view/components/android-setup/prompt-configuring-port-forwarding-failed-step.tsx b/src/electron/views/device-connect-view/components/android-setup/prompt-configuring-port-forwarding-failed-step.tsx
new file mode 100644
index 00000000000..71c7d479ca9
--- /dev/null
+++ b/src/electron/views/device-connect-view/components/android-setup/prompt-configuring-port-forwarding-failed-step.tsx
@@ -0,0 +1,58 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+import { NamedFC } from 'common/react/named-fc';
+import {
+    DeviceDescription,
+    DeviceDescriptionProps,
+} from 'electron/views/device-connect-view/components/android-setup/device-description';
+import { PrimaryButton } from 'office-ui-fabric-react';
+import * as React from 'react';
+import { AndroidSetupStepLayout, AndroidSetupStepLayoutProps } from './android-setup-step-layout';
+import { CommonAndroidSetupStepProps } from './android-setup-types';
+import * as styles from './prompt-install-failed-step.scss';
+
+export const tryAgainAutomationId = 'try-again';
+export const PromptConfiguringPortForwardingFailedStep = NamedFC<CommonAndroidSetupStepProps>(
+    'PromptConfiguringPortForwardingFailedStep',
+    (props: CommonAndroidSetupStepProps) => {
+        const { LinkComponent } = props.deps;
+
+        const layoutProps: AndroidSetupStepLayoutProps = {
+            headerText: 'Port forwarding failed',
+            moreInfoLink: (
+                <LinkComponent href="https://aka.ms/accessibility-insights-for-android/portForwarding">
+                    Troubleshooting port forwarding problems
+                </LinkComponent>
+            ),
+            leftFooterButtonProps: {
+                text: 'Cancel',
+                onClick: _ => props.deps.androidSetupActionCreator.cancel(),
+            },
+            rightFooterButtonProps: {
+                text: 'Next',
+                disabled: true,
+                onClick: null,
+            },
+        };
+
+        const descriptionProps: DeviceDescriptionProps = {
+            ...props.androidSetupStoreData.selectedDevice,
+            className: styles.deviceDescription,
+        };
+
+        return (
+            <AndroidSetupStepLayout {...layoutProps}>
+                <>
+                    We were unable to configure port forwarding from Accessibility Insights for
+                    Android Service on your device. Please reconnect your device and try again.
+                </>
+                <DeviceDescription {...descriptionProps}></DeviceDescription>
+                <PrimaryButton
+                    data-automation-id={tryAgainAutomationId}
+                    text="Try again"
+                    onClick={props.deps.androidSetupActionCreator.next}
+                />
+            </AndroidSetupStepLayout>
+        );
+    },
+);
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-configuring-port-forwarding-failed-step.test.tsx.snap b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-configuring-port-forwarding-failed-step.test.tsx.snap
new file mode 100644
index 00000000000..000a13a606c
--- /dev/null
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-configuring-port-forwarding-failed-step.test.tsx.snap
@@ -0,0 +1,83 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`PromptConfiguringPortForwardingFailedStep renders with device 1`] = `
+<AndroidSetupStepLayout
+  headerText="Port forwarding failed"
+  leftFooterButtonProps={
+    Object {
+      "onClick": [Function],
+      "text": "Cancel",
+    }
+  }
+  moreInfoLink={
+    <LinkComponent
+      href="https://aka.ms/accessibility-insights-for-android/portForwarding"
+    >
+      Troubleshooting port forwarding problems
+    </LinkComponent>
+  }
+  rightFooterButtonProps={
+    Object {
+      "disabled": true,
+      "onClick": null,
+      "text": "Next",
+    }
+  }
+>
+  <React.Fragment>
+    We were unable to configure port forwarding from Accessibility Insights for Android Service on your device. Please reconnect your device and try again.
+  </React.Fragment>
+  <DeviceDescription
+    className="deviceDescription"
+    friendlyName="Super-Duper Gadget"
+    id="1"
+    isEmulator={false}
+  />
+  <CustomizedPrimaryButton
+    data-automation-id="try-again"
+    onClick={[Function]}
+    text="Try again"
+  />
+</AndroidSetupStepLayout>
+`;
+
+exports[`PromptConfiguringPortForwardingFailedStep renders with emulator 1`] = `
+<AndroidSetupStepLayout
+  headerText="Port forwarding failed"
+  leftFooterButtonProps={
+    Object {
+      "onClick": [Function],
+      "text": "Cancel",
+    }
+  }
+  moreInfoLink={
+    <LinkComponent
+      href="https://aka.ms/accessibility-insights-for-android/portForwarding"
+    >
+      Troubleshooting port forwarding problems
+    </LinkComponent>
+  }
+  rightFooterButtonProps={
+    Object {
+      "disabled": true,
+      "onClick": null,
+      "text": "Next",
+    }
+  }
+>
+  <React.Fragment>
+    We were unable to configure port forwarding from Accessibility Insights for Android Service on your device. Please reconnect your device and try again.
+  </React.Fragment>
+  <DeviceDescription
+    className="deviceDescription"
+    friendlyName="Emulator Extraordinaire"
+    id="1"
+    isEmulator={true}
+  />
+  <CustomizedPrimaryButton
+    data-automation-id="try-again"
+    onClick={[Function]}
+    text="Try again"
+  />
+</AndroidSetupStepLayout>
+`;
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-configuring-port-forwarding-failed-step.test.tsx b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-configuring-port-forwarding-failed-step.test.tsx
new file mode 100644
index 00000000000..c845a2981ef
--- /dev/null
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-configuring-port-forwarding-failed-step.test.tsx
@@ -0,0 +1,58 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+import { AndroidSetupActionCreator } from 'electron/flux/action-creator/android-setup-action-creator';
+import { DeviceInfo } from 'electron/platform/android/android-service-configurator';
+import { CommonAndroidSetupStepProps } from 'electron/views/device-connect-view/components/android-setup/android-setup-types';
+import {
+    PromptConfiguringPortForwardingFailedStep,
+    tryAgainAutomationId,
+} from 'electron/views/device-connect-view/components/android-setup/prompt-configuring-port-forwarding-failed-step';
+import { shallow } from 'enzyme';
+import * as React from 'react';
+import { AndroidSetupStepPropsBuilder } from 'tests/unit/common/android-setup-step-props-builder';
+import { IMock, Mock, Times } from 'typemoq';
+
+describe('PromptConfiguringPortForwardingFailedStep', () => {
+    let props: CommonAndroidSetupStepProps;
+    let androidSetupActionCreatorMock: IMock<AndroidSetupActionCreator>;
+
+    beforeEach(() => {
+        androidSetupActionCreatorMock = Mock.ofType(AndroidSetupActionCreator);
+        props = new AndroidSetupStepPropsBuilder('prompt-configuring-port-forwarding-failed')
+            .withDep('androidSetupActionCreator', androidSetupActionCreatorMock.object)
+            .build();
+    });
+
+    it('renders with device', () => {
+        const selectedDevice: DeviceInfo = {
+            isEmulator: false,
+            friendlyName: 'Super-Duper Gadget',
+            id: '1',
+        };
+
+        props.androidSetupStoreData.selectedDevice = selectedDevice;
+
+        const rendered = shallow(<PromptConfiguringPortForwardingFailedStep {...props} />);
+        expect(rendered.getElement()).toMatchSnapshot();
+    });
+
+    it('renders with emulator', () => {
+        const selectedDevice: DeviceInfo = {
+            isEmulator: true,
+            friendlyName: 'Emulator Extraordinaire',
+            id: '1',
+        };
+
+        props.androidSetupStoreData.selectedDevice = selectedDevice;
+
+        const rendered = shallow(<PromptConfiguringPortForwardingFailedStep {...props} />);
+        expect(rendered.getElement()).toMatchSnapshot();
+    });
+
+    it('routes try again button to next action', () => {
+        const rendered = shallow(<PromptConfiguringPortForwardingFailedStep {...props} />);
+        const button = rendered.find({ 'data-automation-id': tryAgainAutomationId });
+        button.simulate('click');
+        androidSetupActionCreatorMock.verify(m => m.next(), Times.once());
+    });
+});

From c49ee75dbd8f0f95eb1b782e5eb8c44b21976e70 Mon Sep 17 00:00:00 2001
From: Dave Tryon <45672944+DaveTryon@users.noreply.github.com>
Date: Wed, 17 Jun 2020 16:16:42 -0700
Subject: [PATCH 42/71] feat(android-setup): Add port forwarding steps and
 configuration (#2908)

---
 .../android/setup/android-setup-deps.ts       |  1 +
 .../setup/android-setup-steps-configs.ts      |  6 ++-
 .../android/setup/live-android-setup-deps.ts  | 10 ++++
 .../steps/configuring-port-forwarding.ts      | 16 ++++++
 .../android/setup/steps/detect-permissions.ts |  4 +-
 ...ompt-configuring-port-forwarding-failed.ts | 12 +++++
 .../steps/configuring-port-forwarding.test.ts | 54 +++++++++++++++++++
 .../setup/steps/detect-permissions.test.ts    |  4 +-
 .../steps/live-android-setup-deps.test.ts     | 25 +++++++++
 ...configuring-port-forwarding-failed.test.ts | 28 ++++++++++
 10 files changed, 153 insertions(+), 7 deletions(-)
 create mode 100644 src/electron/platform/android/setup/steps/configuring-port-forwarding.ts
 create mode 100644 src/electron/platform/android/setup/steps/prompt-configuring-port-forwarding-failed.ts
 create mode 100644 src/tests/unit/tests/electron/platform/android/setup/steps/configuring-port-forwarding.test.ts
 create mode 100644 src/tests/unit/tests/electron/platform/android/setup/steps/prompt-configuring-port-forwarding-failed.test.ts

diff --git a/src/electron/platform/android/setup/android-setup-deps.ts b/src/electron/platform/android/setup/android-setup-deps.ts
index 39a6ed1924d..c557f02cc4b 100644
--- a/src/electron/platform/android/setup/android-setup-deps.ts
+++ b/src/electron/platform/android/setup/android-setup-deps.ts
@@ -11,4 +11,5 @@ export type AndroidSetupDeps = {
     hasExpectedServiceVersion: () => Promise<boolean>;
     installService: () => Promise<boolean>;
     hasExpectedPermissions: () => Promise<boolean>;
+    setTcpForwarding: () => Promise<boolean>;
 };
diff --git a/src/electron/platform/android/setup/android-setup-steps-configs.ts b/src/electron/platform/android/setup/android-setup-steps-configs.ts
index c3a536d625b..3b3f2eb123e 100644
--- a/src/electron/platform/android/setup/android-setup-steps-configs.ts
+++ b/src/electron/platform/android/setup/android-setup-steps-configs.ts
@@ -5,10 +5,12 @@ import { AndroidSetupActions } from 'electron/flux/action/android-setup-actions'
 import { AndroidSetupStoreCallbacks } from 'electron/flux/types/android-setup-state-machine-types';
 import { AndroidSetupDeps } from 'electron/platform/android/setup/android-setup-deps';
 import { AndroidSetupStepId } from 'electron/platform/android/setup/android-setup-step-id';
+import { configuringPortForwarding } from 'electron/platform/android/setup/steps/configuring-port-forwarding';
 import { detectDevices } from 'electron/platform/android/setup/steps/detect-devices';
 import { detectPermissions } from 'electron/platform/android/setup/steps/detect-permissions';
 import { detectService } from 'electron/platform/android/setup/steps/detect-service';
 import { installingService } from 'electron/platform/android/setup/steps/installing-service';
+import { promptConfiguringPortForwardingFailed } from 'electron/platform/android/setup/steps/prompt-configuring-port-forwarding-failed';
 import { promptConnectToDevice } from 'electron/platform/android/setup/steps/prompt-connect-to-device';
 import { promptConnectedStartTesting } from 'electron/platform/android/setup/steps/prompt-connected-start-testing';
 import { promptGrantPermissions } from 'electron/platform/android/setup/steps/prompt-grant-permissions';
@@ -45,7 +47,7 @@ export const allAndroidSetupStepConfigs: AndroidSetupStepConfigs = {
     'prompt-install-failed': promptInstallService,
     'detect-permissions': detectPermissions,
     'prompt-grant-permissions': promptGrantPermissions,
-    'configuring-port-forwarding': null, // to be implemented in future feature work
-    'prompt-configuring-port-forwarding-failed': null, // to be implemented in future feature work
+    'configuring-port-forwarding': configuringPortForwarding,
+    'prompt-configuring-port-forwarding-failed': promptConfiguringPortForwardingFailed,
     'prompt-connected-start-testing': promptConnectedStartTesting,
 };
diff --git a/src/electron/platform/android/setup/live-android-setup-deps.ts b/src/electron/platform/android/setup/live-android-setup-deps.ts
index c79e422fd75..ca52e52ae90 100644
--- a/src/electron/platform/android/setup/live-android-setup-deps.ts
+++ b/src/electron/platform/android/setup/live-android-setup-deps.ts
@@ -91,6 +91,16 @@ export class LiveAndroidSetupDeps implements AndroidSetupDeps {
         return false;
     };
 
+    public setTcpForwarding = async (): Promise<boolean> => {
+        try {
+            await this.serviceConfig.setTcpForwarding(this.selectedDeviceId);
+            return true;
+        } catch (error) {
+            this.logger.log(error);
+        }
+        return false;
+    };
+
     private async getInstalledVersion(): Promise<string> {
         const info: PackageInfo = await this.serviceConfig.getPackageInfo(this.selectedDeviceId);
         return info?.versionName;
diff --git a/src/electron/platform/android/setup/steps/configuring-port-forwarding.ts b/src/electron/platform/android/setup/steps/configuring-port-forwarding.ts
new file mode 100644
index 00000000000..731a0bcd8d7
--- /dev/null
+++ b/src/electron/platform/android/setup/steps/configuring-port-forwarding.ts
@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import { AndroidSetupStepConfig } from 'electron/platform/android/setup/android-setup-steps-configs';
+
+export const configuringPortForwarding: AndroidSetupStepConfig = deps => ({
+    actions: {},
+    onEnter: async () => {
+        const configured = await deps.setTcpForwarding();
+        deps.stepTransition(
+            configured
+                ? 'prompt-connected-start-testing'
+                : 'prompt-configuring-port-forwarding-failed',
+        );
+    },
+});
diff --git a/src/electron/platform/android/setup/steps/detect-permissions.ts b/src/electron/platform/android/setup/steps/detect-permissions.ts
index 13ee3c8c5c2..6a18c55d438 100644
--- a/src/electron/platform/android/setup/steps/detect-permissions.ts
+++ b/src/electron/platform/android/setup/steps/detect-permissions.ts
@@ -7,8 +7,6 @@ export const detectPermissions: AndroidSetupStepConfig = deps => ({
     actions: {},
     onEnter: async () => {
         const detected = await deps.hasExpectedPermissions();
-        deps.stepTransition(
-            detected ? 'prompt-connected-start-testing' : 'prompt-grant-permissions',
-        );
+        deps.stepTransition(detected ? 'configuring-port-forwarding' : 'prompt-grant-permissions');
     },
 });
diff --git a/src/electron/platform/android/setup/steps/prompt-configuring-port-forwarding-failed.ts b/src/electron/platform/android/setup/steps/prompt-configuring-port-forwarding-failed.ts
new file mode 100644
index 00000000000..ea68bbe9a1d
--- /dev/null
+++ b/src/electron/platform/android/setup/steps/prompt-configuring-port-forwarding-failed.ts
@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import { AndroidSetupStepConfig } from 'electron/platform/android/setup/android-setup-steps-configs';
+
+export const promptConfiguringPortForwardingFailed: AndroidSetupStepConfig = deps => {
+    return {
+        actions: {
+            next: () => deps.stepTransition('configuring-port-forwarding'),
+        },
+    };
+};
diff --git a/src/tests/unit/tests/electron/platform/android/setup/steps/configuring-port-forwarding.test.ts b/src/tests/unit/tests/electron/platform/android/setup/steps/configuring-port-forwarding.test.ts
new file mode 100644
index 00000000000..f6754b60335
--- /dev/null
+++ b/src/tests/unit/tests/electron/platform/android/setup/steps/configuring-port-forwarding.test.ts
@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import { AndroidSetupStepConfigDeps } from 'electron/platform/android/setup/android-setup-steps-configs';
+import { configuringPortForwarding } from 'electron/platform/android/setup/steps/configuring-port-forwarding';
+import { Mock, MockBehavior, Times } from 'typemoq';
+import { checkExpectedActionsAreDefined } from './actions-tester';
+
+describe('Android setup step: configuringPortForwarding', () => {
+    it('has expected properties', () => {
+        const deps = {} as AndroidSetupStepConfigDeps;
+        const step = configuringPortForwarding(deps);
+        checkExpectedActionsAreDefined(step, []);
+        expect(step.onEnter).toBeDefined();
+    });
+
+    it('onEnter transitions to prompt-connected-start-testing on success', async () => {
+        const p = new Promise<boolean>(resolve => resolve(true));
+
+        const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
+        depsMock
+            .setup(m => m.setTcpForwarding())
+            .returns(_ => p)
+            .verifiable(Times.once());
+
+        depsMock
+            .setup(m => m.stepTransition('prompt-connected-start-testing'))
+            .verifiable(Times.once());
+
+        const step = configuringPortForwarding(depsMock.object);
+        await step.onEnter();
+
+        depsMock.verifyAll();
+    });
+
+    it('onEnter transitions to prompt-configuring-port-forwarding-failed on failure', async () => {
+        const p = new Promise<boolean>(resolve => resolve(false));
+
+        const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
+        depsMock
+            .setup(m => m.setTcpForwarding())
+            .returns(_ => p)
+            .verifiable(Times.once());
+
+        depsMock
+            .setup(m => m.stepTransition('prompt-configuring-port-forwarding-failed'))
+            .verifiable(Times.once());
+
+        const step = configuringPortForwarding(depsMock.object);
+        await step.onEnter();
+
+        depsMock.verifyAll();
+    });
+});
diff --git a/src/tests/unit/tests/electron/platform/android/setup/steps/detect-permissions.test.ts b/src/tests/unit/tests/electron/platform/android/setup/steps/detect-permissions.test.ts
index b30fb8c2ab5..f8d037f6c15 100644
--- a/src/tests/unit/tests/electron/platform/android/setup/steps/detect-permissions.test.ts
+++ b/src/tests/unit/tests/electron/platform/android/setup/steps/detect-permissions.test.ts
@@ -14,7 +14,7 @@ describe('Android setup step: detectPermissions', () => {
         expect(step.onEnter).toBeDefined();
     });
 
-    it('onEnter transitions to prompt-connected-start-testing as expected', async () => {
+    it('onEnter transitions to configuring-port-forwarding as expected', async () => {
         const p = new Promise<boolean>(resolve => resolve(true));
 
         const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
@@ -24,7 +24,7 @@ describe('Android setup step: detectPermissions', () => {
             .verifiable(Times.once());
 
         depsMock
-            .setup(m => m.stepTransition('prompt-connected-start-testing'))
+            .setup(m => m.stepTransition('configuring-port-forwarding'))
             .verifiable(Times.once());
 
         const step = detectPermissions(depsMock.object);
diff --git a/src/tests/unit/tests/electron/platform/android/setup/steps/live-android-setup-deps.test.ts b/src/tests/unit/tests/electron/platform/android/setup/steps/live-android-setup-deps.test.ts
index 10a224ac5e8..a0f60a63d4c 100644
--- a/src/tests/unit/tests/electron/platform/android/setup/steps/live-android-setup-deps.test.ts
+++ b/src/tests/unit/tests/electron/platform/android/setup/steps/live-android-setup-deps.test.ts
@@ -403,4 +403,29 @@ describe('LiveAndroidSetupDeps', () => {
 
         verifyAllMocks();
     });
+
+    it('setTcpForwarding returns false on error', async () => {
+        serviceConfigMock
+            .setup(m => m.setTcpForwarding(undefined))
+            .throws(new Error('Threw during setTcpForwarding'))
+            .verifiable(Times.once());
+        await initializeServiceConfig();
+
+        const success = await testSubject.setTcpForwarding();
+
+        expect(success).toBe(false);
+
+        verifyAllMocks();
+    });
+
+    it('setTcpForwarding returns true if no error', async () => {
+        serviceConfigMock.setup(m => m.setTcpForwarding(undefined)).verifiable(Times.once());
+        await initializeServiceConfig();
+
+        const success = await testSubject.setTcpForwarding();
+
+        expect(success).toBe(true);
+
+        verifyAllMocks();
+    });
 });
diff --git a/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-configuring-port-forwarding-failed.test.ts b/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-configuring-port-forwarding-failed.test.ts
new file mode 100644
index 00000000000..8c8b038d876
--- /dev/null
+++ b/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-configuring-port-forwarding-failed.test.ts
@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import { AndroidSetupStepConfigDeps } from 'electron/platform/android/setup/android-setup-steps-configs';
+import { promptConfiguringPortForwardingFailed } from 'electron/platform/android/setup/steps/prompt-configuring-port-forwarding-failed';
+import { Mock, MockBehavior, Times } from 'typemoq';
+import { checkExpectedActionsAreDefined } from './actions-tester';
+
+describe('Android setup step: promptConfiguringPortForwardingFailed', () => {
+    it('has expected properties', () => {
+        const deps = {} as AndroidSetupStepConfigDeps;
+        const step = promptConfiguringPortForwardingFailed(deps);
+        checkExpectedActionsAreDefined(step, ['next']);
+        expect(step.onEnter).not.toBeDefined();
+    });
+
+    it('next transitions to configuring-port-forwarding as expected', () => {
+        const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
+        depsMock
+            .setup(m => m.stepTransition('configuring-port-forwarding'))
+            .verifiable(Times.once());
+
+        const step = promptConfiguringPortForwardingFailed(depsMock.object);
+        step.actions.next();
+
+        depsMock.verifyAll();
+    });
+});

From 5d2894d368fe3d63be307b5cbc47a78ec1fa7ac2 Mon Sep 17 00:00:00 2001
From: Dave Tryon <45672944+DaveTryon@users.noreply.github.com>
Date: Wed, 17 Jun 2020 16:17:16 -0700
Subject: [PATCH 43/71] feat(android-setup): Scan for devices without prompting
 (golden path) (#2910)

---
 src/electron/platform/android/setup/steps/detect-adb.ts         | 2 +-
 .../electron/platform/android/setup/steps/detect-adb.test.ts    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/electron/platform/android/setup/steps/detect-adb.ts b/src/electron/platform/android/setup/steps/detect-adb.ts
index 4ba78040865..9d12823bd99 100644
--- a/src/electron/platform/android/setup/steps/detect-adb.ts
+++ b/src/electron/platform/android/setup/steps/detect-adb.ts
@@ -7,6 +7,6 @@ export const detectAdb: AndroidSetupStepConfig = deps => ({
     actions: {},
     onEnter: async () => {
         const detected = await deps.hasAdbPath();
-        deps.stepTransition(detected ? 'prompt-connect-to-device' : 'prompt-locate-adb');
+        deps.stepTransition(detected ? 'detect-devices' : 'prompt-locate-adb');
     },
 });
diff --git a/src/tests/unit/tests/electron/platform/android/setup/steps/detect-adb.test.ts b/src/tests/unit/tests/electron/platform/android/setup/steps/detect-adb.test.ts
index 5cfb9aacc53..e7ed34fd35a 100644
--- a/src/tests/unit/tests/electron/platform/android/setup/steps/detect-adb.test.ts
+++ b/src/tests/unit/tests/electron/platform/android/setup/steps/detect-adb.test.ts
@@ -23,7 +23,7 @@ describe('Android setup step: detectAdb', () => {
             .returns(_ => p)
             .verifiable(Times.once());
 
-        depsMock.setup(m => m.stepTransition('prompt-connect-to-device')).verifiable(Times.once());
+        depsMock.setup(m => m.stepTransition('detect-devices')).verifiable(Times.once());
 
         const step = detectAdb(depsMock.object);
         await step.onEnter();

From b5f4d680d4556bc4d408891c832b8a7bd3c86f94 Mon Sep 17 00:00:00 2001
From: Dave Tryon <45672944+DaveTryon@users.noreply.github.com>
Date: Wed, 17 Jun 2020 21:36:35 -0700
Subject: [PATCH 44/71] chore(android-setup): Put
 live-android-setup-deps.test.ts in the correct folder (#2912)

---
 .../android/setup/{steps => }/live-android-setup-deps.test.ts     | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/tests/unit/tests/electron/platform/android/setup/{steps => }/live-android-setup-deps.test.ts (100%)

diff --git a/src/tests/unit/tests/electron/platform/android/setup/steps/live-android-setup-deps.test.ts b/src/tests/unit/tests/electron/platform/android/setup/live-android-setup-deps.test.ts
similarity index 100%
rename from src/tests/unit/tests/electron/platform/android/setup/steps/live-android-setup-deps.test.ts
rename to src/tests/unit/tests/electron/platform/android/setup/live-android-setup-deps.test.ts

From f77ae52ad09d8dd3cd25374d9736677dc5e68ddb Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 18 Jun 2020 06:16:28 +0000
Subject: [PATCH 45/71] chore(deps): bump react-resize-detector from 4.2.3 to
 5.0.6 (#2897)

---
 package.json                                  |  2 +-
 .../components/narrow-mode-detector.tsx       | 16 +++++++++++----
 .../narrow-mode-detector.test.tsx.snap        | 14 ++++++++++---
 .../components/narrow-mode-detector.test.tsx  | 20 +++++++++++++++----
 yarn.lock                                     |  8 ++++----
 5 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index 29bb2953b08..3f5a2f51aee 100644
--- a/package.json
+++ b/package.json
@@ -156,7 +156,7 @@
         "react-copy-to-clipboard": "^5.0.2",
         "react-dom": "^16.13.1",
         "react-helmet": "^6.1.0",
-        "react-resize-detector": "^4.2.3",
+        "react-resize-detector": "^5.0.6",
         "react-router-dom": "^5.2.0",
         "ua-parser-js": "^0.7.21",
         "uuid": "^8.1.0",
diff --git a/src/DetailsView/components/narrow-mode-detector.tsx b/src/DetailsView/components/narrow-mode-detector.tsx
index fa0d10a42c6..61a87ebeaee 100644
--- a/src/DetailsView/components/narrow-mode-detector.tsx
+++ b/src/DetailsView/components/narrow-mode-detector.tsx
@@ -4,7 +4,7 @@ import { ReactFCWithDisplayName } from 'common/react/named-fc';
 import * as React from 'react';
 import ReactResizeDetector from 'react-resize-detector';
 
-export type NarrowModeDetectorProps<P = {}> = {
+export type NarrowModeDetectorProps<P = { isNarrowMode: boolean }> = {
     isNarrowModeEnabled: boolean;
     Component: ReactFCWithDisplayName<P & { isNarrowMode: boolean }>;
     childrenProps: P;
@@ -12,13 +12,21 @@ export type NarrowModeDetectorProps<P = {}> = {
 
 const NARROW_MODE_THRESHOLD_IN_PIXEL = 600;
 
-export function NarrowModeDetector<P>(props: NarrowModeDetectorProps<P>): JSX.Element {
-    const render = (dimensions: { width: number }) => {
+export function getNarrowModeComponentWrapper<P>(
+    props: NarrowModeDetectorProps<P>,
+): (dimensions: { width: number }) => JSX.Element {
+    return (dimensions: { width: number }) => {
         const isNarrowMode =
             props.isNarrowModeEnabled === true && dimensions.width < NARROW_MODE_THRESHOLD_IN_PIXEL;
         const childrenProps = props.childrenProps;
         return <props.Component {...childrenProps} isNarrowMode={isNarrowMode} />;
     };
+}
 
-    return <ReactResizeDetector handleWidth querySelector="body" render={render} />;
+export function NarrowModeDetector<P>(props: NarrowModeDetectorProps<P>): JSX.Element {
+    return (
+        <ReactResizeDetector handleWidth={true} handleHeight={false} querySelector="body">
+            {getNarrowModeComponentWrapper(props)}
+        </ReactResizeDetector>
+    );
 }
diff --git a/src/tests/unit/tests/DetailsView/components/__snapshots__/narrow-mode-detector.test.tsx.snap b/src/tests/unit/tests/DetailsView/components/__snapshots__/narrow-mode-detector.test.tsx.snap
index 5ea20448b6f..79a3d5854f4 100644
--- a/src/tests/unit/tests/DetailsView/components/__snapshots__/narrow-mode-detector.test.tsx.snap
+++ b/src/tests/unit/tests/DetailsView/components/__snapshots__/narrow-mode-detector.test.tsx.snap
@@ -8,19 +8,27 @@ exports[`NarrowModeDetector render renders ReactResizeDetector  1`] = `
   onResize={null}
   querySelector="body"
   refreshRate={1000}
-  render={[Function]}
   skipOnMount={false}
   targetDomEl={null}
+  targetRef={null}
+>
+  [Function]
+</ResizeDetector>
+`;
+
+exports[`NarrowModeDetector render renders child component properly when narrow mode is disabled: narrow mode should be false 1`] = `
+<DetailsViewContent
+  isNarrowMode={false}
 />
 `;
 
-exports[`NarrowModeDetector render renders child component properly: narrow mode should be false 1`] = `
+exports[`NarrowModeDetector render renders child component properly when narrow mode is enabled: narrow mode should be false 1`] = `
 <DetailsViewContent
   isNarrowMode={false}
 />
 `;
 
-exports[`NarrowModeDetector render renders child component properly: narrow mode should be true 1`] = `
+exports[`NarrowModeDetector render renders child component properly when narrow mode is enabled: narrow mode should be true 1`] = `
 <DetailsViewContent
   isNarrowMode={true}
 />
diff --git a/src/tests/unit/tests/DetailsView/components/narrow-mode-detector.test.tsx b/src/tests/unit/tests/DetailsView/components/narrow-mode-detector.test.tsx
index ee7aef71b4f..1b46aaa1115 100644
--- a/src/tests/unit/tests/DetailsView/components/narrow-mode-detector.test.tsx
+++ b/src/tests/unit/tests/DetailsView/components/narrow-mode-detector.test.tsx
@@ -2,12 +2,12 @@
 // Licensed under the MIT License.
 import { DetailsViewContent } from 'DetailsView/components/details-view-content';
 import {
+    getNarrowModeComponentWrapper,
     NarrowModeDetector,
     NarrowModeDetectorProps,
 } from 'DetailsView/components/narrow-mode-detector';
 import { shallow } from 'enzyme';
 import * as React from 'react';
-import ReactResizeDetector from 'react-resize-detector';
 
 describe(NarrowModeDetector, () => {
     describe('render', () => {
@@ -21,14 +21,13 @@ describe(NarrowModeDetector, () => {
             expect(wrapper.getElement()).toMatchSnapshot();
         });
 
-        it('renders child component properly', () => {
+        it('renders child component properly when narrow mode is enabled', () => {
             const props: NarrowModeDetectorProps = {
                 isNarrowModeEnabled: true,
                 Component: DetailsViewContent,
                 childrenProps: null,
             };
-            const wrapper = shallow(<NarrowModeDetector {...props} />);
-            const renderFunc = wrapper.find(ReactResizeDetector).props().render;
+            const renderFunc = getNarrowModeComponentWrapper(props);
 
             expect(renderFunc({ width: 10, height: 0 })).toMatchSnapshot(
                 'narrow mode should be true',
@@ -37,5 +36,18 @@ describe(NarrowModeDetector, () => {
                 'narrow mode should be false',
             );
         });
+
+        it('renders child component properly when narrow mode is disabled', () => {
+            const props: NarrowModeDetectorProps = {
+                isNarrowModeEnabled: false,
+                Component: DetailsViewContent,
+                childrenProps: null,
+            };
+            const renderFunc = getNarrowModeComponentWrapper(props);
+
+            expect(renderFunc({ width: 10, height: 0 })).toMatchSnapshot(
+                'narrow mode should be false',
+            );
+        });
     });
 });
diff --git a/yarn.lock b/yarn.lock
index 867f40e8db0..647c23a0b98 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8960,10 +8960,10 @@ react-is@^16.12.0, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-i
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c"
   integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==
 
-react-resize-detector@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/react-resize-detector/-/react-resize-detector-4.2.3.tgz#7df258668a30bdfd88e655bbdb27db7fd7b23127"
-  integrity sha512-4AeS6lxdz2KOgDZaOVt1duoDHrbYwSrUX32KeM9j6t9ISyRphoJbTRCMS1aPFxZHFqcCGLT1gMl3lEcSWZNW0A==
+react-resize-detector@^5.0.6:
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/react-resize-detector/-/react-resize-detector-5.0.6.tgz#7a5b67df1117af83249fbda8bda33df29b0b7e22"
+  integrity sha512-wvyK350xvq3GgRDd8ENE0T5wqTBniGhKuK0rGHeg0L79AlW+2Be6ulecGCzCpC6CE7Zshohf1GZyDaf2onoGFg==
   dependencies:
     lodash "^4.17.15"
     lodash-es "^4.17.15"

From ce7c3480e95b56e45d0a1039fe104c724de3adc5 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 18 Jun 2020 16:28:37 +0000
Subject: [PATCH 46/71] chore(deps-dev): bump @types/react from 16.9.37 to
 16.9.38 (#2915)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 3f5a2f51aee..aac3b57af2e 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
         "@types/moment": "^2.13.0",
         "@types/puppeteer": "^3.0.0",
         "@types/q": "^1.5.4",
-        "@types/react": "^16.9.37",
+        "@types/react": "^16.9.38",
         "@types/react-copy-to-clipboard": "^4.3.0",
         "@types/react-dom": "^16.9.8",
         "@types/react-helmet": "^6.0.0",
diff --git a/yarn.lock b/yarn.lock
index 647c23a0b98..f3c27634e20 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1239,10 +1239,10 @@
     "@types/history" "*"
     "@types/react" "*"
 
-"@types/react@*", "@types/react@^16.9.37":
-  version "16.9.37"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.37.tgz#8fb93e7dbd5b1d3796f69aa979a7fe0439bc7bea"
-  integrity sha512-ZqnAXallQiZ08LTSqMfWMNvAfJEzRLOxdlbbbCIJlYGjU98BEU6bE2uBpKPGeWn+v3hIgCraHKtqUcKZBzMP/Q==
+"@types/react@*", "@types/react@^16.9.38":
+  version "16.9.38"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.38.tgz#868405dace93a4095d3e054f4c4a1de7a1ac0680"
+  integrity sha512-pHAeZbjjNRa/hxyNuLrvbxhhnKyKNiLC6I5fRF2Zr/t/S6zS41MiyzH4+c+1I9vVfvuRt1VS2Lodjr4ZWnxrdA==
   dependencies:
     "@types/prop-types" "*"
     csstype "^2.2.0"

From 7ad5657de4110aaa001359f856d792e04322b5c1 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 18 Jun 2020 16:28:43 +0000
Subject: [PATCH 47/71] chore(deps-dev): bump @types/chrome from 0.0.115 to
 0.0.116 (#2917)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index aac3b57af2e..992ba7b09c4 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
         "7zip-bin": "^5.0.3",
         "@electron/get": "^1.12.2",
         "@types/applicationinsights-js": "^1.0.7",
-        "@types/chrome": "0.0.115",
+        "@types/chrome": "0.0.116",
         "@types/enzyme": "^3.10.5",
         "@types/enzyme-adapter-react-16": "^1.0.6",
         "@types/jest": "^26.0.0",
diff --git a/yarn.lock b/yarn.lock
index f3c27634e20..e860cab6de9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -985,10 +985,10 @@
   dependencies:
     "@types/node" "*"
 
-"@types/chrome@0.0.115":
-  version "0.0.115"
-  resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.115.tgz#dde40ff715a76d8c8125b0fe35287b9fdbc9f3de"
-  integrity sha512-pNoYoYgGuI1/kiz53kjrXrKIjn2H8YWOI+vxVTOubX6arCHk/m/jInoyflKiP2qZHZf8+P+hh6d2y9tjaG4BPQ==
+"@types/chrome@0.0.116":
+  version "0.0.116"
+  resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.116.tgz#acb578685be2b0e9c9e0a64c15d201ccdecb1839"
+  integrity sha512-EM5AoIR1w2PtkyOMtIbQ0FAGmH4nnv28HOAVPtbNQmioc9eUMBYOe6p2BZrv9shXVV62WtyNiPi2FWS44A7BTg==
   dependencies:
     "@types/filesystem" "*"
     "@types/har-format" "*"

From 477f7764f9329876220cc3a8da4445d977fa0608 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 18 Jun 2020 16:28:52 +0000
Subject: [PATCH 48/71] chore(deps-dev): bump simple-git from 2.7.0 to 2.7.2
 (#2918)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 992ba7b09c4..f924fd689c0 100644
--- a/package.json
+++ b/package.json
@@ -121,7 +121,7 @@
         "sass-loader": "^8.0.2",
         "script-loader": "0.7.2",
         "serve-static": "^1.13.2",
-        "simple-git": "^2.7.0",
+        "simple-git": "^2.7.2",
         "source-map-loader": "^1.0.0",
         "spectron": "^10.0.1",
         "terser-webpack-plugin": "^3.0.5",
diff --git a/yarn.lock b/yarn.lock
index e860cab6de9..de8bb2bd867 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9839,10 +9839,10 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
   integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
 
-simple-git@^2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-2.7.0.tgz#b555392021f5553c14530c917eae1d6f914b1672"
-  integrity sha512-NpNNe0hOz3DMRWB9ewK83p/nMAkGrNO/VlWhMDaI3OdUO3UNoMv5+XlMOzO52jCyl+RZbVrIuNMpxtR4C1TQXw==
+simple-git@^2.7.2:
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-2.7.2.tgz#6b0de98fbdc94e22dfca5a306dc59155cff3cb40"
+  integrity sha512-SXsUw80Fppq72JI+QhfKY5d4sk8WQ2CppAcjp559OInjxYZzco7L9scsd5NwForcaQSCstNh7tsW6NnrGYfdgg==
   dependencies:
     "@kwsites/file-exists" "^1.1.1"
     debug "^4.1.1"

From bc81321f2da0e9fb5f4caabd443ea26211db419d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 18 Jun 2020 16:28:59 +0000
Subject: [PATCH 49/71] chore(deps-dev): bump webpack-cli from 3.3.11 to 3.3.12
 (#2919)

---
 package.json |   2 +-
 yarn.lock    | 174 +++++++++++++++++++++++----------------------------
 2 files changed, 81 insertions(+), 95 deletions(-)

diff --git a/package.json b/package.json
index f924fd689c0..fac25a41c2d 100644
--- a/package.json
+++ b/package.json
@@ -134,7 +134,7 @@
         "typescript": "^3.9.5",
         "webdriverio": "^4.13.0",
         "webpack": "^4.43.0",
-        "webpack-cli": "^3.3.11",
+        "webpack-cli": "^3.3.12",
         "webpack-node-externals": "^1.7.2"
     },
     "dependencies": {
diff --git a/yarn.lock b/yarn.lock
index de8bb2bd867..b100075aa4c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2717,15 +2717,6 @@ caseless@~0.12.0:
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
-chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2, chalk@~2.4.1:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
 chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
@@ -2737,6 +2728,15 @@ chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2, chalk@~2.4.1:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
 chalk@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
@@ -3255,17 +3255,6 @@ cross-env@^7.0.2:
   dependencies:
     cross-spawn "^7.0.1"
 
-cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
-  dependencies:
-    nice-try "^1.0.4"
-    path-key "^2.0.1"
-    semver "^5.5.0"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
 cross-spawn@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
@@ -3283,6 +3272,17 @@ cross-spawn@^5.0.1:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
+cross-spawn@^6.0.0, cross-spawn@^6.0.5:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
+  dependencies:
+    nice-try "^1.0.4"
+    path-key "^2.0.1"
+    semver "^5.5.0"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
 cross-spawn@^7.0.0, cross-spawn@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.1.tgz#0ab56286e0f7c24e153d04cc2aa027e43a9a5d14"
@@ -3940,11 +3940,6 @@ emoji-regex@^8.0.0:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
-emojis-list@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
-  integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
-
 emojis-list@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
@@ -3962,19 +3957,10 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1:
   dependencies:
     once "^1.4.0"
 
-enhanced-resolve@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
-  integrity sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==
-  dependencies:
-    graceful-fs "^4.1.2"
-    memory-fs "^0.4.0"
-    tapable "^1.0.0"
-
-enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz#2937e2b8066cd0fe7ce0990a98f0d71a35189f66"
-  integrity sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==
+enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.0, enhanced-resolve@^4.1.1:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.2.0.tgz#5d43bda4a0fd447cb0ebbe71bef8deff8805ad0d"
+  integrity sha512-S7eiFb/erugyd1rLb6mQ3Vuq+EXHv5cpCkNqqIkYkBgN2QdFnyCZzFBleqwGEx4lgNGYij81BWnCrFNK7vxvjQ==
   dependencies:
     graceful-fs "^4.1.2"
     memory-fs "^0.5.0"
@@ -4588,16 +4574,6 @@ find-up@^4.0.0, find-up@^4.1.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
-findup-sync@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz#17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1"
-  integrity sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==
-  dependencies:
-    detect-file "^1.0.0"
-    is-glob "^4.0.0"
-    micromatch "^3.0.4"
-    resolve-dir "^1.0.1"
-
 findup-sync@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
@@ -4608,6 +4584,16 @@ findup-sync@^2.0.0:
     micromatch "^3.0.4"
     resolve-dir "^1.0.1"
 
+findup-sync@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz#17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1"
+  integrity sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==
+  dependencies:
+    detect-file "^1.0.0"
+    is-glob "^4.0.0"
+    micromatch "^3.0.4"
+    resolve-dir "^1.0.1"
+
 findup-sync@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.3.0.tgz#37930aa5d816b777c03445e1966cc6790a4c0b16"
@@ -5003,13 +4989,6 @@ global-dirs@^2.0.1:
   dependencies:
     ini "^1.3.5"
 
-global-modules@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
-  integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==
-  dependencies:
-    global-prefix "^3.0.0"
-
 global-modules@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
@@ -5019,6 +4998,13 @@ global-modules@^1.0.0:
     is-windows "^1.0.1"
     resolve-dir "^1.0.0"
 
+global-modules@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
+  integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==
+  dependencies:
+    global-prefix "^3.0.0"
+
 global-prefix@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
@@ -5617,7 +5603,7 @@ import-lazy@^2.1.0:
   resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
   integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=
 
-import-local@2.0.0:
+import-local@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
   integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==
@@ -5713,10 +5699,10 @@ inquirer@~3.3.0:
     strip-ansi "^4.0.0"
     through "^2.3.6"
 
-interpret@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296"
-  integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==
+interpret@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
+  integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
 
 interpret@~1.1.0:
   version "1.1.0"
@@ -6898,13 +6884,13 @@ loader-runner@^2.4.0:
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
   integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
 
-loader-utils@1.2.3, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
-  integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
+loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
+  integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
   dependencies:
     big.js "^5.2.2"
-    emojis-list "^2.0.0"
+    emojis-list "^3.0.0"
     json5 "^1.0.1"
 
 loader-utils@^2.0.0:
@@ -7131,7 +7117,7 @@ memfs@^3.1.2:
   dependencies:
     fs-monkey "1.0.1"
 
-memory-fs@^0.4.0, memory-fs@^0.4.1:
+memory-fs@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
   integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
@@ -10347,13 +10333,6 @@ sumchecker@^3.0.1:
   dependencies:
     debug "^4.1.0"
 
-supports-color@6.1.0, supports-color@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
-  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
-  dependencies:
-    has-flag "^3.0.0"
-
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
@@ -10373,6 +10352,13 @@ supports-color@^5.3.0, supports-color@^5.4.0:
   dependencies:
     has-flag "^3.0.0"
 
+supports-color@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
+  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
+  dependencies:
+    has-flag "^3.0.0"
+
 supports-color@^7.0.0, supports-color@^7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
@@ -11209,10 +11195,10 @@ uuid@^8.0.0, uuid@^8.1.0:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.1.0.tgz#6f1536eb43249f473abc6bd58ff983da1ca30d8d"
   integrity sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg==
 
-v8-compile-cache@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz#00f7494d2ae2b688cfe2899df6ed2c54bef91dbe"
-  integrity sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w==
+v8-compile-cache@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz#54bc3cdd43317bca91e35dcaf305b1a7237de745"
+  integrity sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==
 
 v8-to-istanbul@^4.1.3:
   version "4.1.3"
@@ -11352,22 +11338,22 @@ webidl-conversions@^6.0.0:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
   integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
 
-webpack-cli@^3.3.11:
-  version "3.3.11"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.11.tgz#3bf21889bf597b5d82c38f215135a411edfdc631"
-  integrity sha512-dXlfuml7xvAFwYUPsrtQAA9e4DOe58gnzSxhgrO/ZM/gyXTBowrsYeubyN4mqGhYdpXMFNyQ6emjJS9M7OBd4g==
-  dependencies:
-    chalk "2.4.2"
-    cross-spawn "6.0.5"
-    enhanced-resolve "4.1.0"
-    findup-sync "3.0.0"
-    global-modules "2.0.0"
-    import-local "2.0.0"
-    interpret "1.2.0"
-    loader-utils "1.2.3"
-    supports-color "6.1.0"
-    v8-compile-cache "2.0.3"
-    yargs "13.2.4"
+webpack-cli@^3.3.12:
+  version "3.3.12"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.12.tgz#94e9ada081453cd0aa609c99e500012fd3ad2d4a"
+  integrity sha512-NVWBaz9k839ZH/sinurM+HcDvJOTXwSjYp1ku+5XKeOC03z8v5QitnK/x+lAxGXFyhdayoIf/GOpv85z3/xPag==
+  dependencies:
+    chalk "^2.4.2"
+    cross-spawn "^6.0.5"
+    enhanced-resolve "^4.1.1"
+    findup-sync "^3.0.0"
+    global-modules "^2.0.0"
+    import-local "^2.0.0"
+    interpret "^1.4.0"
+    loader-utils "^1.4.0"
+    supports-color "^6.1.0"
+    v8-compile-cache "^2.1.1"
+    yargs "^13.3.2"
 
 webpack-node-externals@^1.7.2:
   version "1.7.2"
@@ -11668,7 +11654,7 @@ yargs-parser@18.x, yargs-parser@^18.1.1:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs@13.2.4, yargs@^13.3.0, yargs@^13.3.2, yargs@^15.0.2, yargs@^15.3.1:
+yargs@^13.3.0, yargs@^13.3.2, yargs@^15.0.2, yargs@^15.3.1:
   version "15.3.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.1.tgz#9505b472763963e54afe60148ad27a330818e98b"
   integrity sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==

From 6ea005a08c145caa7cafc8f2dde4c695d5d204af Mon Sep 17 00:00:00 2001
From: Wahaj <32555133+waabid@users.noreply.github.com>
Date: Thu, 18 Jun 2020 10:57:20 -0700
Subject: [PATCH 50/71] fix: background color should extend for entire right
 panel (#2901)

---
 src/DetailsView/Styles/detailsview.scss                     | 3 +++
 src/DetailsView/details-view-body.scss                      | 6 ++++++
 src/DetailsView/details-view-body.tsx                       | 4 ++--
 .../__snapshots__/details-view-body.test.tsx.snap           | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 src/DetailsView/details-view-body.scss

diff --git a/src/DetailsView/Styles/detailsview.scss b/src/DetailsView/Styles/detailsview.scss
index 428a2bb9061..e6ac4fdc70a 100644
--- a/src/DetailsView/Styles/detailsview.scss
+++ b/src/DetailsView/Styles/detailsview.scss
@@ -193,6 +193,7 @@ div.insights-file-issue-details-dialog-container {
 #details-container {
     display: flex;
     flex-direction: column;
+    height: 100%;
 
     .ms-Nav-compositeLink a {
         border-left: $pivotItemLeftBorderWidth $pivotItemBorderStyle $neutral-0;
@@ -244,6 +245,7 @@ div.insights-file-issue-details-dialog-container {
         grid-template-rows: 1fr;
         width: 100%;
         min-height: 0;
+        height: 100%;
         &.reflow-ui {
             grid-template-columns: $detailsViewReflowLeftNavWidth 1fr;
         }
@@ -439,6 +441,7 @@ div.insights-file-issue-details-dialog-container {
         .details-view-body-content-pane {
             display: flex;
             flex-direction: column;
+            height: 100%;
             &.reflow-ui {
                 word-break: break-word;
             }
diff --git a/src/DetailsView/details-view-body.scss b/src/DetailsView/details-view-body.scss
new file mode 100644
index 00000000000..f4c1cfb50c3
--- /dev/null
+++ b/src/DetailsView/details-view-body.scss
@@ -0,0 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+.details-view-body {
+    height: 100%;
+}
diff --git a/src/DetailsView/details-view-body.tsx b/src/DetailsView/details-view-body.tsx
index 26d5e5f721f..2b64f2e7762 100644
--- a/src/DetailsView/details-view-body.tsx
+++ b/src/DetailsView/details-view-body.tsx
@@ -8,9 +8,9 @@ import { CardsViewModel } from 'common/types/store-data/card-view-model';
 import { ScanMetadata } from 'common/types/store-data/unified-data-interface';
 import { DetailsViewCommandBarProps } from 'DetailsView/components/details-view-command-bar';
 import { FluentSideNav, FluentSideNavDeps } from 'DetailsView/components/left-nav/fluent-side-nav';
+import * as styles from 'DetailsView/details-view-body.scss';
 import { ISelection } from 'office-ui-fabric-react';
 import * as React from 'react';
-
 import { VisualizationConfigurationFactory } from '../common/configs/visualization-configuration-factory';
 import { DropdownClickHandler } from '../common/dropdown-click-handler';
 import { AssessmentStoreData } from '../common/types/store-data/assessment-result-data';
@@ -82,7 +82,7 @@ export class DetailsViewBody extends React.Component<DetailsViewBodyProps> {
         });
 
         return (
-            <div className="details-view-body">
+            <div className={styles.detailsViewBody}>
                 {this.renderCommandBar()}
                 <div className={bodyLayoutClassName}>
                     {this.renderNavBar()}
diff --git a/src/tests/unit/tests/DetailsView/__snapshots__/details-view-body.test.tsx.snap b/src/tests/unit/tests/DetailsView/__snapshots__/details-view-body.test.tsx.snap
index 405cca9b77e..a4058f9ff8b 100644
--- a/src/tests/unit/tests/DetailsView/__snapshots__/details-view-body.test.tsx.snap
+++ b/src/tests/unit/tests/DetailsView/__snapshots__/details-view-body.test.tsx.snap
@@ -2,7 +2,7 @@
 
 exports[`DetailsViewBody render render 1`] = `
 <div
-  className="details-view-body"
+  className="detailsViewBody"
 >
   <test
     assessmentStoreData={

From 4388a980308200cac93d1f211f092d2e96b2d9aa Mon Sep 17 00:00:00 2001
From: Wahaj <32555133+waabid@users.noreply.github.com>
Date: Thu, 18 Jun 2020 10:57:31 -0700
Subject: [PATCH 51/71] chore: clean up ovisualization configurations (#2902)

---
 .../color/visualization.tsx                   | 22 +++++++++----------
 .../headings/visualization.tsx                | 22 +++++++++----------
 .../issues/visualization.tsx                  | 22 ++++++++++---------
 .../landmarks/visualization.tsx               | 22 +++++++++----------
 .../tab-stops/visualization.tsx               | 17 ++++++++------
 src/assessments/assessment-builder.tsx        |  4 +---
 .../assessment-visualization-configuration.ts |  5 -----
 .../assessments/assessment-builder.test.tsx   |  8 +------
 8 files changed, 57 insertions(+), 65 deletions(-)

diff --git a/src/ad-hoc-visualizations/color/visualization.tsx b/src/ad-hoc-visualizations/color/visualization.tsx
index d399f47bfc2..003fdc51879 100644
--- a/src/ad-hoc-visualizations/color/visualization.tsx
+++ b/src/ad-hoc-visualizations/color/visualization.tsx
@@ -9,12 +9,22 @@ import { VisualizationType } from 'common/types/visualization-type';
 import { generateUID } from 'common/uid-generator';
 import { adhoc as content } from 'content/adhoc';
 import { AdhocStaticTestView } from 'DetailsView/components/adhoc-static-test-view';
+import { RuleAnalyzerConfiguration } from 'injected/analyzers/analyzer';
 import { ScannerUtils } from 'injected/scanner-utils';
 import { VisualizationInstanceProcessor } from 'injected/visualization-instance-processor';
 import * as React from 'react';
 
 const { guidance } = content.color;
 
+const colorRuleAnalyzerConfiguration: RuleAnalyzerConfiguration = {
+    rules: ['select-body'],
+    resultProcessor: (scanner: ScannerUtils) => scanner.getAllCompletedInstances,
+    telemetryProcessor: (telemetryFactory: TelemetryDataFactory) => telemetryFactory.forTestScan,
+    key: AdHocTestkeys.Color,
+    testType: VisualizationType.Color,
+    analyzerMessageType: Messages.Visualizations.Common.ScanCompleted,
+};
+
 export const ColorAdHocVisualization: VisualizationConfiguration = {
     getTestView: props => <AdhocStaticTestView {...props} />,
     key: AdHocTestkeys.Color,
@@ -32,17 +42,7 @@ export const ColorAdHocVisualization: VisualizationConfiguration = {
     chromeCommand: '05_toggle-color',
     launchPanelDisplayOrder: 5,
     adhocToolsPanelDisplayOrder: 2,
-    resultProcessor: (scanner: ScannerUtils) => scanner.getAllCompletedInstances,
-    getAnalyzer: provider =>
-        provider.createRuleAnalyzer({
-            rules: ['select-body'],
-            resultProcessor: (scanner: ScannerUtils) => scanner.getAllCompletedInstances,
-            telemetryProcessor: (telemetryFactory: TelemetryDataFactory) =>
-                telemetryFactory.forTestScan,
-            key: AdHocTestkeys.Color,
-            testType: VisualizationType.Color,
-            analyzerMessageType: Messages.Visualizations.Common.ScanCompleted,
-        }),
+    getAnalyzer: provider => provider.createRuleAnalyzer(colorRuleAnalyzerConfiguration),
     getIdentifier: () => AdHocTestkeys.Color,
     visualizationInstanceProcessor: () => VisualizationInstanceProcessor.nullProcessor,
     getNotificationMessage: selectorMap => null,
diff --git a/src/ad-hoc-visualizations/headings/visualization.tsx b/src/ad-hoc-visualizations/headings/visualization.tsx
index 073455432c6..51c4a5532b6 100644
--- a/src/ad-hoc-visualizations/headings/visualization.tsx
+++ b/src/ad-hoc-visualizations/headings/visualization.tsx
@@ -9,6 +9,7 @@ import { VisualizationType } from 'common/types/visualization-type';
 import { generateUID } from 'common/uid-generator';
 import { adhoc as content } from 'content/adhoc';
 import { AdhocStaticTestView } from 'DetailsView/components/adhoc-static-test-view';
+import { RuleAnalyzerConfiguration } from 'injected/analyzers/analyzer';
 import { ScannerUtils } from 'injected/scanner-utils';
 import { VisualizationInstanceProcessor } from 'injected/visualization-instance-processor';
 import { isEmpty } from 'lodash';
@@ -16,6 +17,15 @@ import * as React from 'react';
 
 const { guidance } = content.headings;
 
+const headingsRuleAnalyzerConfiguration: RuleAnalyzerConfiguration = {
+    rules: ['heading-order'],
+    resultProcessor: (scanner: ScannerUtils) => scanner.getAllCompletedInstances,
+    telemetryProcessor: (telemetryFactory: TelemetryDataFactory) => telemetryFactory.forTestScan,
+    key: AdHocTestkeys.Headings,
+    testType: VisualizationType.Headings,
+    analyzerMessageType: Messages.Visualizations.Common.ScanCompleted,
+};
+
 export const HeadingsAdHocVisualization: VisualizationConfiguration = {
     getTestView: props => <AdhocStaticTestView {...props} />,
     key: AdHocTestkeys.Headings,
@@ -33,17 +43,7 @@ export const HeadingsAdHocVisualization: VisualizationConfiguration = {
     chromeCommand: '03_toggle-headings',
     launchPanelDisplayOrder: 3,
     adhocToolsPanelDisplayOrder: 3,
-    resultProcessor: (scanner: ScannerUtils) => scanner.getAllCompletedInstances,
-    getAnalyzer: provider =>
-        provider.createRuleAnalyzer({
-            rules: ['heading-order'],
-            resultProcessor: (scanner: ScannerUtils) => scanner.getAllCompletedInstances,
-            telemetryProcessor: (telemetryFactory: TelemetryDataFactory) =>
-                telemetryFactory.forTestScan,
-            key: AdHocTestkeys.Headings,
-            testType: VisualizationType.Headings,
-            analyzerMessageType: Messages.Visualizations.Common.ScanCompleted,
-        }),
+    getAnalyzer: provider => provider.createRuleAnalyzer(headingsRuleAnalyzerConfiguration),
     getIdentifier: () => AdHocTestkeys.Headings,
     visualizationInstanceProcessor: () => VisualizationInstanceProcessor.nullProcessor,
     getNotificationMessage: selectorMap => (isEmpty(selectorMap) ? 'No headings found' : null),
diff --git a/src/ad-hoc-visualizations/issues/visualization.tsx b/src/ad-hoc-visualizations/issues/visualization.tsx
index eb9d5e21406..92378060ac9 100644
--- a/src/ad-hoc-visualizations/issues/visualization.tsx
+++ b/src/ad-hoc-visualizations/issues/visualization.tsx
@@ -10,10 +10,21 @@ import { TelemetryDataFactory } from 'common/telemetry-data-factory';
 import { VisualizationType } from 'common/types/visualization-type';
 import { generateUID } from 'common/uid-generator';
 import { AdhocIssuesTestView } from 'DetailsView/components/adhoc-issues-test-view';
+import { RuleAnalyzerConfiguration } from 'injected/analyzers/analyzer';
 import { ScannerUtils } from 'injected/scanner-utils';
 import { VisualizationInstanceProcessor } from 'injected/visualization-instance-processor';
 import * as React from 'react';
 
+const issuesRuleAnalyzerConfiguration: RuleAnalyzerConfiguration = {
+    rules: null,
+    resultProcessor: (scanner: ScannerUtils) => scanner.getFailingInstances,
+    telemetryProcessor: (telemetryFactory: TelemetryDataFactory) =>
+        telemetryFactory.forIssuesAnalyzerScan,
+    key: AdHocTestkeys.Issues,
+    testType: VisualizationType.Issues,
+    analyzerMessageType: Messages.Visualizations.Common.ScanCompleted,
+};
+
 export const IssuesAdHocVisualization: VisualizationConfiguration = {
     key: AdHocTestkeys.Issues,
     testMode: TestMode.Adhoc,
@@ -43,17 +54,8 @@ export const IssuesAdHocVisualization: VisualizationConfiguration = {
     chromeCommand: '01_toggle-issues',
     launchPanelDisplayOrder: 1,
     adhocToolsPanelDisplayOrder: 1,
-    resultProcessor: (scanner: ScannerUtils) => scanner.getFailingInstances,
     getAnalyzer: provider =>
-        provider.createRuleAnalyzerUnifiedScan({
-            rules: null,
-            resultProcessor: (scanner: ScannerUtils) => scanner.getFailingInstances,
-            telemetryProcessor: (telemetryFactory: TelemetryDataFactory) =>
-                telemetryFactory.forIssuesAnalyzerScan,
-            key: AdHocTestkeys.Issues,
-            testType: VisualizationType.Issues,
-            analyzerMessageType: Messages.Visualizations.Common.ScanCompleted,
-        }),
+        provider.createRuleAnalyzerUnifiedScan(issuesRuleAnalyzerConfiguration),
     getIdentifier: () => AdHocTestkeys.Issues,
     visualizationInstanceProcessor: () => VisualizationInstanceProcessor.nullProcessor,
     getNotificationMessage: (selectorMap, key, warnings) =>
diff --git a/src/ad-hoc-visualizations/landmarks/visualization.tsx b/src/ad-hoc-visualizations/landmarks/visualization.tsx
index 937e834f7ac..483bf7aa390 100644
--- a/src/ad-hoc-visualizations/landmarks/visualization.tsx
+++ b/src/ad-hoc-visualizations/landmarks/visualization.tsx
@@ -9,6 +9,7 @@ import { VisualizationType } from 'common/types/visualization-type';
 import { generateUID } from 'common/uid-generator';
 import { adhoc as content } from 'content/adhoc';
 import { AdhocStaticTestView } from 'DetailsView/components/adhoc-static-test-view';
+import { RuleAnalyzerConfiguration } from 'injected/analyzers/analyzer';
 import { ScannerUtils } from 'injected/scanner-utils';
 import { VisualizationInstanceProcessor } from 'injected/visualization-instance-processor';
 import { isEmpty } from 'lodash';
@@ -16,6 +17,15 @@ import * as React from 'react';
 
 const { guidance } = content.landmarks;
 
+const landmarkRuleAnalyzerConfiguration: RuleAnalyzerConfiguration = {
+    rules: ['unique-landmark'],
+    resultProcessor: (scanner: ScannerUtils) => scanner.getAllCompletedInstances,
+    telemetryProcessor: (telemetryFactory: TelemetryDataFactory) => telemetryFactory.forTestScan,
+    key: AdHocTestkeys.Landmarks,
+    testType: VisualizationType.Landmarks,
+    analyzerMessageType: Messages.Visualizations.Common.ScanCompleted,
+};
+
 export const LandmarksAdHocVisualization: VisualizationConfiguration = {
     getTestView: props => <AdhocStaticTestView {...props} />,
     key: AdHocTestkeys.Landmarks,
@@ -33,17 +43,7 @@ export const LandmarksAdHocVisualization: VisualizationConfiguration = {
     chromeCommand: '02_toggle-landmarks',
     launchPanelDisplayOrder: 2,
     adhocToolsPanelDisplayOrder: 4,
-    resultProcessor: (scanner: ScannerUtils) => scanner.getAllCompletedInstances,
-    getAnalyzer: provider =>
-        provider.createRuleAnalyzer({
-            rules: ['unique-landmark'],
-            resultProcessor: (scanner: ScannerUtils) => scanner.getAllCompletedInstances,
-            telemetryProcessor: (telemetryFactory: TelemetryDataFactory) =>
-                telemetryFactory.forTestScan,
-            key: AdHocTestkeys.Landmarks,
-            testType: VisualizationType.Landmarks,
-            analyzerMessageType: Messages.Visualizations.Common.ScanCompleted,
-        }),
+    getAnalyzer: provider => provider.createRuleAnalyzer(landmarkRuleAnalyzerConfiguration),
     getIdentifier: () => AdHocTestkeys.Landmarks,
     visualizationInstanceProcessor: () => VisualizationInstanceProcessor.nullProcessor,
     getNotificationMessage: selectorMap => (isEmpty(selectorMap) ? 'No landmarks found' : null),
diff --git a/src/ad-hoc-visualizations/tab-stops/visualization.tsx b/src/ad-hoc-visualizations/tab-stops/visualization.tsx
index b4e8fafd6b3..aaee244482c 100644
--- a/src/ad-hoc-visualizations/tab-stops/visualization.tsx
+++ b/src/ad-hoc-visualizations/tab-stops/visualization.tsx
@@ -9,11 +9,20 @@ import { generateUID } from 'common/uid-generator';
 import { adhoc as content } from 'content/adhoc';
 import { createHowToTest } from 'content/adhoc/tabstops/how-to-test';
 import { AdhocStaticTestView } from 'DetailsView/components/adhoc-static-test-view';
+import { FocusAnalyzerConfiguration } from 'injected/analyzers/analyzer';
 import { VisualizationInstanceProcessor } from 'injected/visualization-instance-processor';
 import * as React from 'react';
 
 const { guidance, extraGuidance } = content.tabstops;
 
+const tabStopVisualizationConfiguration: FocusAnalyzerConfiguration = {
+    key: AdHocTestkeys.TabStops,
+    testType: VisualizationType.TabStops,
+    analyzerMessageType: Messages.Visualizations.Common.ScanCompleted,
+    analyzerProgressMessageType: Messages.Visualizations.TabStops.TabbedElementAdded,
+    analyzerTerminatedMessageType: Messages.Visualizations.TabStops.TerminateScan,
+};
+
 export const TabStopsAdHocVisualization: VisualizationConfiguration = {
     getTestView: props => (
         <AdhocStaticTestView content={createHowToTest(2)} guidance={extraGuidance} {...props} />
@@ -36,13 +45,7 @@ export const TabStopsAdHocVisualization: VisualizationConfiguration = {
     analyzerProgressMessageType: Messages.Visualizations.TabStops.TabbedElementAdded,
     analyzerTerminatedMessageType: Messages.Visualizations.TabStops.TerminateScan,
     getAnalyzer: provider =>
-        provider.createFocusTrackingAnalyzer({
-            key: AdHocTestkeys.TabStops,
-            testType: VisualizationType.TabStops,
-            analyzerMessageType: Messages.Visualizations.Common.ScanCompleted,
-            analyzerProgressMessageType: Messages.Visualizations.TabStops.TabbedElementAdded,
-            analyzerTerminatedMessageType: Messages.Visualizations.TabStops.TerminateScan,
-        }),
+        provider.createFocusTrackingAnalyzer(tabStopVisualizationConfiguration),
     getIdentifier: () => AdHocTestkeys.TabStops,
     visualizationInstanceProcessor: () => VisualizationInstanceProcessor.nullProcessor,
     getDrawer: provider => provider.createSVGDrawer(),
diff --git a/src/assessments/assessment-builder.tsx b/src/assessments/assessment-builder.tsx
index a01c3f3bed5..8bbf4bea2ea 100644
--- a/src/assessments/assessment-builder.tsx
+++ b/src/assessments/assessment-builder.tsx
@@ -20,7 +20,7 @@ import {
 import { AssessmentTestView } from 'DetailsView/components/assessment-test-view';
 import { RequirementLink } from 'DetailsView/components/requirement-link';
 import { AnalyzerProvider } from 'injected/analyzers/analyzer-provider';
-import { DecoratedAxeNodeResult, ScannerUtils } from 'injected/scanner-utils';
+import { DecoratedAxeNodeResult } from 'injected/scanner-utils';
 import {
     PropertyBags,
     VisualizationInstanceProcessor,
@@ -31,7 +31,6 @@ import { cloneDeep } from 'lodash';
 import { IColumn } from 'office-ui-fabric-react';
 import * as React from 'react';
 import { DictionaryStringTo } from 'types/common-types';
-
 import { Assessment, AssistedAssessment, ManualAssessment } from './types/iassessment';
 import { ReportInstanceField } from './types/report-instance-field';
 import { Requirement } from './types/requirement';
@@ -286,7 +285,6 @@ export class AssessmentBuilder {
             enableTest: AssessmentBuilder.enableTest,
             disableTest: AssessmentBuilder.disableTest,
             getTestStatus: AssessmentBuilder.getTestStatus,
-            resultProcessor: (scanner: ScannerUtils) => scanner.getAllCompletedInstances,
             telemetryProcessor: factory => factory.forAssessmentRequirementScan,
             ...assessment.visualizationConfiguration,
             key: assessment.storeDataKey,
diff --git a/src/common/configs/assessment-visualization-configuration.ts b/src/common/configs/assessment-visualization-configuration.ts
index 9a1e07c8c90..9b2866cbd92 100644
--- a/src/common/configs/assessment-visualization-configuration.ts
+++ b/src/common/configs/assessment-visualization-configuration.ts
@@ -6,14 +6,12 @@ import { ScanIncompleteWarningId } from 'common/types/scan-incomplete-warnings';
 import { TestViewProps } from '../../DetailsView/components/test-view';
 import { Analyzer } from '../../injected/analyzers/analyzer';
 import { AnalyzerProvider } from '../../injected/analyzers/analyzer-provider';
-import { HtmlElementAxeResults, ScannerUtils } from '../../injected/scanner-utils';
 import {
     PropertyBags,
     VisualizationInstanceProcessorCallback,
 } from '../../injected/visualization-instance-processor';
 import { Drawer } from '../../injected/visualization/drawer';
 import { DrawerProvider } from '../../injected/visualization/drawer-provider';
-import { ScanResults } from '../../scanner/iruleresults';
 import { DictionaryStringTo } from '../../types/common-types';
 import { IAnalyzerTelemetryCallback } from '../types/analyzer-telemetry-callbacks';
 import { AssessmentData, AssessmentStoreData } from '../types/store-data/assessment-result-data';
@@ -34,9 +32,6 @@ export interface AssessmentVisualizationConfiguration {
         instanceMap?: DictionaryStringTo<any>,
     ) => void;
     analyzerProgressMessageType?: string;
-    resultProcessor?: (
-        scanner: ScannerUtils,
-    ) => (results: ScanResults) => DictionaryStringTo<HtmlElementAxeResults>;
     telemetryProcessor?: TelemetryProcessor<IAnalyzerTelemetryCallback>;
     getAnalyzer: (analyzerProvider: AnalyzerProvider, testStep?: string) => Analyzer;
     getIdentifier: (testStep?: string) => string;
diff --git a/src/tests/unit/tests/assessments/assessment-builder.test.tsx b/src/tests/unit/tests/assessments/assessment-builder.test.tsx
index a5ad3bf8410..527d21fb24d 100644
--- a/src/tests/unit/tests/assessments/assessment-builder.test.tsx
+++ b/src/tests/unit/tests/assessments/assessment-builder.test.tsx
@@ -24,7 +24,7 @@ import { RequirementLink } from '../../../../DetailsView/components/requirement-
 import { TestViewProps } from '../../../../DetailsView/components/test-view';
 import { AnalyzerConfiguration } from '../../../../injected/analyzers/analyzer';
 import { AnalyzerProvider } from '../../../../injected/analyzers/analyzer-provider';
-import { DecoratedAxeNodeResult, ScannerUtils } from '../../../../injected/scanner-utils';
+import { DecoratedAxeNodeResult } from '../../../../injected/scanner-utils';
 import { VisualizationInstanceProcessor } from '../../../../injected/visualization-instance-processor';
 import { DrawerProvider } from '../../../../injected/visualization/drawer-provider';
 
@@ -179,9 +179,6 @@ describe('AssessmentBuilderTest', () => {
             getDrawer: getDrawerMock.object,
             switchToTargetTabOnScan: true,
         };
-        const scannerStub = {
-            getAllCompletedInstances: {},
-        };
         const telemetryFactoryStub = {
             forAssessmentRequirementScan: {},
         };
@@ -281,9 +278,6 @@ describe('AssessmentBuilderTest', () => {
         config.getDrawer(drawerProviderMock.object, requirement5.key);
 
         expect(config.getStoreData(vizStoreData)).toEqual(scanData);
-        expect(config.resultProcessor(scannerStub as ScannerUtils)).toEqual(
-            scannerStub.getAllCompletedInstances,
-        );
         expect(config.telemetryProcessor(telemetryFactoryStub as TelemetryDataFactory)).toEqual(
             telemetryFactoryStub.forAssessmentRequirementScan,
         );

From 486b0dc70f58d3435457d4957f049ce7f23712c8 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 18 Jun 2020 21:07:49 +0000
Subject: [PATCH 52/71] chore(deps-dev): bump terser-webpack-plugin from 3.0.5
 to 3.0.6 (#2916)

---
 package.json |  2 +-
 yarn.lock    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index fac25a41c2d..d305573ec77 100644
--- a/package.json
+++ b/package.json
@@ -124,7 +124,7 @@
         "simple-git": "^2.7.2",
         "source-map-loader": "^1.0.0",
         "spectron": "^10.0.1",
-        "terser-webpack-plugin": "^3.0.5",
+        "terser-webpack-plugin": "^3.0.6",
         "ts-jest": "^26.1.0",
         "ts-loader": "^7.0.5",
         "tslint": "^5.20.1",
diff --git a/yarn.lock b/yarn.lock
index b100075aa4c..89d990ef17b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10524,10 +10524,10 @@ terser-webpack-plugin@^1.4.3:
     webpack-sources "^1.4.0"
     worker-farm "^1.7.0"
 
-terser-webpack-plugin@^3.0.5:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-3.0.5.tgz#f048cfbddd6098b10a8737f3165344529656daad"
-  integrity sha512-pyHUyfQUZB3ciYL81GgXzDh8Qb3fGED77xDjZVSFYSN1cQnWgC51OMPKj7vBWVZx0GGuYhpa9+Vz2KxkzXWhBA==
+terser-webpack-plugin@^3.0.6:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-3.0.6.tgz#db0a108bbdd3680d72c9b491fbabad09ba207b99"
+  integrity sha512-z3HLOOPUHkCNGkeEHqqiMAIy1pjpHwS1o+i6Zn0Ws3EAvHJj46737efNNEvJ0Vx9BdDQM83d56qySDJOSORA0A==
   dependencies:
     cacache "^15.0.4"
     find-cache-dir "^3.3.1"
@@ -10536,13 +10536,13 @@ terser-webpack-plugin@^3.0.5:
     schema-utils "^2.6.6"
     serialize-javascript "^4.0.0"
     source-map "^0.6.1"
-    terser "^4.6.13"
+    terser "^4.8.0"
     webpack-sources "^1.4.3"
 
-terser@^4.1.2, terser@^4.6.13:
-  version "4.6.13"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.13.tgz#e879a7364a5e0db52ba4891ecde007422c56a916"
-  integrity sha512-wMvqukYgVpQlymbnNbabVZbtM6PN63AzqexpwJL8tbh/mRT9LE5o+ruVduAGL7D6Fpjl+Q+06U5I9Ul82odAhw==
+terser@^4.1.2, terser@^4.8.0:
+  version "4.8.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
+  integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
   dependencies:
     commander "^2.20.0"
     source-map "~0.6.1"

From 63f7ee35c3b0e9e2e0a27aff16a3685341cbe3e2 Mon Sep 17 00:00:00 2001
From: Rob Gallo <43080011+RobGallo@users.noreply.github.com>
Date: Fri, 19 Jun 2020 14:44:16 -0400
Subject: [PATCH 53/71] feat(android-setup): Add code to set the app name from
 the device in the setup store (#2911)

* feat(android-setup): Add code to set the app name from the device in the setup store

The app name is required for the start testing screen, and it can't be set until after the permissions have been granted. It also can't be set in the onEnter function for the start testing step because the onEnter method is asynchronous, and the UI will therefore be visible possibly before the app name is set.

* Fix linting errors

* feat(android-setup): Modify configuringPortForwarding state machine step so that the application name is retrieved after port forwarding is successfully set up

Port forwarding, not detect permissions, is when the device is set up and ready to get the app name.

* Fix typo

Co-authored-by: Dave Tryon <45672944+DaveTryon@users.noreply.github.com>

* Update text for linguistic symmetry

Co-authored-by: Dave Tryon <45672944+DaveTryon@users.noreply.github.com>

Co-authored-by: Dave Tryon <45672944+DaveTryon@users.noreply.github.com>
---
 .../flux/store/android-setup-store.ts         |  6 +++
 .../android-setup-state-machine-types.ts      |  1 +
 .../flux/types/android-setup-store-data.ts    |  2 +
 .../android/setup/android-setup-deps.ts       |  1 +
 .../android/setup/live-android-setup-deps.ts  | 13 +++++++
 .../steps/configuring-port-forwarding.ts      | 17 ++++++---
 src/electron/views/renderer-initializer.ts    |  5 ++-
 .../flux/store/android-setup-store.test.ts    | 30 +++++++++++++++
 .../setup/live-android-setup-deps.test.ts     | 37 +++++++++++++++++++
 .../steps/configuring-port-forwarding.test.ts | 17 +++++++--
 .../setup/steps/detect-permissions.test.ts    |  8 ++--
 11 files changed, 123 insertions(+), 14 deletions(-)

diff --git a/src/electron/flux/store/android-setup-store.ts b/src/electron/flux/store/android-setup-store.ts
index 61041931ecf..2d5feb0f4b0 100644
--- a/src/electron/flux/store/android-setup-store.ts
+++ b/src/electron/flux/store/android-setup-store.ts
@@ -28,6 +28,7 @@ export class AndroidSetupStore extends BaseStoreImpl<AndroidSetupStoreData> {
             stepTransition: this.stepTransition,
             setSelectedDevice: this.setSelectedDevice,
             setAvailableDevices: this.setAvailableDevices,
+            setApplicationName: this.setApplicationName,
         });
     }
 
@@ -67,4 +68,9 @@ export class AndroidSetupStore extends BaseStoreImpl<AndroidSetupStoreData> {
         // emitChange will be called from step transition when the step changes
         this.state.availableDevices = devices;
     };
+
+    private setApplicationName = (appName?: string): void => {
+        // emitChange will be called from step transition when the step changes
+        this.state.applicationName = appName;
+    };
 }
diff --git a/src/electron/flux/types/android-setup-state-machine-types.ts b/src/electron/flux/types/android-setup-state-machine-types.ts
index a51735f4cf0..c3f9dc4d00a 100644
--- a/src/electron/flux/types/android-setup-state-machine-types.ts
+++ b/src/electron/flux/types/android-setup-state-machine-types.ts
@@ -14,6 +14,7 @@ export type AndroidSetupStoreCallbacks = {
     stepTransition: AndroidSetupStepTransitionCallback;
     setSelectedDevice: (device: DeviceInfo) => void;
     setAvailableDevices: (devices: DeviceInfo[]) => void;
+    setApplicationName: (appName?: string) => void;
 };
 
 export type AndroidSetupStateMachineFactory = (
diff --git a/src/electron/flux/types/android-setup-store-data.ts b/src/electron/flux/types/android-setup-store-data.ts
index a2e5b15f552..a040184180e 100644
--- a/src/electron/flux/types/android-setup-store-data.ts
+++ b/src/electron/flux/types/android-setup-store-data.ts
@@ -10,4 +10,6 @@ export type AndroidSetupStoreData = {
     selectedDevice?: DeviceInfo;
 
     availableDevices?: DeviceInfo[];
+
+    applicationName?: string;
 };
diff --git a/src/electron/platform/android/setup/android-setup-deps.ts b/src/electron/platform/android/setup/android-setup-deps.ts
index c557f02cc4b..c15dac47995 100644
--- a/src/electron/platform/android/setup/android-setup-deps.ts
+++ b/src/electron/platform/android/setup/android-setup-deps.ts
@@ -12,4 +12,5 @@ export type AndroidSetupDeps = {
     installService: () => Promise<boolean>;
     hasExpectedPermissions: () => Promise<boolean>;
     setTcpForwarding: () => Promise<boolean>;
+    getApplicationName: () => Promise<string>;
 };
diff --git a/src/electron/platform/android/setup/live-android-setup-deps.ts b/src/electron/platform/android/setup/live-android-setup-deps.ts
index ca52e52ae90..e53ed55e0ba 100644
--- a/src/electron/platform/android/setup/live-android-setup-deps.ts
+++ b/src/electron/platform/android/setup/live-android-setup-deps.ts
@@ -12,6 +12,7 @@ import {
     PackageInfo,
     PermissionInfo,
 } from 'electron/platform/android/android-service-configurator';
+import { DeviceConfigFetcher } from 'electron/platform/android/device-config-fetcher';
 import { AndroidSetupDeps } from 'electron/platform/android/setup/android-setup-deps';
 
 export class LiveAndroidSetupDeps implements AndroidSetupDeps {
@@ -23,6 +24,7 @@ export class LiveAndroidSetupDeps implements AndroidSetupDeps {
         private readonly configStore: UserConfigurationStore,
         private readonly apkLocator: AndroidServiceApkLocator,
         private readonly userConfigMessageCreator: UserConfigMessageCreator,
+        private readonly fetchDeviceConfig: DeviceConfigFetcher,
         private readonly logger: Logger,
     ) {}
 
@@ -101,6 +103,17 @@ export class LiveAndroidSetupDeps implements AndroidSetupDeps {
         return false;
     };
 
+    public getApplicationName = async (): Promise<string> => {
+        try {
+            const config = await this.fetchDeviceConfig(62442);
+            return config.appIdentifier;
+        } catch (error) {
+            this.logger.log(error);
+        }
+
+        return '';
+    };
+
     private async getInstalledVersion(): Promise<string> {
         const info: PackageInfo = await this.serviceConfig.getPackageInfo(this.selectedDeviceId);
         return info?.versionName;
diff --git a/src/electron/platform/android/setup/steps/configuring-port-forwarding.ts b/src/electron/platform/android/setup/steps/configuring-port-forwarding.ts
index 731a0bcd8d7..ffb05968c4f 100644
--- a/src/electron/platform/android/setup/steps/configuring-port-forwarding.ts
+++ b/src/electron/platform/android/setup/steps/configuring-port-forwarding.ts
@@ -6,11 +6,18 @@ import { AndroidSetupStepConfig } from 'electron/platform/android/setup/android-
 export const configuringPortForwarding: AndroidSetupStepConfig = deps => ({
     actions: {},
     onEnter: async () => {
+        deps.setApplicationName(); // init
+
         const configured = await deps.setTcpForwarding();
-        deps.stepTransition(
-            configured
-                ? 'prompt-connected-start-testing'
-                : 'prompt-configuring-port-forwarding-failed',
-        );
+
+        if (configured === false) {
+            deps.stepTransition('prompt-configuring-port-forwarding-failed');
+            return;
+        }
+
+        // device is good to go; so we can get the current app name
+        const appName = await deps.getApplicationName();
+        deps.setApplicationName(appName);
+        deps.stepTransition('prompt-connected-start-testing');
     },
 });
diff --git a/src/electron/views/renderer-initializer.ts b/src/electron/views/renderer-initializer.ts
index d54133d464f..38356c0aa5b 100644
--- a/src/electron/views/renderer-initializer.ts
+++ b/src/electron/views/renderer-initializer.ts
@@ -194,9 +194,12 @@ getPersistedData(indexedDBInstance, indexedDBDataKeysToFetch).then(
         const dispatcher = new DirectActionMessageDispatcher(interpreter);
         const userConfigMessageCreator = new UserConfigMessageCreator(dispatcher);
 
+        const fetchDeviceConfig = createDeviceConfigFetcher(axios.get);
+
         const apkLocator: AndroidServiceApkLocator = new AndroidServiceApkLocator(
             ipcRendererShim.getAppPath,
         );
+
         const androidSetupStore = new AndroidSetupStore(
             androidSetupActions,
             createAndroidSetupStateMachineFactory(
@@ -205,6 +208,7 @@ getPersistedData(indexedDBInstance, indexedDBDataKeysToFetch).then(
                     userConfigurationStore,
                     apkLocator,
                     userConfigMessageCreator,
+                    fetchDeviceConfig,
                     logger,
                 ),
             ),
@@ -258,7 +262,6 @@ getPersistedData(indexedDBInstance, indexedDBDataKeysToFetch).then(
         ]);
 
         const fetchScanResults = createScanResultsFetcher(axios.get);
-        const fetchDeviceConfig = createDeviceConfigFetcher(axios.get);
 
         const featureFlagsController = new FeatureFlagsController(featureFlagStore, interpreter);
 
diff --git a/src/tests/unit/tests/electron/flux/store/android-setup-store.test.ts b/src/tests/unit/tests/electron/flux/store/android-setup-store.test.ts
index 774fbbcebdc..014619c79ba 100644
--- a/src/tests/unit/tests/electron/flux/store/android-setup-store.test.ts
+++ b/src/tests/unit/tests/electron/flux/store/android-setup-store.test.ts
@@ -184,6 +184,36 @@ describe('AndroidSetupStore', () => {
         stateMachineFactoryMock.verifyAll();
     });
 
+    it('ensure setApplicationName function results in store update', () => {
+        const appName = 'Star Wars -- Episode Test';
+
+        const initialData: AndroidSetupStoreData = { currentStepId: 'detect-adb' };
+        const expectedData: AndroidSetupStoreData = {
+            currentStepId: 'detect-adb',
+            applicationName: appName,
+        };
+
+        let storeCallbacks: AndroidSetupStoreCallbacks;
+
+        const stateMachineFactoryMock = Mock.ofInstance(mockableStateMachineFactory);
+        stateMachineFactoryMock
+            .setup(m => m(It.isAny()))
+            .callback(sc => (storeCallbacks = sc))
+            .verifiable(Times.once());
+
+        const store = new AndroidSetupStore(
+            new AndroidSetupActions(),
+            stateMachineFactoryMock.object,
+        );
+        store.initialize(initialData);
+
+        storeCallbacks.setApplicationName(appName);
+
+        expect(store.getState()).toEqual(expectedData);
+
+        stateMachineFactoryMock.verifyAll();
+    });
+
     const createAndroidSetupStoreTester = (
         actionToInvoke: keyof AndroidSetupActions,
         stateMachineFactory: AndroidSetupStateMachineFactory,
diff --git a/src/tests/unit/tests/electron/platform/android/setup/live-android-setup-deps.test.ts b/src/tests/unit/tests/electron/platform/android/setup/live-android-setup-deps.test.ts
index a0f60a63d4c..e0ae01640c0 100644
--- a/src/tests/unit/tests/electron/platform/android/setup/live-android-setup-deps.test.ts
+++ b/src/tests/unit/tests/electron/platform/android/setup/live-android-setup-deps.test.ts
@@ -16,6 +16,8 @@ import {
     PackageInfo,
     PermissionInfo,
 } from 'electron/platform/android/android-service-configurator';
+import { DeviceConfig } from 'electron/platform/android/device-config';
+import { DeviceConfigFetcher } from 'electron/platform/android/device-config-fetcher';
 import { LiveAndroidSetupDeps } from 'electron/platform/android/setup/live-android-setup-deps';
 import { IMock, Mock, MockBehavior, Times } from 'typemoq';
 
@@ -27,6 +29,7 @@ describe('LiveAndroidSetupDeps', () => {
     let configStoreMock: IMock<UserConfigurationStore>;
     let apkLocatorMock: IMock<AndroidServiceApkLocator>;
     let configMessageCreatorMock: IMock<UserConfigMessageCreator>;
+    let fetchConfigMock: IMock<DeviceConfigFetcher>;
     let loggerMock: IMock<Logger>;
     let testSubject: LiveAndroidSetupDeps;
 
@@ -42,12 +45,14 @@ describe('LiveAndroidSetupDeps', () => {
             undefined,
             MockBehavior.Strict,
         );
+        fetchConfigMock = Mock.ofInstance((port: number) => new Promise<DeviceConfig>(() => null));
         loggerMock = Mock.ofType<Logger>();
         testSubject = new LiveAndroidSetupDeps(
             serviceConfigFactoryMock.object,
             configStoreMock.object,
             apkLocatorMock.object,
             configMessageCreatorMock.object,
+            fetchConfigMock.object,
             loggerMock.object,
         );
     });
@@ -418,6 +423,25 @@ describe('LiveAndroidSetupDeps', () => {
         verifyAllMocks();
     });
 
+    it('getApplicationName returns app name when successful', async () => {
+        const config: DeviceConfig = {
+            appIdentifier: 'Wonderful App',
+        } as DeviceConfig;
+
+        const p = new Promise<DeviceConfig>(resolve => resolve(config));
+
+        fetchConfigMock
+            .setup(m => m(62442))
+            .returns(() => p)
+            .verifiable();
+
+        const appName = await testSubject.getApplicationName();
+
+        expect(appName).toEqual(config.appIdentifier);
+
+        verifyAllMocks();
+    });
+
     it('setTcpForwarding returns true if no error', async () => {
         serviceConfigMock.setup(m => m.setTcpForwarding(undefined)).verifiable(Times.once());
         await initializeServiceConfig();
@@ -428,4 +452,17 @@ describe('LiveAndroidSetupDeps', () => {
 
         verifyAllMocks();
     });
+
+    it('getApplicationName returns empty string on error', async () => {
+        fetchConfigMock
+            .setup(m => m(62442))
+            .throws(Error('some error'))
+            .verifiable();
+
+        const appName = await testSubject.getApplicationName();
+
+        expect(appName).toEqual('');
+
+        verifyAllMocks();
+    });
 });
diff --git a/src/tests/unit/tests/electron/platform/android/setup/steps/configuring-port-forwarding.test.ts b/src/tests/unit/tests/electron/platform/android/setup/steps/configuring-port-forwarding.test.ts
index f6754b60335..41ffc02ad1c 100644
--- a/src/tests/unit/tests/electron/platform/android/setup/steps/configuring-port-forwarding.test.ts
+++ b/src/tests/unit/tests/electron/platform/android/setup/steps/configuring-port-forwarding.test.ts
@@ -15,18 +15,27 @@ describe('Android setup step: configuringPortForwarding', () => {
     });
 
     it('onEnter transitions to prompt-connected-start-testing on success', async () => {
-        const p = new Promise<boolean>(resolve => resolve(true));
+        const appName = 'my app name';
+
+        const tcpForwardingPromise = new Promise<boolean>(resolve => resolve(true));
+        const appNamePromise = new Promise<string>(resolve => resolve(appName));
 
         const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
         depsMock
             .setup(m => m.setTcpForwarding())
-            .returns(_ => p)
+            .returns(_ => tcpForwardingPromise)
             .verifiable(Times.once());
 
+        depsMock.setup(m => m.stepTransition('prompt-connected-start-testing'));
+
         depsMock
-            .setup(m => m.stepTransition('prompt-connected-start-testing'))
+            .setup(m => m.getApplicationName())
+            .returns(_ => appNamePromise)
             .verifiable(Times.once());
 
+        depsMock.setup(m => m.setApplicationName(undefined)).verifiable(Times.once());
+        depsMock.setup(m => m.setApplicationName(appName)).verifiable(Times.once());
+
         const step = configuringPortForwarding(depsMock.object);
         await step.onEnter();
 
@@ -42,6 +51,8 @@ describe('Android setup step: configuringPortForwarding', () => {
             .returns(_ => p)
             .verifiable(Times.once());
 
+        depsMock.setup(m => m.setApplicationName(undefined)).verifiable(Times.once());
+
         depsMock
             .setup(m => m.stepTransition('prompt-configuring-port-forwarding-failed'))
             .verifiable(Times.once());
diff --git a/src/tests/unit/tests/electron/platform/android/setup/steps/detect-permissions.test.ts b/src/tests/unit/tests/electron/platform/android/setup/steps/detect-permissions.test.ts
index f8d037f6c15..79b442f7c92 100644
--- a/src/tests/unit/tests/electron/platform/android/setup/steps/detect-permissions.test.ts
+++ b/src/tests/unit/tests/electron/platform/android/setup/steps/detect-permissions.test.ts
@@ -14,7 +14,7 @@ describe('Android setup step: detectPermissions', () => {
         expect(step.onEnter).toBeDefined();
     });
 
-    it('onEnter transitions to configuring-port-forwarding as expected', async () => {
+    it('onEnter transitions to configuring-port-forwarding on success', async () => {
         const p = new Promise<boolean>(resolve => resolve(true));
 
         const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
@@ -23,9 +23,7 @@ describe('Android setup step: detectPermissions', () => {
             .returns(_ => p)
             .verifiable(Times.once());
 
-        depsMock
-            .setup(m => m.stepTransition('configuring-port-forwarding'))
-            .verifiable(Times.once());
+        depsMock.setup(m => m.stepTransition('configuring-port-forwarding'));
 
         const step = detectPermissions(depsMock.object);
         await step.onEnter();
@@ -33,7 +31,7 @@ describe('Android setup step: detectPermissions', () => {
         depsMock.verifyAll();
     });
 
-    it('onEnter transitions to prompt-install-service as expected', async () => {
+    it('onEnter transitions to prompt-grant-permissions on failure', async () => {
         const p = new Promise<boolean>(resolve => resolve(false));
 
         const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);

From 298e31f44ec206e0ff9152dc9c27f9f757152648 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 22 Jun 2020 15:57:49 +0000
Subject: [PATCH 54/71] chore(deps-dev): bump css-loader from 3.5.3 to 3.6.0
 (#2922)

---
 package.json |  2 +-
 yarn.lock    | 56 +++++++++++++++++++++++++++++++++-------------------
 2 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index d305573ec77..cf5cc8e47a8 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
         "commander": "^5.1.0",
         "core-js-bundle": "^3.6.5",
         "cross-env": "^7.0.2",
-        "css-loader": "^3.5.3",
+        "css-loader": "^3.6.0",
         "electron-builder": "^22.7.0",
         "enzyme": "^3.11.0",
         "enzyme-adapter-react-16": "^1.15.2",
diff --git a/yarn.lock b/yarn.lock
index 89d990ef17b..c6979e68be8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1113,6 +1113,11 @@
     "@types/parse5" "*"
     "@types/tough-cookie" "*"
 
+"@types/json-schema@^7.0.4":
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.5.tgz#dcce4430e64b443ba8945f0290fb564ad5bac6dd"
+  integrity sha512-7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ==
+
 "@types/lodash@^4.14.155":
   version "4.14.155"
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.155.tgz#e2b4514f46a261fd11542e47519c20ebce7bc23a"
@@ -1641,6 +1646,16 @@ ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.0, ajv@^6.5.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
+ajv@^6.12.2:
+  version "6.12.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd"
+  integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
 amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
@@ -3319,23 +3334,23 @@ crypto-random-string@^2.0.0:
   resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
   integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==
 
-css-loader@^3.5.3:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.5.3.tgz#95ac16468e1adcd95c844729e0bb167639eb0bcf"
-  integrity sha512-UEr9NH5Lmi7+dguAm+/JSPovNjYbm2k3TK58EiwQHzOHH5Jfq1Y+XoP2bQO6TMn7PptMd0opxxedAWcaSTRKHw==
+css-loader@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.6.0.tgz#2e4b2c7e6e2d27f8c8f28f61bffcd2e6c91ef645"
+  integrity sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ==
   dependencies:
     camelcase "^5.3.1"
     cssesc "^3.0.0"
     icss-utils "^4.1.1"
     loader-utils "^1.2.3"
     normalize-path "^3.0.0"
-    postcss "^7.0.27"
+    postcss "^7.0.32"
     postcss-modules-extract-imports "^2.0.0"
     postcss-modules-local-by-default "^3.0.2"
     postcss-modules-scope "^2.2.0"
     postcss-modules-values "^3.0.0"
-    postcss-value-parser "^4.0.3"
-    schema-utils "^2.6.6"
+    postcss-value-parser "^4.1.0"
+    schema-utils "^2.7.0"
     semver "^6.3.0"
 
 css-modules-loader-core@^1.1.0:
@@ -8502,10 +8517,10 @@ postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
-postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz#651ff4593aa9eda8d5d0d66593a2417aeaeb325d"
-  integrity sha512-N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg==
+postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
+  integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
 
 postcss@6.0.1:
   version "6.0.1"
@@ -8525,10 +8540,10 @@ postcss@^6.0.1:
     source-map "^0.6.1"
     supports-color "^5.4.0"
 
-postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.27, postcss@^7.0.5, postcss@^7.0.6:
-  version "7.0.27"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.27.tgz#cc67cdc6b0daa375105b7c424a85567345fc54d9"
-  integrity sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==
+postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6:
+  version "7.0.32"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d"
+  integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"
@@ -9636,12 +9651,13 @@ schema-utils@1.0.0, schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
-schema-utils@^2.6.1, schema-utils@^2.6.6:
-  version "2.6.6"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.6.tgz#299fe6bd4a3365dc23d99fd446caff8f1d6c330c"
-  integrity sha512-wHutF/WPSbIi9x6ctjGGk2Hvl0VOz5l3EKEuKbjPlB30mKZUzb9A5k9yEXRX3pwyqVLPvpfZZEllaFq/M718hA==
+schema-utils@^2.6.1, schema-utils@^2.6.6, schema-utils@^2.7.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7"
+  integrity sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==
   dependencies:
-    ajv "^6.12.0"
+    "@types/json-schema" "^7.0.4"
+    ajv "^6.12.2"
     ajv-keywords "^3.4.1"
 
 script-loader@0.7.2:

From 91d2084edf5fcd3e3a9da5282b9fba401342e169 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 22 Jun 2020 15:58:03 +0000
Subject: [PATCH 55/71] chore(deps-dev): bump fork-ts-checker-webpack-plugin
 from 5.0.1 to 5.0.3 (#2923)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index cf5cc8e47a8..0e9585c9fbd 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,7 @@
         "express": "^4.16.4",
         "extract-zip": "^2.0.1",
         "fake-indexeddb": "^3.0.2",
-        "fork-ts-checker-webpack-plugin": "^5.0.1",
+        "fork-ts-checker-webpack-plugin": "^5.0.3",
         "grunt": "^1.1.0",
         "grunt-bom-removal": "1.0.1",
         "grunt-cli": "^1.3.1",
diff --git a/yarn.lock b/yarn.lock
index c6979e68be8..eeb1667f175 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4664,10 +4664,10 @@ forever-agent@~0.6.1:
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
   integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
-fork-ts-checker-webpack-plugin@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.0.1.tgz#21adab94c30340c50dc5a3d36c25d180a8bb29e5"
-  integrity sha512-bys+hPwlPckrSCzNkg0BSUTsCRZWS6qIRiwk+8AjKitLWTqokda0QVImCx/Vm9cL/OGZZUnrFXazsVc99nijKQ==
+fork-ts-checker-webpack-plugin@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.0.3.tgz#8d3eba5ff022bbb0ebe895462547793c25d7fbae"
+  integrity sha512-Kp8Xa38sRfr7i8pQnGOweHzdOJRPdCIJZAkcf4T4GxzZsTMbCX4A/R+bNPdiiyYEEvIOHBALDVOeqt8CkVl+8Q==
   dependencies:
     "@babel/code-frame" "^7.8.3"
     chalk "^2.4.1"

From f712f07d4e6a41f6cf2181090609e2ba5595e8ef Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 22 Jun 2020 15:58:12 +0000
Subject: [PATCH 56/71] chore(deps-dev): bump simple-git from 2.7.2 to 2.8.0
 (#2925)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 0e9585c9fbd..aaee7bbedc9 100644
--- a/package.json
+++ b/package.json
@@ -121,7 +121,7 @@
         "sass-loader": "^8.0.2",
         "script-loader": "0.7.2",
         "serve-static": "^1.13.2",
-        "simple-git": "^2.7.2",
+        "simple-git": "^2.8.0",
         "source-map-loader": "^1.0.0",
         "spectron": "^10.0.1",
         "terser-webpack-plugin": "^3.0.6",
diff --git a/yarn.lock b/yarn.lock
index eeb1667f175..585a9786e2c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9841,10 +9841,10 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
   integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
 
-simple-git@^2.7.2:
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-2.7.2.tgz#6b0de98fbdc94e22dfca5a306dc59155cff3cb40"
-  integrity sha512-SXsUw80Fppq72JI+QhfKY5d4sk8WQ2CppAcjp559OInjxYZzco7L9scsd5NwForcaQSCstNh7tsW6NnrGYfdgg==
+simple-git@^2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-2.8.0.tgz#c8ebda4a16b57c9f774a62df62cb74cfd2c4f3d5"
+  integrity sha512-0iXwizUaanqdjn9IpboozWN2opA7jl1JZzeQEePyFXRUGOtwVuSgkMGXLnd7Toa7jqV+uZ1VnDZlCBxxSEk1Dw==
   dependencies:
     "@kwsites/file-exists" "^1.1.1"
     debug "^4.1.1"

From a47e56290219b73630288f861d98f7524925c844 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 22 Jun 2020 16:48:49 +0000
Subject: [PATCH 57/71] chore(deps): bump moment from 2.26.0 to 2.27.0 (#2924)

---
 package.json                                             | 2 +-
 src/packages/accessibility-insights-ui/root/package.json | 2 +-
 src/reports/package/root/package.json                    | 2 +-
 yarn.lock                                                | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index aaee7bbedc9..973b44fd83a 100644
--- a/package.json
+++ b/package.json
@@ -149,7 +149,7 @@
         "electron-updater": "^4.3.1",
         "idb-keyval": "^3.2.0",
         "lodash": "^4.17.15",
-        "moment": "^2.26.0",
+        "moment": "^2.27.0",
         "office-ui-fabric-react": "7.98.0",
         "q": "1.5.1",
         "react": "^16.13.1",
diff --git a/src/packages/accessibility-insights-ui/root/package.json b/src/packages/accessibility-insights-ui/root/package.json
index 88617cbca95..71cd86a9b00 100644
--- a/src/packages/accessibility-insights-ui/root/package.json
+++ b/src/packages/accessibility-insights-ui/root/package.json
@@ -11,7 +11,7 @@
         "axe-core": "3.3.2",
         "classnames": "^2.2.6",
         "lodash": "^4.17.15",
-        "moment": "^2.26.0",
+        "moment": "^2.27.0",
         "office-ui-fabric-react": "7.98.0",
         "react": "^16.13.1",
         "react-dom": "^16.13.1",
diff --git a/src/reports/package/root/package.json b/src/reports/package/root/package.json
index a68451d5a8a..fcedd77a0c2 100644
--- a/src/reports/package/root/package.json
+++ b/src/reports/package/root/package.json
@@ -11,7 +11,7 @@
         "axe-core": "3.5.1",
         "classnames": "^2.2.6",
         "lodash": "^4.17.15",
-        "moment": "^2.26.0",
+        "moment": "^2.27.0",
         "office-ui-fabric-react": "7.98.0",
         "react": "^16.13.1",
         "react-dom": "^16.13.1",
diff --git a/yarn.lock b/yarn.lock
index 585a9786e2c..bbef68c981d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7410,10 +7410,10 @@ mkdirp@1.x, mkdirp@^1.0.0, mkdirp@^1.0.3, mkdirp@^1.0.4, mkdirp@~1.0.3:
   dependencies:
     minimist "^1.2.5"
 
-moment@*, moment@^2.24.0, moment@^2.26.0:
-  version "2.26.0"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.26.0.tgz#5e1f82c6bafca6e83e808b30c8705eed0dcbd39a"
-  integrity sha512-oIixUO+OamkUkwjhAVE18rAMfRJNsNe/Stid/gwHSOfHrOtw9EhAY2AHvdKZ/k/MggcYELFCJz/Sn2pL8b8JMw==
+moment@*, moment@^2.24.0, moment@^2.27.0:
+  version "2.27.0"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.27.0.tgz#8bff4e3e26a236220dfe3e36de756b6ebaa0105d"
+  integrity sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ==
 
 moo@^0.4.3:
   version "0.4.3"

From 4a67a315461fdca3c0c8702c859cdaa43b811c3f Mon Sep 17 00:00:00 2001
From: Dave Tryon <45672944+DaveTryon@users.noreply.github.com>
Date: Mon, 22 Jun 2020 09:50:18 -0700
Subject: [PATCH 58/71] fix(android-setup): Display the current application in
 the "connected" dialog (#2930)

---
 .../android-setup/prompt-connected-start-testing-step.tsx      | 1 +
 .../prompt-connected-start-testing-step.test.tsx.snap          | 2 ++
 .../android-setup/prompt-connected-start-testing-step.test.tsx | 3 +++
 3 files changed, 6 insertions(+)

diff --git a/src/electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.tsx b/src/electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.tsx
index 99cac8a7f50..b13c324c398 100644
--- a/src/electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.tsx
+++ b/src/electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.tsx
@@ -38,6 +38,7 @@ export const PromptConnectedStartTestingStep = NamedFC<CommonAndroidSetupStepPro
         const descriptionProps: DeviceDescriptionProps = {
             ...props.androidSetupStoreData.selectedDevice,
             className: styles.deviceDescription,
+            currentApplication: props.androidSetupStoreData.applicationName,
         };
 
         return (
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-connected-start-testing-step.test.tsx.snap b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-connected-start-testing-step.test.tsx.snap
index 61c0ea2de9c..a6fcdc98620 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-connected-start-testing-step.test.tsx.snap
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/__snapshots__/prompt-connected-start-testing-step.test.tsx.snap
@@ -26,6 +26,7 @@ exports[`PromptConnectedStartTestingStep renders with device 1`] = `
 >
   <DeviceDescription
     className="deviceDescription"
+    currentApplication="super-cool app"
     friendlyName="Super-Duper Gadget"
     id="1"
     isEmulator={false}
@@ -64,6 +65,7 @@ exports[`PromptConnectedStartTestingStep renders with emulator 1`] = `
 >
   <DeviceDescription
     className="deviceDescription"
+    currentApplication="super-cool app"
     friendlyName="Emulator Extraordinaire"
     id="1"
     isEmulator={true}
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.test.tsx b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.test.tsx
index fb64bee0b1a..0134f1d9a3a 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.test.tsx
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-connected-start-testing-step.test.tsx
@@ -12,6 +12,7 @@ import { AndroidSetupStepPropsBuilder } from 'tests/unit/common/android-setup-st
 import { IMock, Mock, Times } from 'typemoq';
 
 describe('PromptConnectedStartTestingStep', () => {
+    const testApp: string = 'super-cool app';
     let props: CommonAndroidSetupStepProps;
     let startTestingMock: IMock<typeof props.deps.startTesting>;
     let androidSetupActionCreatorMock: IMock<AndroidSetupActionCreator>;
@@ -33,6 +34,7 @@ describe('PromptConnectedStartTestingStep', () => {
         };
 
         props.androidSetupStoreData.selectedDevice = selectedDevice;
+        props.androidSetupStoreData.applicationName = testApp;
 
         const rendered = shallow(<PromptConnectedStartTestingStep {...props} />);
         expect(rendered.getElement()).toMatchSnapshot();
@@ -46,6 +48,7 @@ describe('PromptConnectedStartTestingStep', () => {
         };
 
         props.androidSetupStoreData.selectedDevice = selectedDevice;
+        props.androidSetupStoreData.applicationName = testApp;
 
         const rendered = shallow(<PromptConnectedStartTestingStep {...props} />);
         expect(rendered.getElement()).toMatchSnapshot();

From 84a9cf0a5b0eb48d142fd419af29b7916908f3bb Mon Sep 17 00:00:00 2001
From: Dave Tryon <45672944+DaveTryon@users.noreply.github.com>
Date: Mon, 22 Jun 2020 10:29:57 -0700
Subject: [PATCH 59/71] (chore): Exclude .vs folder from fastpass scans (#2928)

---
 .prettierignore              | 1 +
 copyright-header.config.json | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.prettierignore b/.prettierignore
index 5d79e8f0f2c..9336ffc4ac4 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -17,6 +17,7 @@
 .github/
 .prettierignore
 .yarnrc
+.vs/
 AppXManifest.xml
 copyright-header.txt
 dist/
diff --git a/copyright-header.config.json b/copyright-header.config.json
index 50e7e80b008..c21b269cd7c 100644
--- a/copyright-header.config.json
+++ b/copyright-header.config.json
@@ -4,6 +4,7 @@
         "./.dependabot",
         "./.git",
         "./.github",
+        "./.vs",
         "./.vscode",
         "./dist",
         "./docs/art/ada-cat.ansi256.txt",

From 3e2824de1dda541eb70fbc5b5f22c09214b7ddd1 Mon Sep 17 00:00:00 2001
From: Dan Bjorge <danielbj@microsoft.com>
Date: Mon, 22 Jun 2020 10:30:02 -0700
Subject: [PATCH 60/71] Add scss:build step to fastpass (#2931)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 973b44fd83a..edbb1c65ea1 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
         "copyright:check": "license-check-and-add check -f copyright-header.config.json",
         "copyright:fix": "license-check-and-add add -f copyright-header.config.json",
         "download:electron-mirror": "node ./pipeline/scripts/download-electron-mirror.js",
-        "fastpass": "npm-run-all --print-label --parallel copyright:check lint:check format:check null:check && grunt ada-cat",
+        "fastpass": "npm-run-all --print-label scss:build --parallel copyright:check lint:check format:check null:check && grunt ada-cat",
         "fastpass:fix": "npm-run-all --print-label --serial scss:clean copyright:fix lint:fix format:fix",
         "format:check": "prettier --config prettier.config.js --check \"**/*\"",
         "format:fix": "prettier --config prettier.config.js --write \"**/*\"",

From 6bad71b67b2ae9b3bd35458465efc3a11bbe1bd4 Mon Sep 17 00:00:00 2001
From: Rob Gallo <43080011+RobGallo@users.noreply.github.com>
Date: Mon, 22 Jun 2020 13:40:34 -0400
Subject: [PATCH 61/71] feat(android-setup): Add cancel action behavior to a
 few steps (#2929)

* feat(android-setup): Add cancel action behavior to a few steps

The expected behavior of the cancel action for each step is as follows:

step | on cancel
--- | ---
detect-adb | no cancel / cancel = close
prompt-locate-adb | no cancel / cancel = close
prompt-connect-to-device | no cancel / cancel = close
detect-devices | prompt-connect-to-device
prompt-choose-device | no cancel (can rescan for devices or close)
detect-service | prompt-choose-device
prompt-install-service | prompt-choose-device
installing-service | prompt-install-service
prompt-install-failed | prompt-choose-device
detect-permissions | prompt-choose-device
prompt-grant-permissions | prompt-choose-device
configuring-port-forwarding | prompt-choose-device
prompt-configuring-port-forwarding-failed | prompt-choose-device
prompt-connected-start-testing | no cancel (can rescan for devices or close)

* Remove cancel actions for detect-* state machine steps

These operations can't be canceled because we have no way to interrupt the calls -- we're awaiting promises.

* Remove cancel action from configuring-port-forwarding state machine step

There's no way to cancel the action of the step.
---
 .../platform/android/setup/steps/detect-devices.ts  |  7 ++-----
 .../prompt-configuring-port-forwarding-failed.ts    |  3 +++
 .../android/setup/steps/prompt-grant-permissions.ts |  3 +++
 .../android/setup/steps/prompt-install-service.ts   |  3 +++
 .../android/setup/steps/detect-devices.test.ts      | 13 ++-----------
 ...rompt-configuring-port-forwarding-failed.test.ts | 12 +++++++++++-
 .../setup/steps/prompt-grant-permissions.test.ts    | 12 +++++++++++-
 .../setup/steps/prompt-install-service.test.ts      | 12 +++++++++++-
 8 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/src/electron/platform/android/setup/steps/detect-devices.ts b/src/electron/platform/android/setup/steps/detect-devices.ts
index 0cee5a9e977..76a4bcbaa79 100644
--- a/src/electron/platform/android/setup/steps/detect-devices.ts
+++ b/src/electron/platform/android/setup/steps/detect-devices.ts
@@ -5,11 +5,7 @@ import { AndroidSetupStepConfig } from 'electron/platform/android/setup/android-
 
 export const detectDevices: AndroidSetupStepConfig = deps => {
     return {
-        actions: {
-            cancel: () => {
-                deps.stepTransition('prompt-connect-to-device');
-            },
-        },
+        actions: {},
         onEnter: async () => {
             deps.setSelectedDevice(null);
             deps.setAvailableDevices([]);
@@ -24,6 +20,7 @@ export const detectDevices: AndroidSetupStepConfig = deps => {
                 case 1: {
                     deps.setSelectedDeviceId(devices[0].id);
                     deps.setSelectedDevice(devices[0]);
+                    deps.setAvailableDevices(devices);
                     deps.stepTransition('detect-service');
                     break;
                 }
diff --git a/src/electron/platform/android/setup/steps/prompt-configuring-port-forwarding-failed.ts b/src/electron/platform/android/setup/steps/prompt-configuring-port-forwarding-failed.ts
index ea68bbe9a1d..760a5383e5b 100644
--- a/src/electron/platform/android/setup/steps/prompt-configuring-port-forwarding-failed.ts
+++ b/src/electron/platform/android/setup/steps/prompt-configuring-port-forwarding-failed.ts
@@ -6,6 +6,9 @@ import { AndroidSetupStepConfig } from 'electron/platform/android/setup/android-
 export const promptConfiguringPortForwardingFailed: AndroidSetupStepConfig = deps => {
     return {
         actions: {
+            cancel: () => {
+                deps.stepTransition('prompt-choose-device');
+            },
             next: () => deps.stepTransition('configuring-port-forwarding'),
         },
     };
diff --git a/src/electron/platform/android/setup/steps/prompt-grant-permissions.ts b/src/electron/platform/android/setup/steps/prompt-grant-permissions.ts
index 5492e7b4236..7e2b856ec41 100644
--- a/src/electron/platform/android/setup/steps/prompt-grant-permissions.ts
+++ b/src/electron/platform/android/setup/steps/prompt-grant-permissions.ts
@@ -5,6 +5,9 @@ import { AndroidSetupStepConfig } from 'electron/platform/android/setup/android-
 
 export const promptGrantPermissions: AndroidSetupStepConfig = deps => ({
     actions: {
+        cancel: () => {
+            deps.stepTransition('prompt-choose-device');
+        },
         next: () => {
             deps.stepTransition('detect-permissions');
         },
diff --git a/src/electron/platform/android/setup/steps/prompt-install-service.ts b/src/electron/platform/android/setup/steps/prompt-install-service.ts
index 3ca14c665cb..16d4e52c26f 100644
--- a/src/electron/platform/android/setup/steps/prompt-install-service.ts
+++ b/src/electron/platform/android/setup/steps/prompt-install-service.ts
@@ -5,6 +5,9 @@ import { AndroidSetupStepConfig } from 'electron/platform/android/setup/android-
 
 export const promptInstallService: AndroidSetupStepConfig = deps => ({
     actions: {
+        cancel: () => {
+            deps.stepTransition('prompt-choose-device');
+        },
         next: () => {
             deps.stepTransition('installing-service');
         },
diff --git a/src/tests/unit/tests/electron/platform/android/setup/steps/detect-devices.test.ts b/src/tests/unit/tests/electron/platform/android/setup/steps/detect-devices.test.ts
index b4096fb08db..f0e16547519 100644
--- a/src/tests/unit/tests/electron/platform/android/setup/steps/detect-devices.test.ts
+++ b/src/tests/unit/tests/electron/platform/android/setup/steps/detect-devices.test.ts
@@ -11,20 +11,10 @@ describe('Android setup step: detectDevices', () => {
     it('has expected properties', () => {
         const deps = {} as AndroidSetupStepConfigDeps;
         const step = detectDevices(deps);
-        checkExpectedActionsAreDefined(step, ['cancel']);
+        checkExpectedActionsAreDefined(step, []);
         expect(step.onEnter).toBeDefined();
     });
 
-    it('cancel transitions to prompt-connect-to-device as expected', () => {
-        const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
-        depsMock.setup(m => m.stepTransition('prompt-connect-to-device')).verifiable(Times.once());
-
-        const step = detectDevices(depsMock.object);
-        step.actions.cancel();
-
-        depsMock.verifyAll();
-    });
-
     it('onEnter transitions to prompt-connect-to-device as expected', async () => {
         const devices: DeviceInfo[] = [];
         const p = new Promise<DeviceInfo[]>(resolve => resolve(devices));
@@ -64,6 +54,7 @@ describe('Android setup step: detectDevices', () => {
         depsMock.setup(m => m.setAvailableDevices([])).verifiable(Times.once());
         depsMock.setup(m => m.setSelectedDeviceId('device1')).verifiable(Times.once());
         depsMock.setup(m => m.setSelectedDevice(devices[0])).verifiable(Times.once());
+        depsMock.setup(m => m.setAvailableDevices(devices)).verifiable(Times.once());
         depsMock.setup(m => m.stepTransition('detect-service')).verifiable(Times.once());
 
         const step = detectDevices(depsMock.object);
diff --git a/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-configuring-port-forwarding-failed.test.ts b/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-configuring-port-forwarding-failed.test.ts
index 8c8b038d876..a101d94689d 100644
--- a/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-configuring-port-forwarding-failed.test.ts
+++ b/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-configuring-port-forwarding-failed.test.ts
@@ -10,10 +10,20 @@ describe('Android setup step: promptConfiguringPortForwardingFailed', () => {
     it('has expected properties', () => {
         const deps = {} as AndroidSetupStepConfigDeps;
         const step = promptConfiguringPortForwardingFailed(deps);
-        checkExpectedActionsAreDefined(step, ['next']);
+        checkExpectedActionsAreDefined(step, ['cancel', 'next']);
         expect(step.onEnter).not.toBeDefined();
     });
 
+    it('cancel transitions to prompt-choose-device', async () => {
+        const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
+        depsMock.setup(m => m.stepTransition('prompt-choose-device')).verifiable(Times.once());
+
+        const step = promptConfiguringPortForwardingFailed(depsMock.object);
+        step.actions.cancel();
+
+        depsMock.verifyAll();
+    });
+
     it('next transitions to configuring-port-forwarding as expected', () => {
         const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
         depsMock
diff --git a/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-grant-permissions.test.ts b/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-grant-permissions.test.ts
index a65ce6101d8..9649b74939b 100644
--- a/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-grant-permissions.test.ts
+++ b/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-grant-permissions.test.ts
@@ -10,10 +10,20 @@ describe('Android setup step: promptGrantPermissions', () => {
     it('has expected properties', () => {
         const deps = {} as AndroidSetupStepConfigDeps;
         const step = promptGrantPermissions(deps);
-        checkExpectedActionsAreDefined(step, ['next']);
+        checkExpectedActionsAreDefined(step, ['cancel', 'next']);
         expect(step.onEnter).not.toBeDefined();
     });
 
+    it('cancel transitions to prompt-choose-device', async () => {
+        const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
+        depsMock.setup(m => m.stepTransition('prompt-choose-device')).verifiable(Times.once());
+
+        const step = promptGrantPermissions(depsMock.object);
+        step.actions.cancel();
+
+        depsMock.verifyAll();
+    });
+
     it('onEnter transitions to detect-permissions as expected', () => {
         const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
         depsMock.setup(m => m.stepTransition('detect-permissions')).verifiable(Times.once());
diff --git a/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-install-service.test.ts b/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-install-service.test.ts
index aeca3c235b2..9dbe52f4d41 100644
--- a/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-install-service.test.ts
+++ b/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-install-service.test.ts
@@ -10,10 +10,20 @@ describe('Android setup step: promptInstallService', () => {
     it('has expected properties', () => {
         const deps = {} as AndroidSetupStepConfigDeps;
         const step = promptInstallService(deps);
-        checkExpectedActionsAreDefined(step, ['next']);
+        checkExpectedActionsAreDefined(step, ['cancel', 'next']);
         expect(step.onEnter).not.toBeDefined();
     });
 
+    it('cancel transitions to prompt-choose-device', async () => {
+        const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
+        depsMock.setup(m => m.stepTransition('prompt-choose-device')).verifiable(Times.once());
+
+        const step = promptInstallService(depsMock.object);
+        step.actions.cancel();
+
+        depsMock.verifyAll();
+    });
+
     it('onEnter transitions to installing-service as expected', () => {
         const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
         depsMock.setup(m => m.stepTransition('installing-service')).verifiable(Times.once());

From f25edfd348d68678ba8e66869a0b48a63b79fcb6 Mon Sep 17 00:00:00 2001
From: Dave Tryon <45672944+DaveTryon@users.noreply.github.com>
Date: Mon, 22 Jun 2020 13:03:34 -0700
Subject: [PATCH 62/71] fix(android-setup): Enable "choose device" dialog on
 cancel, use real data (#2932)

---
 .../setup/android-setup-steps-configs.ts      |  2 +-
 .../prompt-choose-device-step.tsx             | 20 +-----------------
 .../prompt-choose-device-step.test.tsx        | 21 +++++++++++++++++++
 3 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/electron/platform/android/setup/android-setup-steps-configs.ts b/src/electron/platform/android/setup/android-setup-steps-configs.ts
index 3b3f2eb123e..06965263f49 100644
--- a/src/electron/platform/android/setup/android-setup-steps-configs.ts
+++ b/src/electron/platform/android/setup/android-setup-steps-configs.ts
@@ -40,7 +40,7 @@ export const allAndroidSetupStepConfigs: AndroidSetupStepConfigs = {
     'prompt-locate-adb': promptLocateAdb,
     'prompt-connect-to-device': promptConnectToDevice,
     'detect-devices': detectDevices,
-    'prompt-choose-device': null,
+    'prompt-choose-device': promptConnectToDevice,
     'detect-service': detectService,
     'prompt-install-service': promptInstallService,
     'installing-service': installingService,
diff --git a/src/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.tsx b/src/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.tsx
index dfdbfdb4042..e6c75f7c7eb 100644
--- a/src/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.tsx
+++ b/src/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.tsx
@@ -40,25 +40,7 @@ export class PromptChooseDeviceStep extends React.Component<
     }
 
     public render(): JSX.Element {
-        // Available devices will be retrieved from store in future feature work
-        const devices: DeviceInfo[] = [
-            {
-                id: '1',
-                friendlyName: 'Phone 1',
-                isEmulator: true,
-            },
-            {
-                id: '2',
-                friendlyName: 'Phone 2',
-                isEmulator: false,
-            },
-            {
-                id: '3',
-                friendlyName: 'Phone 3',
-                isEmulator: true,
-            },
-        ];
-
+        const devices: DeviceInfo[] = this.props.androidSetupStoreData.availableDevices;
         const items = devices.map(m => ({ metadata: m }));
 
         const layoutProps: AndroidSetupStepLayoutProps = {
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.test.tsx b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.test.tsx
index a0f8f08f019..4f656b6010d 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.test.tsx
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.test.tsx
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 import { AndroidSetupActionCreator } from 'electron/flux/action-creator/android-setup-action-creator';
+import { AndroidSetupStoreData } from 'electron/flux/types/android-setup-store-data';
 import { AndroidSetupStepLayout } from 'electron/views/device-connect-view/components/android-setup/android-setup-step-layout';
 import { CommonAndroidSetupStepProps } from 'electron/views/device-connect-view/components/android-setup/android-setup-types';
 import { PromptChooseDeviceStep } from 'electron/views/device-connect-view/components/android-setup/prompt-choose-device-step';
@@ -21,6 +22,26 @@ describe('PromptChooseDeviceStep', () => {
             .withDep('closeApp', closeAppMock.object)
             .withDep('androidSetupActionCreator', actionMessageCreatorMock.object)
             .build();
+
+        props.androidSetupStoreData = {
+            availableDevices: [
+                {
+                    id: '1',
+                    friendlyName: 'Phone 1',
+                    isEmulator: true,
+                },
+                {
+                    id: '2',
+                    friendlyName: 'Phone 2',
+                    isEmulator: false,
+                },
+                {
+                    id: '3',
+                    friendlyName: 'Phone 3',
+                    isEmulator: true,
+                },
+            ],
+        } as AndroidSetupStoreData;
     });
 
     it('renders per snapshot', () => {

From 2910c9b8bd94ed783553996d7b31d03158ef5c65 Mon Sep 17 00:00:00 2001
From: Dan Bjorge <danielbj@microsoft.com>
Date: Mon, 22 Jun 2020 13:40:31 -0700
Subject: [PATCH 63/71] refactor: route scanPort through android setup store
 (#2913)

#### Description of changes

This PR adds `scanPort` to `AndroidSetupStoreData`, sets up the `configuring-port-forwarding` step to set the new state, and configures the views that consume it to conditionally pick up the scan port from whichever of `AndroidSetupStore` or `DeviceStore` the `adbSetupView` feature flag says is canonical.

This PR is setup work for both:
* Removing the DeviceStore when we remove the feature flag
* Enabling dynamic port selection

Verified no functionality/UI change either with or without the adbSetupView flag

#### Pull request checklist
<!-- If a checklist item is not applicable to this change, write "n/a" in the checkbox -->
- [n/a] Addresses an existing issue: #0000
- [x] Ran `yarn fastpass`
- [x] Added/updated relevant unit test(s) (and ran `yarn test`)
- [x] Verified code coverage for the changes made. Check coverage report at: `<rootDir>/test-results/unit/coverage`
- [x] PR title *AND* final merge commit title both start with a semantic tag (`fix:`, `chore:`, `feat(feature-name):`, `refactor:`). See `CONTRIBUTING.md`.
- [n/a] (UI changes only) Added screenshots/GIFs to description above
- [n/a] (UI changes only) Verified usability with NVDA/JAWS
---
 .../flux/store/android-setup-store.ts         |   6 +
 src/electron/flux/store/device-store.ts       |   3 +-
 .../android-setup-state-machine-types.ts      |   1 +
 .../flux/types/android-setup-store-data.ts    |   2 +-
 .../android/android-service-configurator.ts   |   2 +-
 .../android/appium-service-configurator.ts    |   3 +-
 .../android/setup/android-setup-deps.ts       |   4 +-
 .../android/setup/live-android-setup-deps.ts  |  12 +-
 .../steps/configuring-port-forwarding.ts      |  21 +-
 .../automated-checks-view.tsx                 |  25 +-
 .../components/command-bar.tsx                |   7 +-
 .../flux/store/android-setup-store.test.ts    |  30 ++
 .../appium-service-configurator.test.ts       |   3 +-
 .../setup/live-android-setup-deps.test.ts     |  30 +-
 .../steps/configuring-port-forwarding.test.ts | 105 +++-
 .../automated-checks-view.test.tsx.snap       | 491 +++++++++++++++++-
 .../automated-checks-view.test.tsx            | 366 ++++++++-----
 .../components/command-bar.test.tsx           |   4 +-
 18 files changed, 901 insertions(+), 214 deletions(-)

diff --git a/src/electron/flux/store/android-setup-store.ts b/src/electron/flux/store/android-setup-store.ts
index 2d5feb0f4b0..4a076a74d1e 100644
--- a/src/electron/flux/store/android-setup-store.ts
+++ b/src/electron/flux/store/android-setup-store.ts
@@ -28,6 +28,7 @@ export class AndroidSetupStore extends BaseStoreImpl<AndroidSetupStoreData> {
             stepTransition: this.stepTransition,
             setSelectedDevice: this.setSelectedDevice,
             setAvailableDevices: this.setAvailableDevices,
+            setScanPort: this.setScanPort,
             setApplicationName: this.setApplicationName,
         });
     }
@@ -69,6 +70,11 @@ export class AndroidSetupStore extends BaseStoreImpl<AndroidSetupStoreData> {
         this.state.availableDevices = devices;
     };
 
+    private setScanPort = (scanPort?: number): void => {
+        // emitChange will be called from step transition when the step changes
+        this.state.scanPort = scanPort;
+    };
+
     private setApplicationName = (appName?: string): void => {
         // emitChange will be called from step transition when the step changes
         this.state.applicationName = appName;
diff --git a/src/electron/flux/store/device-store.ts b/src/electron/flux/store/device-store.ts
index ce8d774e0bf..71b293a6bca 100644
--- a/src/electron/flux/store/device-store.ts
+++ b/src/electron/flux/store/device-store.ts
@@ -3,7 +3,6 @@
 import { BaseStoreImpl } from 'background/stores/base-store-impl';
 import { StoreNames } from 'common/stores/store-names';
 
-import { defaultAdbPortNumber } from 'electron/platform/android/appium-service-configurator';
 import { ConnectedDevicePayload, PortPayload } from '../action/device-action-payloads';
 import { DeviceActions } from '../action/device-actions';
 import { DeviceConnectState } from '../types/device-connect-state';
@@ -18,7 +17,7 @@ export class DeviceStore extends BaseStoreImpl<DeviceStoreData> {
         return {
             deviceConnectState: DeviceConnectState.Default,
             connectedDevice: null,
-            port: defaultAdbPortNumber,
+            port: null,
         };
     }
 
diff --git a/src/electron/flux/types/android-setup-state-machine-types.ts b/src/electron/flux/types/android-setup-state-machine-types.ts
index c3f9dc4d00a..b0df58a14fb 100644
--- a/src/electron/flux/types/android-setup-state-machine-types.ts
+++ b/src/electron/flux/types/android-setup-state-machine-types.ts
@@ -14,6 +14,7 @@ export type AndroidSetupStoreCallbacks = {
     stepTransition: AndroidSetupStepTransitionCallback;
     setSelectedDevice: (device: DeviceInfo) => void;
     setAvailableDevices: (devices: DeviceInfo[]) => void;
+    setScanPort: (scanPort?: number) => void;
     setApplicationName: (appName?: string) => void;
 };
 
diff --git a/src/electron/flux/types/android-setup-store-data.ts b/src/electron/flux/types/android-setup-store-data.ts
index a040184180e..9ba2d8bf759 100644
--- a/src/electron/flux/types/android-setup-store-data.ts
+++ b/src/electron/flux/types/android-setup-store-data.ts
@@ -8,8 +8,8 @@ export type AndroidSetupStoreData = {
 
     // undefined if no device exists or if no device has been selected
     selectedDevice?: DeviceInfo;
-
     availableDevices?: DeviceInfo[];
 
+    scanPort?: number;
     applicationName?: string;
 };
diff --git a/src/electron/platform/android/android-service-configurator.ts b/src/electron/platform/android/android-service-configurator.ts
index bc2b727969a..4659cb2fef1 100644
--- a/src/electron/platform/android/android-service-configurator.ts
+++ b/src/electron/platform/android/android-service-configurator.ts
@@ -22,7 +22,7 @@ export interface AndroidServiceConfigurator {
     getPermissionInfo(deviceId: string): Promise<PermissionInfo>;
     installService(deviceId: string): Promise<void>;
     uninstallService(deviceId: string): Promise<void>;
-    setTcpForwarding(deviceId: string): Promise<void>;
+    setTcpForwarding(deviceId: string): Promise<number>;
     removeTcpForwarding(deviceId: string): Promise<void>;
 }
 
diff --git a/src/electron/platform/android/appium-service-configurator.ts b/src/electron/platform/android/appium-service-configurator.ts
index 1f8e333a344..ef2c6dee1e1 100644
--- a/src/electron/platform/android/appium-service-configurator.ts
+++ b/src/electron/platform/android/appium-service-configurator.ts
@@ -82,9 +82,10 @@ export class AppiumServiceConfigurator implements AndroidServiceConfigurator {
         await this.adb.uninstallApk(servicePackageName);
     };
 
-    public setTcpForwarding = async (deviceId: string): Promise<void> => {
+    public setTcpForwarding = async (deviceId: string): Promise<number> => {
         this.adb.setDeviceId(deviceId);
         await this.adb.forwardPort(defaultAdbPortNumber, defaultAdbPortNumber);
+        return defaultAdbPortNumber;
     };
 
     public removeTcpForwarding = async (deviceId: string): Promise<void> => {
diff --git a/src/electron/platform/android/setup/android-setup-deps.ts b/src/electron/platform/android/setup/android-setup-deps.ts
index c15dac47995..dc105537238 100644
--- a/src/electron/platform/android/setup/android-setup-deps.ts
+++ b/src/electron/platform/android/setup/android-setup-deps.ts
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+import { Logger } from 'common/logging/logger';
 import { DeviceInfo } from 'electron/platform/android/android-service-configurator';
 
 export type AndroidSetupDeps = {
@@ -11,6 +12,7 @@ export type AndroidSetupDeps = {
     hasExpectedServiceVersion: () => Promise<boolean>;
     installService: () => Promise<boolean>;
     hasExpectedPermissions: () => Promise<boolean>;
-    setTcpForwarding: () => Promise<boolean>;
+    setTcpForwarding: () => Promise<number>;
     getApplicationName: () => Promise<string>;
+    logger: Logger;
 };
diff --git a/src/electron/platform/android/setup/live-android-setup-deps.ts b/src/electron/platform/android/setup/live-android-setup-deps.ts
index e53ed55e0ba..2c05039ccc6 100644
--- a/src/electron/platform/android/setup/live-android-setup-deps.ts
+++ b/src/electron/platform/android/setup/live-android-setup-deps.ts
@@ -25,7 +25,7 @@ export class LiveAndroidSetupDeps implements AndroidSetupDeps {
         private readonly apkLocator: AndroidServiceApkLocator,
         private readonly userConfigMessageCreator: UserConfigMessageCreator,
         private readonly fetchDeviceConfig: DeviceConfigFetcher,
-        private readonly logger: Logger,
+        public readonly logger: Logger,
     ) {}
 
     public hasAdbPath = async (): Promise<boolean> => {
@@ -93,14 +93,8 @@ export class LiveAndroidSetupDeps implements AndroidSetupDeps {
         return false;
     };
 
-    public setTcpForwarding = async (): Promise<boolean> => {
-        try {
-            await this.serviceConfig.setTcpForwarding(this.selectedDeviceId);
-            return true;
-        } catch (error) {
-            this.logger.log(error);
-        }
-        return false;
+    public setTcpForwarding = async (): Promise<number> => {
+        return await this.serviceConfig.setTcpForwarding(this.selectedDeviceId);
     };
 
     public getApplicationName = async (): Promise<string> => {
diff --git a/src/electron/platform/android/setup/steps/configuring-port-forwarding.ts b/src/electron/platform/android/setup/steps/configuring-port-forwarding.ts
index ffb05968c4f..904d143d713 100644
--- a/src/electron/platform/android/setup/steps/configuring-port-forwarding.ts
+++ b/src/electron/platform/android/setup/steps/configuring-port-forwarding.ts
@@ -6,18 +6,19 @@ import { AndroidSetupStepConfig } from 'electron/platform/android/setup/android-
 export const configuringPortForwarding: AndroidSetupStepConfig = deps => ({
     actions: {},
     onEnter: async () => {
-        deps.setApplicationName(); // init
+        try {
+            deps.setScanPort(null);
+            deps.setApplicationName(null);
+            const hostPort = await deps.setTcpForwarding();
+            deps.logger.log(`configured forwarding to tcp:${hostPort}`);
+            const appName = await deps.getApplicationName();
 
-        const configured = await deps.setTcpForwarding();
-
-        if (configured === false) {
+            deps.setScanPort(hostPort);
+            deps.setApplicationName(appName);
+            deps.stepTransition('prompt-connected-start-testing');
+        } catch (e) {
+            deps.logger.error(e);
             deps.stepTransition('prompt-configuring-port-forwarding-failed');
-            return;
         }
-
-        // device is good to go; so we can get the current app name
-        const appName = await deps.getApplicationName();
-        deps.setApplicationName(appName);
-        deps.stepTransition('prompt-connected-start-testing');
     },
 });
diff --git a/src/electron/views/automated-checks/automated-checks-view.tsx b/src/electron/views/automated-checks/automated-checks-view.tsx
index a8a759e79b4..387c9332322 100644
--- a/src/electron/views/automated-checks/automated-checks-view.tsx
+++ b/src/electron/views/automated-checks/automated-checks-view.tsx
@@ -30,6 +30,8 @@ import { ScreenshotView } from 'electron/views/screenshot/screenshot-view';
 import { ScreenshotViewModelProvider } from 'electron/views/screenshot/screenshot-view-model-provider';
 import * as React from 'react';
 
+import { UnifiedFeatureFlags } from 'electron/common/unified-feature-flags';
+import { AndroidSetupStoreData } from 'electron/flux/types/android-setup-store-data';
 import * as styles from './automated-checks-view.scss';
 import { CommandBar, CommandBarDeps } from './components/command-bar';
 import { HeaderSection } from './components/header-section';
@@ -58,11 +60,12 @@ export type AutomatedChecksViewProps = {
     cardSelectionStoreData: CardSelectionStoreData;
     detailsViewStoreData: DetailsViewStoreData;
     featureFlagStoreData: FeatureFlagStoreData;
+    androidSetupStoreData: AndroidSetupStoreData;
 };
 
 export class AutomatedChecksView extends React.Component<AutomatedChecksViewProps> {
     public componentDidMount(): void {
-        this.props.deps.scanActionCreator.scan(this.props.deviceStoreData.port);
+        this.props.deps.scanActionCreator.scan(this.getScanPort());
     }
 
     public render(): JSX.Element {
@@ -125,7 +128,7 @@ export class AutomatedChecksView extends React.Component<AutomatedChecksViewProp
                     <div className={styles.mainContentWrapper}>
                         <CommandBar
                             deps={this.props.deps}
-                            deviceStoreData={this.props.deviceStoreData}
+                            scanPort={this.getScanPort()}
                             scanStoreData={this.props.scanStoreData}
                             featureFlagStoreData={this.props.featureFlagStoreData}
                             cardsViewData={cardsViewData}
@@ -149,18 +152,28 @@ export class AutomatedChecksView extends React.Component<AutomatedChecksViewProp
         );
     }
 
+    private getConnectedDeviceName(): string {
+        return this.props.featureFlagStoreData[UnifiedFeatureFlags.adbSetupView]
+            ? this.props.androidSetupStoreData.selectedDevice?.friendlyName
+            : this.props.deviceStoreData.connectedDevice;
+    }
+
+    private getScanPort(): number {
+        return this.props.featureFlagStoreData[UnifiedFeatureFlags.adbSetupView]
+            ? this.props.androidSetupStoreData.scanPort
+            : this.props.deviceStoreData.port;
+    }
+
     private renderDeviceDisconnected(): JSX.Element {
         return (
             <DeviceDisconnectedPopup
-                deviceName={this.props.deviceStoreData.connectedDevice}
+                deviceName={this.getConnectedDeviceName()}
                 onConnectNewDevice={() =>
                     this.props.deps.windowStateActionCreator.setRoute({
                         routeId: 'deviceConnectView',
                     })
                 }
-                onRescanDevice={() =>
-                    this.props.deps.scanActionCreator.scan(this.props.deviceStoreData.port)
-                }
+                onRescanDevice={() => this.props.deps.scanActionCreator.scan(this.getScanPort())}
             />
         );
     }
diff --git a/src/electron/views/automated-checks/components/command-bar.tsx b/src/electron/views/automated-checks/components/command-bar.tsx
index 4a8ca6f566f..3c55d73ceb9 100644
--- a/src/electron/views/automated-checks/components/command-bar.tsx
+++ b/src/electron/views/automated-checks/components/command-bar.tsx
@@ -12,7 +12,6 @@ import {
 } from 'DetailsView/components/report-export-component';
 import { UnifiedFeatureFlags } from 'electron/common/unified-feature-flags';
 import { ScanActionCreator } from 'electron/flux/action-creator/scan-action-creator';
-import { DeviceStoreData } from 'electron/flux/types/device-store-data';
 import { ScanStatus } from 'electron/flux/types/scan-status';
 import { ScanStoreData } from 'electron/flux/types/scan-store-data';
 import * as React from 'react';
@@ -30,7 +29,7 @@ export type CommandBarDeps = {
 
 export interface CommandBarProps {
     deps: CommandBarDeps;
-    deviceStoreData: DeviceStoreData;
+    scanPort: number;
     scanStoreData: ScanStoreData;
     featureFlagStoreData: FeatureFlagStoreData;
     cardsViewData: CardsViewModel;
@@ -41,7 +40,7 @@ export const commandButtonRefreshId = 'command-button-refresh';
 export const commandButtonSettingsId = 'command-button-settings';
 
 export const CommandBar = NamedFC<CommandBarProps>('CommandBar', props => {
-    const { deps, deviceStoreData, featureFlagStoreData, cardsViewData, scanMetadata } = props;
+    const { deps, scanPort, featureFlagStoreData, cardsViewData, scanMetadata } = props;
     let exportReport = null;
 
     if (scanMetadata != null) {
@@ -73,7 +72,7 @@ export const CommandBar = NamedFC<CommandBarProps>('CommandBar', props => {
                     data-automation-id={commandButtonRefreshId}
                     text="Start over"
                     iconProps={{ iconName: 'Refresh' }}
-                    onClick={() => deps.scanActionCreator.scan(deviceStoreData.port)}
+                    onClick={() => deps.scanActionCreator.scan(scanPort)}
                     disabled={props.scanStoreData.status === ScanStatus.Scanning}
                 />
             </div>
diff --git a/src/tests/unit/tests/electron/flux/store/android-setup-store.test.ts b/src/tests/unit/tests/electron/flux/store/android-setup-store.test.ts
index 014619c79ba..ea01507a0e3 100644
--- a/src/tests/unit/tests/electron/flux/store/android-setup-store.test.ts
+++ b/src/tests/unit/tests/electron/flux/store/android-setup-store.test.ts
@@ -184,6 +184,36 @@ describe('AndroidSetupStore', () => {
         stateMachineFactoryMock.verifyAll();
     });
 
+    it('ensure setScanPort function results in store update', () => {
+        const newScanPort = 63000;
+
+        const initialData: AndroidSetupStoreData = { currentStepId: 'detect-adb' };
+        const expectedData: AndroidSetupStoreData = {
+            currentStepId: 'detect-adb',
+            scanPort: newScanPort,
+        };
+
+        let storeCallbacks: AndroidSetupStoreCallbacks;
+
+        const stateMachineFactoryMock = Mock.ofInstance(mockableStateMachineFactory);
+        stateMachineFactoryMock
+            .setup(m => m(It.isAny()))
+            .callback(sc => (storeCallbacks = sc))
+            .verifiable(Times.once());
+
+        const store = new AndroidSetupStore(
+            new AndroidSetupActions(),
+            stateMachineFactoryMock.object,
+        );
+        store.initialize(initialData);
+
+        storeCallbacks.setScanPort(newScanPort);
+
+        expect(store.getState()).toEqual(expectedData);
+
+        stateMachineFactoryMock.verifyAll();
+    });
+
     it('ensure setApplicationName function results in store update', () => {
         const appName = 'Star Wars -- Episode Test';
 
diff --git a/src/tests/unit/tests/electron/platform/android/appium-service-configurator.test.ts b/src/tests/unit/tests/electron/platform/android/appium-service-configurator.test.ts
index 765839b3710..229f8fc6153 100644
--- a/src/tests/unit/tests/electron/platform/android/appium-service-configurator.test.ts
+++ b/src/tests/unit/tests/electron/platform/android/appium-service-configurator.test.ts
@@ -370,7 +370,8 @@ describe('AppiumServiceConfigurator tests', () => {
             .setup(m => m.forwardPort(expectedPortNumber, expectedPortNumber))
             .verifiable(Times.once());
 
-        await testSubject.setTcpForwarding(emulatorId);
+        const output = await testSubject.setTcpForwarding(emulatorId);
+        expect(output).toBe(expectedPortNumber);
 
         adbMock.verifyAll();
         apkLocatorMock.verifyAll();
diff --git a/src/tests/unit/tests/electron/platform/android/setup/live-android-setup-deps.test.ts b/src/tests/unit/tests/electron/platform/android/setup/live-android-setup-deps.test.ts
index e0ae01640c0..ba385ce91c7 100644
--- a/src/tests/unit/tests/electron/platform/android/setup/live-android-setup-deps.test.ts
+++ b/src/tests/unit/tests/electron/platform/android/setup/live-android-setup-deps.test.ts
@@ -409,16 +409,20 @@ describe('LiveAndroidSetupDeps', () => {
         verifyAllMocks();
     });
 
-    it('setTcpForwarding returns false on error', async () => {
+    it('setTcpForwarding propagates error from serviceConfig.setTcpForwarding', async () => {
+        const deviceId = 'id1';
+        const serviceConfigErrorMessage = 'error from serviceConfig';
         serviceConfigMock
-            .setup(m => m.setTcpForwarding(undefined))
-            .throws(new Error('Threw during setTcpForwarding'))
+            .setup(m => m.setTcpForwarding(deviceId))
+            .returns(() => Promise.reject(new Error(serviceConfigErrorMessage)))
             .verifiable(Times.once());
-        await initializeServiceConfig();
 
-        const success = await testSubject.setTcpForwarding();
+        await initializeServiceConfig();
 
-        expect(success).toBe(false);
+        testSubject.setSelectedDeviceId(deviceId);
+        await expect(testSubject.setTcpForwarding()).rejects.toThrowError(
+            serviceConfigErrorMessage,
+        );
 
         verifyAllMocks();
     });
@@ -442,13 +446,19 @@ describe('LiveAndroidSetupDeps', () => {
         verifyAllMocks();
     });
 
-    it('setTcpForwarding returns true if no error', async () => {
-        serviceConfigMock.setup(m => m.setTcpForwarding(undefined)).verifiable(Times.once());
+    it('setTcpForwarding propagates output from serviceConfig.setTcpForwarding', async () => {
+        const deviceId = 'id1';
+        const serviceConfigOutput = 63000;
+        serviceConfigMock
+            .setup(m => m.setTcpForwarding(deviceId))
+            .returns(() => Promise.resolve(serviceConfigOutput))
+            .verifiable(Times.once());
         await initializeServiceConfig();
 
-        const success = await testSubject.setTcpForwarding();
+        testSubject.setSelectedDeviceId(deviceId);
+        const output = await testSubject.setTcpForwarding();
 
-        expect(success).toBe(true);
+        expect(output).toBe(serviceConfigOutput);
 
         verifyAllMocks();
     });
diff --git a/src/tests/unit/tests/electron/platform/android/setup/steps/configuring-port-forwarding.test.ts b/src/tests/unit/tests/electron/platform/android/setup/steps/configuring-port-forwarding.test.ts
index 41ffc02ad1c..0569ca3e5af 100644
--- a/src/tests/unit/tests/electron/platform/android/setup/steps/configuring-port-forwarding.test.ts
+++ b/src/tests/unit/tests/electron/platform/android/setup/steps/configuring-port-forwarding.test.ts
@@ -1,12 +1,23 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-
 import { AndroidSetupStepConfigDeps } from 'electron/platform/android/setup/android-setup-steps-configs';
 import { configuringPortForwarding } from 'electron/platform/android/setup/steps/configuring-port-forwarding';
-import { Mock, MockBehavior, Times } from 'typemoq';
+import { IMock, It, Mock, MockBehavior, Times } from 'typemoq';
 import { checkExpectedActionsAreDefined } from './actions-tester';
 
 describe('Android setup step: configuringPortForwarding', () => {
+    let mockStoreState: {
+        appName?: string;
+        scanPort?: number;
+    };
+
+    beforeEach(() => {
+        mockStoreState = {
+            appName: null,
+            scanPort: null,
+        };
+    });
+
     it('has expected properties', () => {
         const deps = {} as AndroidSetupStepConfigDeps;
         const step = configuringPortForwarding(deps);
@@ -14,44 +25,72 @@ describe('Android setup step: configuringPortForwarding', () => {
         expect(step.onEnter).toBeDefined();
     });
 
-    it('onEnter transitions to prompt-connected-start-testing on success', async () => {
+    it('onEnter transitions to prompt-connected-start-testing with state set on success', async () => {
+        const scanPort = 63000;
         const appName = 'my app name';
 
-        const tcpForwardingPromise = new Promise<boolean>(resolve => resolve(true));
-        const appNamePromise = new Promise<string>(resolve => resolve(appName));
+        const depsMock = makeMockDepsForMockStore();
 
-        const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
         depsMock
             .setup(m => m.setTcpForwarding())
-            .returns(_ => tcpForwardingPromise)
+            .returns(() => Promise.resolve(scanPort))
+            .verifiable(Times.once());
+
+        depsMock
+            .setup(m => m.getApplicationName())
+            .returns(_ => Promise.resolve(appName))
             .verifiable(Times.once());
 
         depsMock.setup(m => m.stepTransition('prompt-connected-start-testing'));
 
+        const step = configuringPortForwarding(depsMock.object);
+        await step.onEnter();
+
+        expect(mockStoreState.appName).toBe(appName);
+        expect(mockStoreState.scanPort).toBe(scanPort);
+        depsMock.verifyAll();
+    });
+
+    it('onEnter transitions to prompt-configuring-port-forwarding-failed with null state on setTcpForwarding failure', async () => {
+        mockStoreState = {
+            appName: 'old name which should get cleared on failure',
+            scanPort: 1,
+        };
+        const depsMock = makeMockDepsForMockStore();
+
         depsMock
-            .setup(m => m.getApplicationName())
-            .returns(_ => appNamePromise)
+            .setup(m => m.setTcpForwarding())
+            .returns(() => Promise.reject(new Error('test error')))
             .verifiable(Times.once());
 
-        depsMock.setup(m => m.setApplicationName(undefined)).verifiable(Times.once());
-        depsMock.setup(m => m.setApplicationName(appName)).verifiable(Times.once());
+        depsMock
+            .setup(m => m.stepTransition('prompt-configuring-port-forwarding-failed'))
+            .verifiable(Times.once());
 
         const step = configuringPortForwarding(depsMock.object);
         await step.onEnter();
 
+        expect(mockStoreState.appName).toBeNull();
+        expect(mockStoreState.scanPort).toBeNull();
         depsMock.verifyAll();
     });
 
-    it('onEnter transitions to prompt-configuring-port-forwarding-failed on failure', async () => {
-        const p = new Promise<boolean>(resolve => resolve(false));
+    it('onEnter transitions to prompt-configuring-port-forwarding-failed with null state on getApplicationName failure', async () => {
+        mockStoreState = {
+            appName: 'old name which should get cleared on failure',
+            scanPort: 1,
+        };
+        const depsMock = makeMockDepsForMockStore();
 
-        const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
         depsMock
             .setup(m => m.setTcpForwarding())
-            .returns(_ => p)
+            .returns(() => Promise.resolve(2))
             .verifiable(Times.once());
 
-        depsMock.setup(m => m.setApplicationName(undefined)).verifiable(Times.once());
+        depsMock
+            .setup(m => m.getApplicationName())
+            .returns(() => Promise.reject(new Error('error from getApplicationName')))
+            .verifiable(Times.once());
 
         depsMock
             .setup(m => m.stepTransition('prompt-configuring-port-forwarding-failed'))
@@ -60,6 +99,40 @@ describe('Android setup step: configuringPortForwarding', () => {
         const step = configuringPortForwarding(depsMock.object);
         await step.onEnter();
 
+        expect(mockStoreState.appName).toBeNull(); // not 2
+        expect(mockStoreState.scanPort).toBeNull();
         depsMock.verifyAll();
     });
+
+    function makeMockDepsForMockStore(): IMock<AndroidSetupStepConfigDeps> {
+        const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
+
+        depsMock
+            .setup(m => m.logger)
+            .returns(() => ({
+                log: () => {},
+                error: () => {},
+            }))
+            // We don't care how many times this is invoked
+            .verifiable(Times.atLeast(0));
+
+        depsMock
+            .setup(m => m.setScanPort(It.isAny()))
+            .callback(newPort => {
+                mockStoreState.scanPort = newPort;
+            })
+            // We don't care how many times this is invoked, we only care about the final mockStoreState
+            .verifiable(Times.atLeastOnce());
+
+        depsMock
+            .setup(m => m.setApplicationName(It.isAny()))
+            .callback(newName => {
+                mockStoreState.appName = newName;
+            })
+            // We don't care how many times this is invoked, we only care about the final mockStoreState
+
+            .verifiable(Times.atLeastOnce());
+
+        return depsMock;
+    }
 });
diff --git a/src/tests/unit/tests/electron/views/automated-checks/__snapshots__/automated-checks-view.test.tsx.snap b/src/tests/unit/tests/electron/views/automated-checks/__snapshots__/automated-checks-view.test.tsx.snap
index 6c91e5c405c..c7fe5076381 100644
--- a/src/tests/unit/tests/electron/views/automated-checks/__snapshots__/automated-checks-view.test.tsx.snap
+++ b/src/tests/unit/tests/electron/views/automated-checks/__snapshots__/automated-checks-view.test.tsx.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`AutomatedChecksView renders when status scan <Completed> 1`] = `
+exports[`AutomatedChecksView renders with adbSetupViewFeatureFlag=false when status scan <Completed> 1`] = `
 <div
   className="automatedChecksView"
   data-automation-id="automated-checks-view"
@@ -62,7 +62,471 @@ exports[`AutomatedChecksView renders when status scan <Completed> 1`] = `
             },
           }
         }
-        deviceStoreData={Object {}}
+        featureFlagStoreData={
+          Object {
+            "adbSetupView": false,
+          }
+        }
+        scanMetadata={
+          Object {
+            "deviceName": "TEST DEVICE",
+            "targetAppInfo": Object {
+              "name": "test-target-app-name",
+            },
+            "timestamp": "test timestamp",
+            "toolData": Object {
+              "applicationProperties": Object {
+                "name": "some app",
+              },
+            },
+          }
+        }
+        scanStoreData={
+          Object {
+            "status": 2,
+          }
+        }
+      />
+      <main>
+        <HeaderSection />
+        <CardsView
+          cardsViewData={
+            Object {
+              "cards": Object {
+                "fail": Array [
+                  Object {
+                    "id": "test-fail-id",
+                  },
+                ],
+              },
+            }
+          }
+          deps={
+            Object {
+              "getCardSelectionViewData": [Function],
+              "getCardsViewData": [Function],
+              "isResultHighlightUnavailable": [Function],
+              "scanActionCreator": proxy {
+                "___id": "BCDF5CE5-F0DF-40B7-8BA0-69DF395033C8",
+                "deviceActions": undefined,
+                "scanActions": undefined,
+              },
+              "screenshotViewModelProvider": [Function],
+              "toolData": Object {
+                "applicationProperties": Object {
+                  "name": "some app",
+                },
+              },
+            }
+          }
+          scanMetadata={
+            Object {
+              "deviceName": "TEST DEVICE",
+              "targetAppInfo": Object {
+                "name": "test-target-app-name",
+              },
+              "timestamp": "test timestamp",
+              "toolData": Object {
+                "applicationProperties": Object {
+                  "name": "some app",
+                },
+              },
+            }
+          }
+          userConfigurationStoreData={
+            Object {
+              "isFirstTime": false,
+            }
+          }
+        />
+      </main>
+    </div>
+    <ScreenshotView
+      viewModel={
+        Object {
+          "screenshotData": Object {
+            "base64PngData": "this should appear in snapshotted ScreenshotView props",
+          },
+        }
+      }
+    />
+  </div>
+  <SettingsPanel
+    deps={
+      Object {
+        "getCardSelectionViewData": [Function],
+        "getCardsViewData": [Function],
+        "isResultHighlightUnavailable": [Function],
+        "scanActionCreator": proxy {
+          "___id": "BCDF5CE5-F0DF-40B7-8BA0-69DF395033C8",
+          "deviceActions": undefined,
+          "scanActions": undefined,
+        },
+        "screenshotViewModelProvider": [Function],
+        "toolData": Object {
+          "applicationProperties": Object {
+            "name": "some app",
+          },
+        },
+      }
+    }
+    featureFlagData={Object {}}
+    layerClassName="settingsPanelLayerHost"
+    userConfigStoreState={
+      Object {
+        "isFirstTime": false,
+      }
+    }
+  />
+</div>
+`;
+
+exports[`AutomatedChecksView renders with adbSetupViewFeatureFlag=false when status scan <Failed> 1`] = `
+<div
+  className="automatedChecksView"
+  data-automation-id="automated-checks-view"
+>
+  <TitleBar
+    deps={
+      Object {
+        "isResultHighlightUnavailable": [Function],
+        "scanActionCreator": proxy {
+          "___id": "BCDF5CE5-F0DF-40B7-8BA0-69DF395033C8",
+          "deviceActions": undefined,
+          "scanActions": undefined,
+        },
+        "windowStateActionCreator": proxy {
+          "___id": "BCDF5CE5-F0DF-40B7-8BA0-69DF395033C8",
+          "windowFrameActionCreator": undefined,
+          "windowStateActions": undefined,
+        },
+      }
+    }
+    pageTitle="Automated checks"
+    windowStateStoreData="window state store data"
+  />
+  <div
+    className="automatedChecksPanelLayout"
+  >
+    <div
+      className="mainContentWrapper"
+    >
+      <CommandBar
+        cardsViewData={null}
+        deps={
+          Object {
+            "isResultHighlightUnavailable": [Function],
+            "scanActionCreator": proxy {
+              "___id": "BCDF5CE5-F0DF-40B7-8BA0-69DF395033C8",
+              "deviceActions": undefined,
+              "scanActions": undefined,
+            },
+            "windowStateActionCreator": proxy {
+              "___id": "BCDF5CE5-F0DF-40B7-8BA0-69DF395033C8",
+              "windowFrameActionCreator": undefined,
+              "windowStateActions": undefined,
+            },
+          }
+        }
+        featureFlagStoreData={
+          Object {
+            "adbSetupView": false,
+          }
+        }
+        scanMetadata={null}
+        scanPort={62442}
+        scanStoreData={
+          Object {
+            "status": 3,
+          }
+        }
+      />
+      <main>
+        <HeaderSection />
+        <DeviceDisconnectedPopup
+          deviceName="Device name from deviceStoreData"
+          onConnectNewDevice={[Function]}
+          onRescanDevice={[Function]}
+        />
+      </main>
+    </div>
+  </div>
+  <SettingsPanel
+    deps={
+      Object {
+        "isResultHighlightUnavailable": [Function],
+        "scanActionCreator": proxy {
+          "___id": "BCDF5CE5-F0DF-40B7-8BA0-69DF395033C8",
+          "deviceActions": undefined,
+          "scanActions": undefined,
+        },
+        "windowStateActionCreator": proxy {
+          "___id": "BCDF5CE5-F0DF-40B7-8BA0-69DF395033C8",
+          "windowFrameActionCreator": undefined,
+          "windowStateActions": undefined,
+        },
+      }
+    }
+    featureFlagData={Object {}}
+    isOpen={false}
+    layerClassName="settingsPanelLayerHost"
+  />
+</div>
+`;
+
+exports[`AutomatedChecksView renders with adbSetupViewFeatureFlag=false when status scan <Scanning> 1`] = `
+<div
+  className="automatedChecksView"
+  data-automation-id="automated-checks-view"
+>
+  <TitleBar
+    deps={
+      Object {
+        "isResultHighlightUnavailable": [Function],
+        "scanActionCreator": proxy {
+          "___id": "BCDF5CE5-F0DF-40B7-8BA0-69DF395033C8",
+          "deviceActions": undefined,
+          "scanActions": undefined,
+        },
+        "windowStateActionCreator": proxy {
+          "___id": "BCDF5CE5-F0DF-40B7-8BA0-69DF395033C8",
+          "windowFrameActionCreator": undefined,
+          "windowStateActions": undefined,
+        },
+      }
+    }
+    pageTitle="Automated checks"
+    windowStateStoreData="window state store data"
+  />
+  <div
+    className="automatedChecksPanelLayout"
+  >
+    <div
+      className="mainContentWrapper"
+    >
+      <CommandBar
+        cardsViewData={null}
+        deps={
+          Object {
+            "isResultHighlightUnavailable": [Function],
+            "scanActionCreator": proxy {
+              "___id": "BCDF5CE5-F0DF-40B7-8BA0-69DF395033C8",
+              "deviceActions": undefined,
+              "scanActions": undefined,
+            },
+            "windowStateActionCreator": proxy {
+              "___id": "BCDF5CE5-F0DF-40B7-8BA0-69DF395033C8",
+              "windowFrameActionCreator": undefined,
+              "windowStateActions": undefined,
+            },
+          }
+        }
+        featureFlagStoreData={
+          Object {
+            "adbSetupView": false,
+          }
+        }
+        scanMetadata={null}
+        scanPort={62442}
+        scanStoreData={
+          Object {
+            "status": 1,
+          }
+        }
+      />
+      <main>
+        <HeaderSection />
+        <ScanningSpinner
+          aria-live="assertive"
+          isSpinning={true}
+          label="Scanning..."
+        />
+      </main>
+    </div>
+  </div>
+  <SettingsPanel
+    deps={
+      Object {
+        "isResultHighlightUnavailable": [Function],
+        "scanActionCreator": proxy {
+          "___id": "BCDF5CE5-F0DF-40B7-8BA0-69DF395033C8",
+          "deviceActions": undefined,
+          "scanActions": undefined,
+        },
+        "windowStateActionCreator": proxy {
+          "___id": "BCDF5CE5-F0DF-40B7-8BA0-69DF395033C8",
+          "windowFrameActionCreator": undefined,
+          "windowStateActions": undefined,
+        },
+      }
+    }
+    featureFlagData={Object {}}
+    isOpen={false}
+    layerClassName="settingsPanelLayerHost"
+  />
+</div>
+`;
+
+exports[`AutomatedChecksView renders with adbSetupViewFeatureFlag=false when status scan <undefined> 1`] = `
+<div
+  className="automatedChecksView"
+  data-automation-id="automated-checks-view"
+>
+  <TitleBar
+    deps={
+      Object {
+        "isResultHighlightUnavailable": [Function],
+        "scanActionCreator": proxy {
+          "___id": "BCDF5CE5-F0DF-40B7-8BA0-69DF395033C8",
+          "deviceActions": undefined,
+          "scanActions": undefined,
+        },
+        "windowStateActionCreator": proxy {
+          "___id": "BCDF5CE5-F0DF-40B7-8BA0-69DF395033C8",
+          "windowFrameActionCreator": undefined,
+          "windowStateActions": undefined,
+        },
+      }
+    }
+    pageTitle="Automated checks"
+    windowStateStoreData="window state store data"
+  />
+  <div
+    className="automatedChecksPanelLayout"
+  >
+    <div
+      className="mainContentWrapper"
+    >
+      <CommandBar
+        cardsViewData={null}
+        deps={
+          Object {
+            "isResultHighlightUnavailable": [Function],
+            "scanActionCreator": proxy {
+              "___id": "BCDF5CE5-F0DF-40B7-8BA0-69DF395033C8",
+              "deviceActions": undefined,
+              "scanActions": undefined,
+            },
+            "windowStateActionCreator": proxy {
+              "___id": "BCDF5CE5-F0DF-40B7-8BA0-69DF395033C8",
+              "windowFrameActionCreator": undefined,
+              "windowStateActions": undefined,
+            },
+          }
+        }
+        featureFlagStoreData={
+          Object {
+            "adbSetupView": false,
+          }
+        }
+        scanMetadata={null}
+        scanPort={62442}
+        scanStoreData={
+          Object {
+            "status": undefined,
+          }
+        }
+      />
+      <main>
+        <HeaderSection />
+        <ScanningSpinner
+          aria-live="assertive"
+          isSpinning={false}
+          label="Scanning..."
+        />
+      </main>
+    </div>
+  </div>
+  <SettingsPanel
+    deps={
+      Object {
+        "isResultHighlightUnavailable": [Function],
+        "scanActionCreator": proxy {
+          "___id": "BCDF5CE5-F0DF-40B7-8BA0-69DF395033C8",
+          "deviceActions": undefined,
+          "scanActions": undefined,
+        },
+        "windowStateActionCreator": proxy {
+          "___id": "BCDF5CE5-F0DF-40B7-8BA0-69DF395033C8",
+          "windowFrameActionCreator": undefined,
+          "windowStateActions": undefined,
+        },
+      }
+    }
+    featureFlagData={Object {}}
+    isOpen={false}
+    layerClassName="settingsPanelLayerHost"
+  />
+</div>
+`;
+
+exports[`AutomatedChecksView renders with adbSetupViewFeatureFlag=true when status scan <Completed> 1`] = `
+<div
+  className="automatedChecksView"
+  data-automation-id="automated-checks-view"
+>
+  <TitleBar
+    deps={
+      Object {
+        "getCardSelectionViewData": [Function],
+        "getCardsViewData": [Function],
+        "isResultHighlightUnavailable": [Function],
+        "scanActionCreator": proxy {
+          "___id": "BCDF5CE5-F0DF-40B7-8BA0-69DF395033C8",
+          "deviceActions": undefined,
+          "scanActions": undefined,
+        },
+        "screenshotViewModelProvider": [Function],
+        "toolData": Object {
+          "applicationProperties": Object {
+            "name": "some app",
+          },
+        },
+      }
+    }
+    pageTitle="Automated checks"
+  />
+  <div
+    className="automatedChecksPanelLayout"
+  >
+    <div
+      className="mainContentWrapper"
+    >
+      <CommandBar
+        cardsViewData={
+          Object {
+            "cards": Object {
+              "fail": Array [
+                Object {
+                  "id": "test-fail-id",
+                },
+              ],
+            },
+          }
+        }
+        deps={
+          Object {
+            "getCardSelectionViewData": [Function],
+            "getCardsViewData": [Function],
+            "isResultHighlightUnavailable": [Function],
+            "scanActionCreator": proxy {
+              "___id": "BCDF5CE5-F0DF-40B7-8BA0-69DF395033C8",
+              "deviceActions": undefined,
+              "scanActions": undefined,
+            },
+            "screenshotViewModelProvider": [Function],
+            "toolData": Object {
+              "applicationProperties": Object {
+                "name": "some app",
+              },
+            },
+          }
+        }
+        featureFlagStoreData={
+          Object {
+            "adbSetupView": true,
+          }
+        }
         scanMetadata={
           Object {
             "deviceName": "TEST DEVICE",
@@ -177,7 +641,7 @@ exports[`AutomatedChecksView renders when status scan <Completed> 1`] = `
 </div>
 `;
 
-exports[`AutomatedChecksView renders when status scan <Failed> 1`] = `
+exports[`AutomatedChecksView renders with adbSetupViewFeatureFlag=true when status scan <Failed> 1`] = `
 <div
   className="automatedChecksView"
   data-automation-id="automated-checks-view"
@@ -224,12 +688,13 @@ exports[`AutomatedChecksView renders when status scan <Failed> 1`] = `
             },
           }
         }
-        deviceStoreData={
+        featureFlagStoreData={
           Object {
-            "connectedDevice": "TEST DEVICE",
+            "adbSetupView": true,
           }
         }
         scanMetadata={null}
+        scanPort={63000}
         scanStoreData={
           Object {
             "status": 3,
@@ -239,7 +704,7 @@ exports[`AutomatedChecksView renders when status scan <Failed> 1`] = `
       <main>
         <HeaderSection />
         <DeviceDisconnectedPopup
-          deviceName="TEST DEVICE"
+          deviceName="Device name from androidSetupStoreData"
           onConnectNewDevice={[Function]}
           onRescanDevice={[Function]}
         />
@@ -269,7 +734,7 @@ exports[`AutomatedChecksView renders when status scan <Failed> 1`] = `
 </div>
 `;
 
-exports[`AutomatedChecksView renders when status scan <Scanning> 1`] = `
+exports[`AutomatedChecksView renders with adbSetupViewFeatureFlag=true when status scan <Scanning> 1`] = `
 <div
   className="automatedChecksView"
   data-automation-id="automated-checks-view"
@@ -316,12 +781,13 @@ exports[`AutomatedChecksView renders when status scan <Scanning> 1`] = `
             },
           }
         }
-        deviceStoreData={
+        featureFlagStoreData={
           Object {
-            "connectedDevice": "TEST DEVICE",
+            "adbSetupView": true,
           }
         }
         scanMetadata={null}
+        scanPort={63000}
         scanStoreData={
           Object {
             "status": 1,
@@ -361,7 +827,7 @@ exports[`AutomatedChecksView renders when status scan <Scanning> 1`] = `
 </div>
 `;
 
-exports[`AutomatedChecksView renders when status scan <undefined> 1`] = `
+exports[`AutomatedChecksView renders with adbSetupViewFeatureFlag=true when status scan <undefined> 1`] = `
 <div
   className="automatedChecksView"
   data-automation-id="automated-checks-view"
@@ -408,12 +874,13 @@ exports[`AutomatedChecksView renders when status scan <undefined> 1`] = `
             },
           }
         }
-        deviceStoreData={
+        featureFlagStoreData={
           Object {
-            "connectedDevice": "TEST DEVICE",
+            "adbSetupView": true,
           }
         }
         scanMetadata={null}
+        scanPort={63000}
         scanStoreData={
           Object {
             "status": undefined,
diff --git a/src/tests/unit/tests/electron/views/automated-checks/automated-checks-view.test.tsx b/src/tests/unit/tests/electron/views/automated-checks/automated-checks-view.test.tsx
index 168f9232f1a..d93772d9e81 100644
--- a/src/tests/unit/tests/electron/views/automated-checks/automated-checks-view.test.tsx
+++ b/src/tests/unit/tests/electron/views/automated-checks/automated-checks-view.test.tsx
@@ -13,6 +13,7 @@ import {
     CardRuleResultsByStatus,
     CardsViewModel,
 } from 'common/types/store-data/card-view-model';
+import { FeatureFlagStoreData } from 'common/types/store-data/feature-flag-store-data';
 import {
     PlatformData,
     ToolData,
@@ -20,6 +21,7 @@ import {
     UnifiedRule,
     UnifiedScanResultStoreData,
 } from 'common/types/store-data/unified-data-interface';
+import { UnifiedFeatureFlags } from 'electron/common/unified-feature-flags';
 import { ScanActionCreator } from 'electron/flux/action-creator/scan-action-creator';
 import { WindowStateActionCreator } from 'electron/flux/action-creator/window-state-action-creator';
 import { ScanStatus } from 'electron/flux/types/scan-status';
@@ -35,160 +37,212 @@ import * as React from 'react';
 import { It, Mock, Times } from 'typemoq';
 
 describe('AutomatedChecksView', () => {
-    describe('renders', () => {
-        let bareMinimumProps: AutomatedChecksViewProps;
-        let isResultHighlightUnavailableStub: IsResultHighlightUnavailable;
-
-        beforeEach(() => {
-            isResultHighlightUnavailableStub = () => null;
-            bareMinimumProps = {
-                deps: {
-                    windowStateActionCreator: Mock.ofType(WindowStateActionCreator).object,
-                    scanActionCreator: Mock.ofType(ScanActionCreator).object,
-                    isResultHighlightUnavailable: isResultHighlightUnavailableStub,
-                },
-                scanStoreData: {},
-                deviceStoreData: {
-                    connectedDevice: 'TEST DEVICE',
-                },
-                detailsViewStoreData: {
-                    currentPanel: { isSettingsOpen: false },
-                },
-                windowStateStoreData: 'window state store data' as any,
-            } as AutomatedChecksViewProps;
-        });
-
-        const scanStatuses = [
-            undefined,
-            ScanStatus[ScanStatus.Scanning],
-            ScanStatus[ScanStatus.Failed],
-        ];
-
-        it.each(scanStatuses)('when status scan <%s>', scanStatusName => {
-            bareMinimumProps.scanStoreData.status = ScanStatus[scanStatusName];
-
-            const wrapped = shallow(<AutomatedChecksView {...bareMinimumProps} />);
-            expect(wrapped.getElement()).toMatchSnapshot();
-        });
-
-        it('when status scan <Completed>', () => {
-            const cardSelectionStoreData = {} as CardSelectionStoreData;
-            const resultsHighlightStatus = {
-                'highlighted-uid-1': 'visible',
-                'not-highlighted-uid-1': 'hidden',
-            } as ResultsHighlightStatus;
-            const timeStampStub = 'test timestamp';
-            const toolDataStub: ToolData = {
-                applicationProperties: { name: 'some app' },
-            } as ToolData;
-
-            const cardSelectionViewDataStub = {
-                resultsHighlightStatus: resultsHighlightStatus,
-            } as CardSelectionViewData;
-            const rulesStub = [{ description: 'test-rule-description' } as UnifiedRule];
-            const resultsStub = [
-                { uid: 'highlighted-uid-1' },
-                { uid: 'not-highlighted-uid-1' },
-            ] as UnifiedResult[];
-            const unifiedScanResultStoreData: UnifiedScanResultStoreData = {
-                targetAppInfo: {
-                    name: 'test-target-app-name',
-                },
-                rules: rulesStub,
-                results: resultsStub,
-                toolInfo: toolDataStub,
-                timestamp: timeStampStub,
-                platformInfo: {
-                    deviceName: 'TEST DEVICE',
-                } as PlatformData,
-            };
-
-            const ruleResultsByStatusStub = {
-                fail: [{ id: 'test-fail-id' } as CardRuleResult],
-            } as CardRuleResultsByStatus;
-            const cardsViewData = {
-                cards: ruleResultsByStatusStub,
-            } as CardsViewModel;
-            const screenshotViewModelStub = {
-                screenshotData: {
-                    base64PngData: 'this should appear in snapshotted ScreenshotView props',
-                },
-            } as ScreenshotViewModel;
-            const screenshotViewModelProviderMock = Mock.ofInstance(screenshotViewModelProvider);
-            const getCardSelectionViewDataMock = Mock.ofInstance(getCardSelectionViewData);
-            const getUnifiedRuleResultsMock = Mock.ofInstance(getCardViewData);
-
-            const props: AutomatedChecksViewProps = {
-                deps: {
-                    scanActionCreator: Mock.ofType(ScanActionCreator).object,
-                    getCardsViewData: getUnifiedRuleResultsMock.object,
-                    getCardSelectionViewData: getCardSelectionViewDataMock.object,
-                    screenshotViewModelProvider: screenshotViewModelProviderMock.object,
-                    isResultHighlightUnavailable: isResultHighlightUnavailableStub,
-                },
-                cardSelectionStoreData,
-                deviceStoreData: {},
-                scanStoreData: {
-                    status: ScanStatus.Completed,
-                },
-                userConfigurationStoreData: {
-                    isFirstTime: false,
-                },
-                detailsViewStoreData: {
-                    currentPanel: {},
-                },
-                unifiedScanResultStoreData,
-            } as AutomatedChecksViewProps;
+    describe.each`
+        adbSetupViewFeatureFlag
+        ${true}
+        ${false}
+    `(
+        'renders with adbSetupViewFeatureFlag=$adbSetupViewFeatureFlag',
+        ({ adbSetupViewFeatureFlag }) => {
+            let bareMinimumProps: AutomatedChecksViewProps;
+            let isResultHighlightUnavailableStub: IsResultHighlightUnavailable;
+
+            beforeEach(() => {
+                isResultHighlightUnavailableStub = () => null;
+                bareMinimumProps = {
+                    deps: {
+                        windowStateActionCreator: Mock.ofType(WindowStateActionCreator).object,
+                        scanActionCreator: Mock.ofType(ScanActionCreator).object,
+                        isResultHighlightUnavailable: isResultHighlightUnavailableStub,
+                    },
+                    scanStoreData: {},
+                    deviceStoreData: {
+                        port: 62442,
+                        connectedDevice: 'Device name from deviceStoreData',
+                    },
+                    androidSetupStoreData: {
+                        scanPort: 63000,
+                        selectedDevice: {
+                            friendlyName: 'Device name from androidSetupStoreData',
+                        },
+                    },
+                    detailsViewStoreData: {
+                        currentPanel: { isSettingsOpen: false },
+                    },
+                    windowStateStoreData: 'window state store data' as any,
+                    featureFlagStoreData: {
+                        [UnifiedFeatureFlags.adbSetupView]: adbSetupViewFeatureFlag,
+                    } as FeatureFlagStoreData,
+                } as AutomatedChecksViewProps;
+            });
+
+            const scanStatuses = [
+                undefined,
+                ScanStatus[ScanStatus.Scanning],
+                ScanStatus[ScanStatus.Failed],
+            ];
+
+            it.each(scanStatuses)('when status scan <%s>', scanStatusName => {
+                bareMinimumProps.scanStoreData.status = ScanStatus[scanStatusName];
+
+                const wrapped = shallow(<AutomatedChecksView {...bareMinimumProps} />);
+                expect(wrapped.getElement()).toMatchSnapshot();
+            });
+
+            it('when status scan <Completed>', () => {
+                const cardSelectionStoreData = {} as CardSelectionStoreData;
+                const resultsHighlightStatus = {
+                    'highlighted-uid-1': 'visible',
+                    'not-highlighted-uid-1': 'hidden',
+                } as ResultsHighlightStatus;
+                const timeStampStub = 'test timestamp';
+                const toolDataStub: ToolData = {
+                    applicationProperties: { name: 'some app' },
+                } as ToolData;
+
+                const cardSelectionViewDataStub = {
+                    resultsHighlightStatus: resultsHighlightStatus,
+                } as CardSelectionViewData;
+                const rulesStub = [{ description: 'test-rule-description' } as UnifiedRule];
+                const resultsStub = [
+                    { uid: 'highlighted-uid-1' },
+                    { uid: 'not-highlighted-uid-1' },
+                ] as UnifiedResult[];
+                const unifiedScanResultStoreData: UnifiedScanResultStoreData = {
+                    targetAppInfo: {
+                        name: 'test-target-app-name',
+                    },
+                    rules: rulesStub,
+                    results: resultsStub,
+                    toolInfo: toolDataStub,
+                    timestamp: timeStampStub,
+                    platformInfo: {
+                        deviceName: 'TEST DEVICE',
+                    } as PlatformData,
+                };
+
+                const ruleResultsByStatusStub = {
+                    fail: [{ id: 'test-fail-id' } as CardRuleResult],
+                } as CardRuleResultsByStatus;
+                const cardsViewData = {
+                    cards: ruleResultsByStatusStub,
+                } as CardsViewModel;
+                const screenshotViewModelStub = {
+                    screenshotData: {
+                        base64PngData: 'this should appear in snapshotted ScreenshotView props',
+                    },
+                } as ScreenshotViewModel;
+                const screenshotViewModelProviderMock = Mock.ofInstance(
+                    screenshotViewModelProvider,
+                );
+                const getCardSelectionViewDataMock = Mock.ofInstance(getCardSelectionViewData);
+                const getUnifiedRuleResultsMock = Mock.ofInstance(getCardViewData);
+
+                const props: AutomatedChecksViewProps = {
+                    deps: {
+                        scanActionCreator: Mock.ofType(ScanActionCreator).object,
+                        getCardsViewData: getUnifiedRuleResultsMock.object,
+                        getCardSelectionViewData: getCardSelectionViewDataMock.object,
+                        screenshotViewModelProvider: screenshotViewModelProviderMock.object,
+                        isResultHighlightUnavailable: isResultHighlightUnavailableStub,
+                    },
+                    cardSelectionStoreData,
+                    deviceStoreData: {},
+                    androidSetupStoreData: {},
+                    scanStoreData: {
+                        status: ScanStatus.Completed,
+                    },
+                    userConfigurationStoreData: {
+                        isFirstTime: false,
+                    },
+                    detailsViewStoreData: {
+                        currentPanel: {},
+                    },
+                    unifiedScanResultStoreData,
+                    featureFlagStoreData: {
+                        [UnifiedFeatureFlags.adbSetupView]: adbSetupViewFeatureFlag,
+                    } as FeatureFlagStoreData,
+                } as AutomatedChecksViewProps;
+
+                getCardSelectionViewDataMock
+                    .setup(getData =>
+                        getData(
+                            cardSelectionStoreData,
+                            unifiedScanResultStoreData,
+                            isResultHighlightUnavailableStub,
+                        ),
+                    )
+                    .returns(() => cardSelectionViewDataStub)
+                    .verifiable(Times.once());
+
+                getUnifiedRuleResultsMock
+                    .setup(getter => getter(rulesStub, resultsStub, cardSelectionViewDataStub))
+                    .returns(() => cardsViewData)
+                    .verifiable(Times.once());
+
+                screenshotViewModelProviderMock
+                    .setup(provider => provider(unifiedScanResultStoreData, ['highlighted-uid-1']))
+                    .returns(() => screenshotViewModelStub)
+                    .verifiable(Times.once());
+
+                const wrapped = shallow(<AutomatedChecksView {...props} />);
+
+                expect(wrapped.getElement()).toMatchSnapshot();
+
+                getCardSelectionViewDataMock.verifyAll();
+                getUnifiedRuleResultsMock.verifyAll();
+                screenshotViewModelProviderMock.verifyAll();
+            });
+        },
+    );
+
+    it('triggers scan when first mounted (non-adbSetupView)', () => {
+        const port = 11111;
 
-            getCardSelectionViewDataMock
-                .setup(getData =>
-                    getData(
-                        cardSelectionStoreData,
-                        unifiedScanResultStoreData,
-                        isResultHighlightUnavailableStub,
-                    ),
-                )
-                .returns(() => cardSelectionViewDataStub)
-                .verifiable(Times.once());
-
-            getUnifiedRuleResultsMock
-                .setup(getter => getter(rulesStub, resultsStub, cardSelectionViewDataStub))
-                .returns(() => cardsViewData)
-                .verifiable(Times.once());
-
-            screenshotViewModelProviderMock
-                .setup(provider => provider(unifiedScanResultStoreData, ['highlighted-uid-1']))
-                .returns(() => screenshotViewModelStub)
-                .verifiable(Times.once());
+        const scanActionCreatorMock = Mock.ofType(ScanActionCreator);
+        scanActionCreatorMock.setup(creator => creator.scan(port)).verifiable(Times.once());
 
-            const wrapped = shallow(<AutomatedChecksView {...props} />);
+        const props: AutomatedChecksViewProps = {
+            deps: {
+                scanActionCreator: scanActionCreatorMock.object,
+            },
+            scanStoreData: {},
+            deviceStoreData: {
+                port,
+            },
+            detailsViewStoreData: {
+                currentPanel: {},
+            },
+            featureFlagStoreData: {
+                [UnifiedFeatureFlags.adbSetupView]: false,
+            } as FeatureFlagStoreData,
+        } as AutomatedChecksViewProps;
 
-            expect(wrapped.getElement()).toMatchSnapshot();
+        shallow(<AutomatedChecksView {...props} />);
 
-            getCardSelectionViewDataMock.verifyAll();
-            getUnifiedRuleResultsMock.verifyAll();
-            screenshotViewModelProviderMock.verifyAll();
-        });
+        scanActionCreatorMock.verifyAll();
     });
 
-    it('triggers scan when first mounted', () => {
-        const port = 11111;
+    it('triggers scan when first mounted (adbSetupView)', () => {
+        const scanPort = 11111;
 
         const scanActionCreatorMock = Mock.ofType(ScanActionCreator);
-        scanActionCreatorMock.setup(creator => creator.scan(port)).verifiable(Times.once());
+        scanActionCreatorMock.setup(creator => creator.scan(scanPort)).verifiable(Times.once());
 
         const props: AutomatedChecksViewProps = {
             deps: {
                 scanActionCreator: scanActionCreatorMock.object,
             },
             scanStoreData: {},
-            deviceStoreData: {
-                port,
+            androidSetupStoreData: {
+                scanPort,
             },
-
             detailsViewStoreData: {
                 currentPanel: {},
             },
+            featureFlagStoreData: {
+                [UnifiedFeatureFlags.adbSetupView]: true,
+            } as FeatureFlagStoreData,
         } as AutomatedChecksViewProps;
 
         shallow(<AutomatedChecksView {...props} />);
@@ -197,7 +251,7 @@ describe('AutomatedChecksView', () => {
     });
 
     describe('DeviceDisconnectedPopup event handlers', () => {
-        it('onRescanDevice', () => {
+        it('onRescanDevice (non-adbSetupView)', () => {
             const port = 11111;
 
             const scanActionCreatorMock = Mock.ofType(ScanActionCreator);
@@ -215,6 +269,9 @@ describe('AutomatedChecksView', () => {
                 detailsViewStoreData: {
                     currentPanel: {},
                 },
+                featureFlagStoreData: {
+                    [UnifiedFeatureFlags.adbSetupView]: false,
+                } as FeatureFlagStoreData,
             } as AutomatedChecksViewProps;
 
             const wrapped = shallow(<AutomatedChecksView {...props} />);
@@ -226,6 +283,38 @@ describe('AutomatedChecksView', () => {
             scanActionCreatorMock.verify(creator => creator.scan(port), Times.once());
         });
 
+        it('onRescanDevice (adbSetupView)', () => {
+            const scanPort = 11111;
+
+            const scanActionCreatorMock = Mock.ofType(ScanActionCreator);
+
+            const props: AutomatedChecksViewProps = {
+                deps: {
+                    scanActionCreator: scanActionCreatorMock.object,
+                },
+                scanStoreData: {
+                    status: ScanStatus.Failed,
+                },
+                androidSetupStoreData: {
+                    scanPort,
+                },
+                detailsViewStoreData: {
+                    currentPanel: {},
+                },
+                featureFlagStoreData: {
+                    [UnifiedFeatureFlags.adbSetupView]: true,
+                } as FeatureFlagStoreData,
+            } as AutomatedChecksViewProps;
+
+            const wrapped = shallow(<AutomatedChecksView {...props} />);
+
+            scanActionCreatorMock.reset(); // this mock is used on componentDidMount, which is not in the scope of this unit test
+
+            wrapped.find(DeviceDisconnectedPopup).prop('onRescanDevice')();
+
+            scanActionCreatorMock.verify(creator => creator.scan(scanPort), Times.once());
+        });
+
         it('onConnectNewDevice', () => {
             const scanActionCreatorMock = Mock.ofType(ScanActionCreator);
             const windowStateActionCreatorMock = Mock.ofType(WindowStateActionCreator);
@@ -242,6 +331,9 @@ describe('AutomatedChecksView', () => {
                 detailsViewStoreData: {
                     currentPanel: {},
                 },
+                featureFlagStoreData: {
+                    [UnifiedFeatureFlags.adbSetupView]: false,
+                } as FeatureFlagStoreData,
             } as AutomatedChecksViewProps;
 
             const wrapped = shallow(<AutomatedChecksView {...props} />);
diff --git a/src/tests/unit/tests/electron/views/automated-checks/components/command-bar.test.tsx b/src/tests/unit/tests/electron/views/automated-checks/components/command-bar.test.tsx
index 56c75099c25..11ae196157e 100644
--- a/src/tests/unit/tests/electron/views/automated-checks/components/command-bar.test.tsx
+++ b/src/tests/unit/tests/electron/views/automated-checks/components/command-bar.test.tsx
@@ -132,9 +132,7 @@ describe('CommandBar', () => {
                     getDateFromTimestamp: getDateFromTimestampMock.object,
                     reportGenerator: reportGeneratorMock.object,
                 },
-                deviceStoreData: {
-                    port,
-                },
+                scanPort: port,
                 scanStoreData: {
                     status: ScanStatus.Default,
                 },

From 42d196c322659c6065aadeaed749fe93d0c40298 Mon Sep 17 00:00:00 2001
From: Dave Tryon <45672944+DaveTryon@users.noreply.github.com>
Date: Mon, 22 Jun 2020 15:10:51 -0700
Subject: [PATCH 64/71] fix(android-setup): Connect cancel button in "start
 testing" dialog (#2935)

---
 .../setup/steps/prompt-connected-start-testing.ts    |  3 +++
 .../steps/prompt-connected-start-testing.test.ts     | 12 +++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/electron/platform/android/setup/steps/prompt-connected-start-testing.ts b/src/electron/platform/android/setup/steps/prompt-connected-start-testing.ts
index 679b925cf48..a54b8328a7c 100644
--- a/src/electron/platform/android/setup/steps/prompt-connected-start-testing.ts
+++ b/src/electron/platform/android/setup/steps/prompt-connected-start-testing.ts
@@ -5,6 +5,9 @@ import { AndroidSetupStepConfig } from 'electron/platform/android/setup/android-
 
 export const promptConnectedStartTesting: AndroidSetupStepConfig = deps => ({
     actions: {
+        cancel: () => {
+            deps.stepTransition('prompt-choose-device');
+        },
         rescan: () => {
             deps.stepTransition('detect-adb');
         },
diff --git a/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-connected-start-testing.test.ts b/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-connected-start-testing.test.ts
index ddd9f9b0398..e47446e2259 100644
--- a/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-connected-start-testing.test.ts
+++ b/src/tests/unit/tests/electron/platform/android/setup/steps/prompt-connected-start-testing.test.ts
@@ -10,10 +10,20 @@ describe('Android setup step: promptConnectedStartTesting', () => {
     it('has expected properties', () => {
         const deps = {} as AndroidSetupStepConfigDeps;
         const step = promptConnectedStartTesting(deps);
-        checkExpectedActionsAreDefined(step, ['rescan']);
+        checkExpectedActionsAreDefined(step, ['cancel', 'rescan']);
         expect(step.onEnter).not.toBeDefined();
     });
 
+    it('cancel transitions to prompt-choose-device', async () => {
+        const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
+        depsMock.setup(m => m.stepTransition('prompt-choose-device')).verifiable(Times.once());
+
+        const step = promptConnectedStartTesting(depsMock.object);
+        step.actions.cancel();
+
+        depsMock.verifyAll();
+    });
+
     it('rescan transitions to detect-adb as expected', () => {
         const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
         depsMock.setup(m => m.stepTransition('detect-adb')).verifiable(Times.once());

From bbcfdc0d313ace87272fc9578f35799333c0c1ce Mon Sep 17 00:00:00 2001
From: Dave Tryon <45672944+DaveTryon@users.noreply.github.com>
Date: Tue, 23 Jun 2020 09:19:59 -0700
Subject: [PATCH 65/71] fix(android-setup): Enable selection from multiple
 devices (#2937)

---
 .../android/setup/android-setup-steps-configs.ts         | 3 ++-
 .../android-setup/prompt-choose-device-step.tsx          | 5 ++++-
 .../android-setup/prompt-choose-device-step.test.tsx     | 9 ++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/electron/platform/android/setup/android-setup-steps-configs.ts b/src/electron/platform/android/setup/android-setup-steps-configs.ts
index 06965263f49..372ce5d87a1 100644
--- a/src/electron/platform/android/setup/android-setup-steps-configs.ts
+++ b/src/electron/platform/android/setup/android-setup-steps-configs.ts
@@ -10,6 +10,7 @@ import { detectDevices } from 'electron/platform/android/setup/steps/detect-devi
 import { detectPermissions } from 'electron/platform/android/setup/steps/detect-permissions';
 import { detectService } from 'electron/platform/android/setup/steps/detect-service';
 import { installingService } from 'electron/platform/android/setup/steps/installing-service';
+import { promptChooseDevice } from 'electron/platform/android/setup/steps/prompt-choose-device';
 import { promptConfiguringPortForwardingFailed } from 'electron/platform/android/setup/steps/prompt-configuring-port-forwarding-failed';
 import { promptConnectToDevice } from 'electron/platform/android/setup/steps/prompt-connect-to-device';
 import { promptConnectedStartTesting } from 'electron/platform/android/setup/steps/prompt-connected-start-testing';
@@ -40,7 +41,7 @@ export const allAndroidSetupStepConfigs: AndroidSetupStepConfigs = {
     'prompt-locate-adb': promptLocateAdb,
     'prompt-connect-to-device': promptConnectToDevice,
     'detect-devices': detectDevices,
-    'prompt-choose-device': promptConnectToDevice,
+    'prompt-choose-device': promptChooseDevice,
     'detect-service': detectService,
     'prompt-install-service': promptInstallService,
     'installing-service': installingService,
diff --git a/src/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.tsx b/src/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.tsx
index e6c75f7c7eb..c2e4fcc59aa 100644
--- a/src/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.tsx
+++ b/src/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.tsx
@@ -90,7 +90,10 @@ export class PromptChooseDeviceStep extends React.Component<
             rightFooterButtonProps: {
                 text: 'Next',
                 disabled: this.state.selectedDevice === null,
-                onClick: _ => this.props.deps.androidSetupActionCreator.next(),
+                onClick: _ => {
+                    const selectedDevice: DeviceInfo = this.state.selectedDevice['metadata'];
+                    this.props.deps.androidSetupActionCreator.setSelectedDevice(selectedDevice);
+                },
             },
         };
 
diff --git a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.test.tsx b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.test.tsx
index 4f656b6010d..4eb95363bed 100644
--- a/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.test.tsx
+++ b/src/tests/unit/tests/electron/views/device-connect-view/components/android-setup/prompt-choose-device-step.test.tsx
@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 import { AndroidSetupActionCreator } from 'electron/flux/action-creator/android-setup-action-creator';
 import { AndroidSetupStoreData } from 'electron/flux/types/android-setup-store-data';
+import { DeviceInfo } from 'electron/platform/android/android-service-configurator';
 import { AndroidSetupStepLayout } from 'electron/views/device-connect-view/components/android-setup/android-setup-step-layout';
 import { CommonAndroidSetupStepProps } from 'electron/views/device-connect-view/components/android-setup/android-setup-types';
 import { PromptChooseDeviceStep } from 'electron/views/device-connect-view/components/android-setup/prompt-choose-device-step';
@@ -63,11 +64,13 @@ describe('PromptChooseDeviceStep', () => {
         actionMessageCreatorMock.verify(m => m.rescan(), Times.once());
     });
 
-    it('passes next dep through', () => {
+    it('passes setSelectedDevice dep through', () => {
+        const expectedDevice: DeviceInfo = props.androidSetupStoreData.availableDevices[0];
         const stubEvent = {} as React.MouseEvent<HTMLButtonElement>;
-        const rendered = shallow(<PromptChooseDeviceStep {...props} />);
+        const rendered = mount(<PromptChooseDeviceStep {...props} />);
+        rendered.find('DeviceDescription').at(0).simulate('click');
         rendered.find(AndroidSetupStepLayout).prop('rightFooterButtonProps').onClick(stubEvent);
-        actionMessageCreatorMock.verify(m => m.next(), Times.once());
+        actionMessageCreatorMock.verify(m => m.setSelectedDevice(expectedDevice), Times.once());
     });
 
     it('next button becomes enabled after device is selected', () => {

From adab23d9dc08550dda571e5480cbbd3039fd326f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 23 Jun 2020 18:10:41 +0000
Subject: [PATCH 66/71] chore(deps-dev): bump ts-jest from 26.1.0 to 26.1.1
 (#2938)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index edbb1c65ea1..5c09e04a14b 100644
--- a/package.json
+++ b/package.json
@@ -125,7 +125,7 @@
         "source-map-loader": "^1.0.0",
         "spectron": "^10.0.1",
         "terser-webpack-plugin": "^3.0.6",
-        "ts-jest": "^26.1.0",
+        "ts-jest": "^26.1.1",
         "ts-loader": "^7.0.5",
         "tslint": "^5.20.1",
         "tslint-microsoft-contrib": "6.2.0",
diff --git a/yarn.lock b/yarn.lock
index bbef68c981d..25022278612 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10780,10 +10780,10 @@ truncate-utf8-bytes@^1.0.0:
   dependencies:
     utf8-byte-length "^1.0.1"
 
-ts-jest@^26.1.0:
-  version "26.1.0"
-  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.1.0.tgz#e9070fc97b3ea5557a48b67c631c74eb35e15417"
-  integrity sha512-JbhQdyDMYN5nfKXaAwCIyaWLGwevcT2/dbqRPsQeh6NZPUuXjZQZEfeLb75tz0ubCIgEELNm6xAzTe5NXs5Y4Q==
+ts-jest@^26.1.1:
+  version "26.1.1"
+  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.1.1.tgz#b98569b8a4d4025d966b3d40c81986dd1c510f8d"
+  integrity sha512-Lk/357quLg5jJFyBQLnSbhycnB3FPe+e9i7ahxokyXxAYoB0q1pPmqxxRPYr4smJic1Rjcf7MXDBhZWgxlli0A==
   dependencies:
     bs-logger "0.x"
     buffer-from "1.x"

From d9d6176a75d86399b8b2111eb55d981069a6657c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 23 Jun 2020 18:10:53 +0000
Subject: [PATCH 67/71] chore(deps-dev): bump jest-junit from 10.0.0 to 11.0.1
 (#2939)

---
 package.json |  2 +-
 yarn.lock    | 60 +++++++---------------------------------------------
 2 files changed, 9 insertions(+), 53 deletions(-)

diff --git a/package.json b/package.json
index 5c09e04a14b..e5e310dc225 100644
--- a/package.json
+++ b/package.json
@@ -106,7 +106,7 @@
         "identity-obj-proxy": "^3.0.0",
         "jest": "^26.0.1",
         "jest-circus": "^26.0.1",
-        "jest-junit": "^10.0.0",
+        "jest-junit": "^11.0.1",
         "js-yaml": "^3.14.0",
         "license-check-and-add": "^3.0.4",
         "make-dir": "^3.1.0",
diff --git a/yarn.lock b/yarn.lock
index 25022278612..3c8c62ce7a5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -520,15 +520,6 @@
     source-map "^0.6.1"
     write-file-atomic "^3.0.0"
 
-"@jest/types@^24.9.0":
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.9.0.tgz#63cb26cb7500d069e5a389441a7c6ab5e909fc59"
-  integrity sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==
-  dependencies:
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^1.1.1"
-    "@types/yargs" "^13.0.0"
-
 "@jest/types@^25.5.0":
   version "25.5.0"
   resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.5.0.tgz#4d6a4793f7b9599fc3680877b856a97dbccf2a9d"
@@ -1299,13 +1290,6 @@
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-13.1.0.tgz#c563aa192f39350a1d18da36c5a8da382bbd8228"
   integrity sha512-gCubfBUZ6KxzoibJ+SCUc/57Ms1jz5NjHe4+dI2krNmU5zCPAphyLJYyTOg06ueIyfj+SaCUqmzun7ImlxDcKg==
 
-"@types/yargs@^13.0.0":
-  version "13.0.3"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.3.tgz#76482af3981d4412d65371a318f992d33464a380"
-  integrity sha512-K8/LfZq2duW33XW/tFwEAfnZlqIfVsoyRB3kfXdPXYhl0nfM8mmh7GS0jg7WrX2Dgq/0Ha/pR1PaR+BvmWwjiQ==
-  dependencies:
-    "@types/yargs-parser" "*"
-
 "@types/yargs@^15.0.0", "@types/yargs@^15.0.5":
   version "15.0.5"
   resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.5.tgz#947e9a6561483bdee9adffc983e91a6902af8b79"
@@ -1697,7 +1681,7 @@ ansi-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
   integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
 
-ansi-regex@^4.0.0, ansi-regex@^4.1.0:
+ansi-regex@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
   integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
@@ -1712,7 +1696,7 @@ ansi-styles@^2.2.1:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
   integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
 
-ansi-styles@^3.2.0, ansi-styles@^3.2.1:
+ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
   integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
@@ -6304,11 +6288,6 @@ jest-environment-node@^26.0.1:
     jest-mock "^26.0.1"
     jest-util "^26.0.1"
 
-jest-get-type@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.9.0.tgz#1684a0c8a50f2e4901b6644ae861f579eed2ef0e"
-  integrity sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==
-
 jest-get-type@^25.2.6:
   version "25.2.6"
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.6.tgz#0b0a32fab8908b44d508be81681487dbabb8d877"
@@ -6362,13 +6341,12 @@ jest-jasmine2@^26.0.1:
     pretty-format "^26.0.1"
     throat "^5.0.0"
 
-jest-junit@^10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/jest-junit/-/jest-junit-10.0.0.tgz#c94b91c24920a327c9d2a075e897b2dba4af494b"
-  integrity sha512-dbOVRyxHprdSpwSAR9/YshLwmnwf+RSl5hf0kCGlhAcEeZY9aRqo4oNmaT0tLC16Zy9D0zekDjWkjHGjXlglaQ==
+jest-junit@^11.0.1:
+  version "11.0.1"
+  resolved "https://registry.yarnpkg.com/jest-junit/-/jest-junit-11.0.1.tgz#944b997b7318efd1f021b4f0fce4937f8d66f392"
+  integrity sha512-stgc0mBoiSg/F9qWd4KkmR3K7Nk2u+M/dc1oup7gxz9mrzGcEaU2YL9/0QscVqqg3IOaA1P5ZXtozG/XR6j6nw==
   dependencies:
-    jest-validate "^24.9.0"
-    mkdirp "^0.5.1"
+    mkdirp "^1.0.4"
     strip-ansi "^5.2.0"
     uuid "^3.3.3"
     xml "^1.0.1"
@@ -6541,18 +6519,6 @@ jest-util@^26.0.1:
     is-ci "^2.0.0"
     make-dir "^3.0.0"
 
-jest-validate@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.9.0.tgz#0775c55360d173cd854e40180756d4ff52def8ab"
-  integrity sha512-HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ==
-  dependencies:
-    "@jest/types" "^24.9.0"
-    camelcase "^5.3.1"
-    chalk "^2.0.1"
-    jest-get-type "^24.9.0"
-    leven "^3.1.0"
-    pretty-format "^24.9.0"
-
 jest-validate@^26.0.1:
   version "26.0.1"
   resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.0.1.tgz#a62987e1da5b7f724130f904725e22f4e5b2e23c"
@@ -8589,16 +8555,6 @@ pretty-bytes@^1.0.2:
     get-stdin "^4.0.1"
     meow "^3.1.0"
 
-pretty-format@^24.9.0:
-  version "24.9.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.9.0.tgz#12fac31b37019a4eea3c11aa9a959eb7628aa7c9"
-  integrity sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==
-  dependencies:
-    "@jest/types" "^24.9.0"
-    ansi-regex "^4.0.0"
-    ansi-styles "^3.2.0"
-    react-is "^16.8.4"
-
 pretty-format@^25.2.1, pretty-format@^25.2.6:
   version "25.5.0"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz#7873c1d774f682c34b8d48b6743a2bf2ac55791a"
@@ -8956,7 +8912,7 @@ react-helmet@^6.1.0:
     react-fast-compare "^3.1.1"
     react-side-effect "^2.1.0"
 
-react-is@^16.12.0, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6, react-is@^16.9.0:
+react-is@^16.12.0, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.6, react-is@^16.9.0:
   version "16.12.0"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c"
   integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==

From bf0aadfdbc48727284898eb3004a24805eee95b9 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 23 Jun 2020 18:11:03 +0000
Subject: [PATCH 68/71] chore(deps): bump appium-adb from 8.6.1 to 8.6.2
 (#2940)

---
 package.json |  2 +-
 yarn.lock    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index e5e310dc225..e59d8a5cb04 100644
--- a/package.json
+++ b/package.json
@@ -139,7 +139,7 @@
     },
     "dependencies": {
         "accessibility-insights-for-android-service-bin": "^1.2.0",
-        "appium-adb": "^8.6.1",
+        "appium-adb": "^8.6.2",
         "applicationinsights-js": "^1.0.21",
         "axe-core": "3.5.1",
         "axios": "^0.19.2",
diff --git a/yarn.lock b/yarn.lock
index 3c8c62ce7a5..ed35ec18f1b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1765,16 +1765,16 @@ app-builder-lib@22.7.0, app-builder-lib@^22.6.1:
     semver "^7.3.2"
     temp-file "^3.3.7"
 
-appium-adb@^8.6.1:
-  version "8.6.1"
-  resolved "https://registry.yarnpkg.com/appium-adb/-/appium-adb-8.6.1.tgz#1cb41c2f98ce40fccdf84c23dc65cc34f18dc2b2"
-  integrity sha512-Klz6M05dA1xKfoUVURTCx6tfaIUl/IoLDekI/g06PBhUB5AcaxfmZirY+ZMcTcc8uGr0CN9pqIqI7GvhSMjxhg==
+appium-adb@^8.6.2:
+  version "8.6.2"
+  resolved "https://registry.yarnpkg.com/appium-adb/-/appium-adb-8.6.2.tgz#be0294f85cab517acf57465a794ff6010dfbef78"
+  integrity sha512-jAvyjAGtAb/XzUOZ/vQzKQhn17z2ooqHKfi8armU260jHSj4q/fuILkNoVC9r6sCwn8pzaX4FmikEMxqYOJiMg==
   dependencies:
     "@babel/runtime" "^7.0.0"
     adbkit-apkreader "^3.1.2"
     appium-support "^2.42.0"
     async-lock "^1.0.0"
-    asyncbox "^2.3.1"
+    asyncbox "^2.6.0"
     bluebird "^3.4.7"
     lodash "^4.0.0"
     lru-cache "^5.0.0"
@@ -2054,7 +2054,7 @@ async@~1.5.2:
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
   integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
 
-asyncbox@^2.3.1:
+asyncbox@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/asyncbox/-/asyncbox-2.6.0.tgz#ded2db43b14c4d14340d18d4898e5d63de2ffb42"
   integrity sha512-x9RDH0Dk4qZIGHQc9KbnDrUnaEbtWJW2DbuSElOFOQ2ppGsT1eFEDsiconZPpRGMW6+Uv724FYaBc8SUvyWVzA==

From fb8ae8326ef25500851d6c6dbec64ceb350b962b Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 23 Jun 2020 18:11:20 +0000
Subject: [PATCH 69/71] chore(deps-dev): bump simple-git from 2.8.0 to 2.9.0
 (#2941)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index e59d8a5cb04..21db5e23e1b 100644
--- a/package.json
+++ b/package.json
@@ -121,7 +121,7 @@
         "sass-loader": "^8.0.2",
         "script-loader": "0.7.2",
         "serve-static": "^1.13.2",
-        "simple-git": "^2.8.0",
+        "simple-git": "^2.9.0",
         "source-map-loader": "^1.0.0",
         "spectron": "^10.0.1",
         "terser-webpack-plugin": "^3.0.6",
diff --git a/yarn.lock b/yarn.lock
index ed35ec18f1b..2e1f40dd3c5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9797,10 +9797,10 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
   integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
 
-simple-git@^2.8.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-2.8.0.tgz#c8ebda4a16b57c9f774a62df62cb74cfd2c4f3d5"
-  integrity sha512-0iXwizUaanqdjn9IpboozWN2opA7jl1JZzeQEePyFXRUGOtwVuSgkMGXLnd7Toa7jqV+uZ1VnDZlCBxxSEk1Dw==
+simple-git@^2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-2.9.0.tgz#060f87e2d81235f01200d4596b3397a458d76fbe"
+  integrity sha512-rDnsMqvvk2pF7+ID8v7GtzdaXlCJfz1qFIuiQ8fcmCaqm7MITXoOx294ymSzMP0D7IC27kA5WLskkl4ZpauYNQ==
   dependencies:
     "@kwsites/file-exists" "^1.1.1"
     debug "^4.1.1"

From de5ef6af19dc85a4d15e9c7b5ffc0948f1352e67 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 23 Jun 2020 18:11:26 +0000
Subject: [PATCH 70/71] chore(deps-dev): bump @types/lodash from 4.14.155 to
 4.14.156 (#2942)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 21db5e23e1b..2bb57daaa43 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
         "@types/enzyme-adapter-react-16": "^1.0.6",
         "@types/jest": "^26.0.0",
         "@types/jsdom": "^16.2.3",
-        "@types/lodash": "^4.14.155",
+        "@types/lodash": "^4.14.156",
         "@types/make-dir": "^2.1.0",
         "@types/moment": "^2.13.0",
         "@types/puppeteer": "^3.0.0",
diff --git a/yarn.lock b/yarn.lock
index 2e1f40dd3c5..fa9fd697813 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1109,10 +1109,10 @@
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.5.tgz#dcce4430e64b443ba8945f0290fb564ad5bac6dd"
   integrity sha512-7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ==
 
-"@types/lodash@^4.14.155":
-  version "4.14.155"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.155.tgz#e2b4514f46a261fd11542e47519c20ebce7bc23a"
-  integrity sha512-vEcX7S7aPhsBCivxMwAANQburHBtfN9RdyXFk84IJmu2Z4Hkg1tOFgaslRiEqqvoLtbCBi6ika1EMspE+NZ9Lg==
+"@types/lodash@^4.14.156":
+  version "4.14.156"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.156.tgz#cbe30909c89a1feeb7c60803e785344ea0ec82d1"
+  integrity sha512-l2AgHXcKUwx2DsvP19wtRPqZ4NkONjmorOdq4sMcxIjqdIuuV/ULo2ftuv4NUpevwfW7Ju/UKLqo0ZXuEt/8lQ==
 
 "@types/make-dir@^2.1.0":
   version "2.1.0"

From 23db22fb357a9ce47557db9b2300418a696e549e Mon Sep 17 00:00:00 2001
From: Dan Bjorge <danielbj@microsoft.com>
Date: Tue, 23 Jun 2020 11:12:53 -0700
Subject: [PATCH 71/71] feat(android-setup): choose host port dynamically
 (#2933)

This PR uses the portfinder NPM package to have our service configurator dynamically choose a free host port to bind to, rather than unilaterally choosing the same port hardcoded into the service.
---
 package.json                                  |   1 +
 .../flux/store/android-setup-store.ts         |   1 +
 .../android-setup-state-machine-types.ts      |   1 +
 .../android/android-service-configurator.ts   |   4 +-
 .../appium-service-configurator-factory.ts    |   8 +-
 .../android/appium-service-configurator.ts    |  26 ++-
 .../android/setup/android-setup-deps.ts       |   3 +-
 .../android/setup/live-android-setup-deps.ts  |   8 +-
 .../steps/configuring-port-forwarding.ts      |  12 +-
 src/electron/views/renderer-initializer.ts    |   7 +-
 ...ppium-service-configurator-factory.test.ts |  23 ++-
 .../appium-service-configurator.test.ts       | 157 ++++++++++-----
 .../setup/live-android-setup-deps.test.ts     |  74 +++++--
 .../steps/configuring-port-forwarding.test.ts | 190 +++++++++++++-----
 yarn.lock                                     |  13 +-
 15 files changed, 388 insertions(+), 140 deletions(-)

diff --git a/package.json b/package.json
index 2bb57daaa43..f676e631c7f 100644
--- a/package.json
+++ b/package.json
@@ -151,6 +151,7 @@
         "lodash": "^4.17.15",
         "moment": "^2.27.0",
         "office-ui-fabric-react": "7.98.0",
+        "portfinder": "^1.0.26",
         "q": "1.5.1",
         "react": "^16.13.1",
         "react-copy-to-clipboard": "^5.0.2",
diff --git a/src/electron/flux/store/android-setup-store.ts b/src/electron/flux/store/android-setup-store.ts
index 4a076a74d1e..b7c2795d18b 100644
--- a/src/electron/flux/store/android-setup-store.ts
+++ b/src/electron/flux/store/android-setup-store.ts
@@ -28,6 +28,7 @@ export class AndroidSetupStore extends BaseStoreImpl<AndroidSetupStoreData> {
             stepTransition: this.stepTransition,
             setSelectedDevice: this.setSelectedDevice,
             setAvailableDevices: this.setAvailableDevices,
+            getScanPort: () => this.state.scanPort,
             setScanPort: this.setScanPort,
             setApplicationName: this.setApplicationName,
         });
diff --git a/src/electron/flux/types/android-setup-state-machine-types.ts b/src/electron/flux/types/android-setup-state-machine-types.ts
index b0df58a14fb..088fddaeada 100644
--- a/src/electron/flux/types/android-setup-state-machine-types.ts
+++ b/src/electron/flux/types/android-setup-state-machine-types.ts
@@ -14,6 +14,7 @@ export type AndroidSetupStoreCallbacks = {
     stepTransition: AndroidSetupStepTransitionCallback;
     setSelectedDevice: (device: DeviceInfo) => void;
     setAvailableDevices: (devices: DeviceInfo[]) => void;
+    getScanPort: () => number | null;
     setScanPort: (scanPort?: number) => void;
     setApplicationName: (appName?: string) => void;
 };
diff --git a/src/electron/platform/android/android-service-configurator.ts b/src/electron/platform/android/android-service-configurator.ts
index 4659cb2fef1..b3c9057b707 100644
--- a/src/electron/platform/android/android-service-configurator.ts
+++ b/src/electron/platform/android/android-service-configurator.ts
@@ -22,8 +22,8 @@ export interface AndroidServiceConfigurator {
     getPermissionInfo(deviceId: string): Promise<PermissionInfo>;
     installService(deviceId: string): Promise<void>;
     uninstallService(deviceId: string): Promise<void>;
-    setTcpForwarding(deviceId: string): Promise<number>;
-    removeTcpForwarding(deviceId: string): Promise<void>;
+    setupTcpForwarding(deviceId: string): Promise<number>;
+    removeTcpForwarding(deviceId: string, hostPort: number): Promise<void>;
 }
 
 export interface AndroidServiceConfiguratorFactory {
diff --git a/src/electron/platform/android/appium-service-configurator-factory.ts b/src/electron/platform/android/appium-service-configurator-factory.ts
index 383e9615085..84e7329c69a 100644
--- a/src/electron/platform/android/appium-service-configurator-factory.ts
+++ b/src/electron/platform/android/appium-service-configurator-factory.ts
@@ -11,12 +11,16 @@ import {
     AppiumAdbCreateParameters,
     AppiumAdbCreator,
 } from 'electron/platform/android/appium-adb-creator';
-import { AppiumServiceConfigurator } from 'electron/platform/android/appium-service-configurator';
+import {
+    AppiumServiceConfigurator,
+    PortFinder,
+} from 'electron/platform/android/appium-service-configurator';
 
 export class AppiumServiceConfiguratorFactory implements AndroidServiceConfiguratorFactory {
     public constructor(
         private readonly adbCreator: AppiumAdbCreator,
         private readonly apkLocator: AndroidServiceApkLocator,
+        private readonly portFinder: PortFinder,
     ) {}
 
     public getServiceConfigurator = async (
@@ -30,6 +34,6 @@ export class AppiumServiceConfiguratorFactory implements AndroidServiceConfigura
 
         const adb: ADB = await this.adbCreator.createADB(parameters);
 
-        return new AppiumServiceConfigurator(adb, this.apkLocator);
+        return new AppiumServiceConfigurator(adb, this.apkLocator, this.portFinder);
     };
 }
diff --git a/src/electron/platform/android/appium-service-configurator.ts b/src/electron/platform/android/appium-service-configurator.ts
index ef2c6dee1e1..0938975c78f 100644
--- a/src/electron/platform/android/appium-service-configurator.ts
+++ b/src/electron/platform/android/appium-service-configurator.ts
@@ -9,17 +9,24 @@ import {
     PackageInfo,
     PermissionInfo,
 } from 'electron/platform/android/android-service-configurator';
+import { PortFinderOptions } from 'portfinder';
 import { DictionaryStringTo } from 'types/common-types';
 
 type AdbDevice = {
     udid: string;
 };
 
+export type PortFinder = (options?: PortFinderOptions) => Promise<number>;
+
 const servicePackageName: string = 'com.microsoft.accessibilityinsightsforandroidservice';
+export const servicePortNumber: number = 62442; // hardcoded in service APK
 
-export const defaultAdbPortNumber: number = 62442;
 export class AppiumServiceConfigurator implements AndroidServiceConfigurator {
-    constructor(private readonly adb: ADB, private readonly apkLocator: AndroidServiceApkLocator) {}
+    constructor(
+        private readonly adb: ADB,
+        private readonly apkLocator: AndroidServiceApkLocator,
+        private readonly portFinder: PortFinder,
+    ) {}
 
     public getConnectedDevices = async (): Promise<Array<DeviceInfo>> => {
         const detectedDevices: DictionaryStringTo<DeviceInfo> = {};
@@ -82,14 +89,19 @@ export class AppiumServiceConfigurator implements AndroidServiceConfigurator {
         await this.adb.uninstallApk(servicePackageName);
     };
 
-    public setTcpForwarding = async (deviceId: string): Promise<number> => {
+    public setupTcpForwarding = async (deviceId: string): Promise<number> => {
+        const hostPort = await this.portFinder({
+            port: servicePortNumber,
+            stopPort: servicePortNumber + 100,
+        });
+
         this.adb.setDeviceId(deviceId);
-        await this.adb.forwardPort(defaultAdbPortNumber, defaultAdbPortNumber);
-        return defaultAdbPortNumber;
+        await this.adb.forwardPort(hostPort, servicePortNumber);
+        return hostPort;
     };
 
-    public removeTcpForwarding = async (deviceId: string): Promise<void> => {
+    public removeTcpForwarding = async (deviceId: string, hostPort: number): Promise<void> => {
         this.adb.setDeviceId(deviceId);
-        await this.adb.removePortForward(defaultAdbPortNumber);
+        await this.adb.removePortForward(hostPort);
     };
 }
diff --git a/src/electron/platform/android/setup/android-setup-deps.ts b/src/electron/platform/android/setup/android-setup-deps.ts
index dc105537238..3aef6082a09 100644
--- a/src/electron/platform/android/setup/android-setup-deps.ts
+++ b/src/electron/platform/android/setup/android-setup-deps.ts
@@ -12,7 +12,8 @@ export type AndroidSetupDeps = {
     hasExpectedServiceVersion: () => Promise<boolean>;
     installService: () => Promise<boolean>;
     hasExpectedPermissions: () => Promise<boolean>;
-    setTcpForwarding: () => Promise<number>;
+    setupTcpForwarding: () => Promise<number>;
+    removeTcpForwarding: (hostPort: number) => Promise<void>;
     getApplicationName: () => Promise<string>;
     logger: Logger;
 };
diff --git a/src/electron/platform/android/setup/live-android-setup-deps.ts b/src/electron/platform/android/setup/live-android-setup-deps.ts
index 2c05039ccc6..86b9c20ac2c 100644
--- a/src/electron/platform/android/setup/live-android-setup-deps.ts
+++ b/src/electron/platform/android/setup/live-android-setup-deps.ts
@@ -93,8 +93,12 @@ export class LiveAndroidSetupDeps implements AndroidSetupDeps {
         return false;
     };
 
-    public setTcpForwarding = async (): Promise<number> => {
-        return await this.serviceConfig.setTcpForwarding(this.selectedDeviceId);
+    public setupTcpForwarding = async (): Promise<number> => {
+        return await this.serviceConfig.setupTcpForwarding(this.selectedDeviceId);
+    };
+
+    public removeTcpForwarding = async (hostPort: number): Promise<void> => {
+        return await this.serviceConfig.removeTcpForwarding(this.selectedDeviceId, hostPort);
     };
 
     public getApplicationName = async (): Promise<string> => {
diff --git a/src/electron/platform/android/setup/steps/configuring-port-forwarding.ts b/src/electron/platform/android/setup/steps/configuring-port-forwarding.ts
index 904d143d713..f44bfd5d332 100644
--- a/src/electron/platform/android/setup/steps/configuring-port-forwarding.ts
+++ b/src/electron/platform/android/setup/steps/configuring-port-forwarding.ts
@@ -7,9 +7,15 @@ export const configuringPortForwarding: AndroidSetupStepConfig = deps => ({
     actions: {},
     onEnter: async () => {
         try {
-            deps.setScanPort(null);
-            deps.setApplicationName(null);
-            const hostPort = await deps.setTcpForwarding();
+            const existingPort = deps.getScanPort();
+            if (existingPort != null) {
+                deps.logger.log(`removing old tcp:${existingPort} forwarding`);
+                await deps.removeTcpForwarding(existingPort);
+                deps.setScanPort(null);
+                deps.setApplicationName(null);
+            }
+
+            const hostPort = await deps.setupTcpForwarding();
             deps.logger.log(`configured forwarding to tcp:${hostPort}`);
             const appName = await deps.getApplicationName();
 
diff --git a/src/electron/views/renderer-initializer.ts b/src/electron/views/renderer-initializer.ts
index 38356c0aa5b..1c4426cc60f 100644
--- a/src/electron/views/renderer-initializer.ts
+++ b/src/electron/views/renderer-initializer.ts
@@ -94,6 +94,7 @@ import { PlainTextFormatter } from 'issue-filing/common/markup/plain-text-format
 import { IssueFilingServiceProviderForUnifiedImpl } from 'issue-filing/issue-filing-service-provider-for-unified-impl';
 import { UnifiedResultToIssueFilingDataConverter } from 'issue-filing/unified-result-to-issue-filing-data';
 import { loadTheme, setFocusVisibility } from 'office-ui-fabric-react';
+import { getPortPromise } from 'portfinder';
 import * as ReactDOM from 'react-dom';
 import { ReportExportServiceProviderImpl } from 'report-export/report-export-service-provider-impl';
 import { getDefaultAddListenerForCollapsibleSection } from 'reports/components/report-sections/collapsible-script-provider';
@@ -204,7 +205,11 @@ getPersistedData(indexedDBInstance, indexedDBDataKeysToFetch).then(
             androidSetupActions,
             createAndroidSetupStateMachineFactory(
                 new LiveAndroidSetupDeps(
-                    new AppiumServiceConfiguratorFactory(new LiveAppiumAdbCreator(), apkLocator),
+                    new AppiumServiceConfiguratorFactory(
+                        new LiveAppiumAdbCreator(),
+                        apkLocator,
+                        getPortPromise,
+                    ),
                     userConfigurationStore,
                     apkLocator,
                     userConfigMessageCreator,
diff --git a/src/tests/unit/tests/electron/platform/android/appium-service-configurator-factory.test.ts b/src/tests/unit/tests/electron/platform/android/appium-service-configurator-factory.test.ts
index f050e77aabe..67995a6a1c3 100644
--- a/src/tests/unit/tests/electron/platform/android/appium-service-configurator-factory.test.ts
+++ b/src/tests/unit/tests/electron/platform/android/appium-service-configurator-factory.test.ts
@@ -3,17 +3,22 @@
 
 import { AndroidServiceApkLocator } from 'electron/platform/android/android-service-apk-locator';
 import { AppiumAdbCreator } from 'electron/platform/android/appium-adb-creator';
-import { AppiumServiceConfigurator } from 'electron/platform/android/appium-service-configurator';
+import {
+    AppiumServiceConfigurator,
+    PortFinder,
+} from 'electron/platform/android/appium-service-configurator';
 import { AppiumServiceConfiguratorFactory } from 'electron/platform/android/appium-service-configurator-factory';
 import { IMock, Mock, MockBehavior, Times } from 'typemoq';
 
 describe('AppiumServiceConfiguratorFactory tests', () => {
     let adbCreatorMock: IMock<AppiumAdbCreator>;
     let apkLocatorMock: IMock<AndroidServiceApkLocator>;
+    let portFinderMock: IMock<PortFinder>;
 
     beforeEach(() => {
         adbCreatorMock = Mock.ofType<AppiumAdbCreator>(undefined, MockBehavior.Strict);
         apkLocatorMock = Mock.ofType<AndroidServiceApkLocator>(undefined, MockBehavior.Strict);
+        portFinderMock = Mock.ofType<PortFinder>(undefined, MockBehavior.Strict);
     });
 
     it('getServiceConfigurator creates without parameters if no sdkRoot is provided', async () => {
@@ -24,14 +29,14 @@ describe('AppiumServiceConfiguratorFactory tests', () => {
         const factory = new AppiumServiceConfiguratorFactory(
             adbCreatorMock.object,
             apkLocatorMock.object,
+            portFinderMock.object,
         );
 
         expect(await factory.getServiceConfigurator(null)).toBeInstanceOf(
             AppiumServiceConfigurator,
         );
 
-        adbCreatorMock.verifyAll();
-        apkLocatorMock.verifyAll();
+        verifyAllMocks();
     });
 
     it('getServiceConfigurator creates with sdkRoot if it is provided', async () => {
@@ -43,14 +48,14 @@ describe('AppiumServiceConfiguratorFactory tests', () => {
         const factory = new AppiumServiceConfiguratorFactory(
             adbCreatorMock.object,
             apkLocatorMock.object,
+            portFinderMock.object,
         );
 
         expect(await factory.getServiceConfigurator(expectedSdkRoot)).toBeInstanceOf(
             AppiumServiceConfigurator,
         );
 
-        adbCreatorMock.verifyAll();
-        apkLocatorMock.verifyAll();
+        verifyAllMocks();
     });
 
     it('getServiceConfigurator propagates error to caller', async () => {
@@ -62,11 +67,17 @@ describe('AppiumServiceConfiguratorFactory tests', () => {
         const factory = new AppiumServiceConfiguratorFactory(
             adbCreatorMock.object,
             apkLocatorMock.object,
+            portFinderMock.object,
         );
 
         await expect(factory.getServiceConfigurator(null)).rejects.toThrowError(expectedMessage);
 
+        verifyAllMocks();
+    });
+
+    function verifyAllMocks(): void {
         adbCreatorMock.verifyAll();
         apkLocatorMock.verifyAll();
-    });
+        portFinderMock.verifyAll();
+    }
 });
diff --git a/src/tests/unit/tests/electron/platform/android/appium-service-configurator.test.ts b/src/tests/unit/tests/electron/platform/android/appium-service-configurator.test.ts
index 229f8fc6153..e3836630cb8 100644
--- a/src/tests/unit/tests/electron/platform/android/appium-service-configurator.test.ts
+++ b/src/tests/unit/tests/electron/platform/android/appium-service-configurator.test.ts
@@ -10,12 +10,16 @@ import {
     PackageInfo,
     PermissionInfo,
 } from 'electron/platform/android/android-service-configurator';
-import { AppiumServiceConfigurator } from 'electron/platform/android/appium-service-configurator';
-import { IMock, Mock, MockBehavior, Times } from 'typemoq';
+import {
+    AppiumServiceConfigurator,
+    PortFinder,
+} from 'electron/platform/android/appium-service-configurator';
+import { IMock, It, Mock, MockBehavior, Times } from 'typemoq';
 
 describe('AppiumServiceConfigurator tests', () => {
     let adbMock: IMock<ADB>;
     let apkLocatorMock: IMock<AndroidServiceApkLocator>;
+    let portFinderMock: IMock<PortFinder>;
     let testSubject: AppiumServiceConfigurator;
 
     const emulatorId: string = 'id1';
@@ -26,12 +30,19 @@ describe('AppiumServiceConfigurator tests', () => {
     const dumpsysAccessibilitySnippetWithServiceRunning: string =
         'Service[label=Accessibility Insights for';
     const expectedPathToApk: string = './some/path/package.apk';
-    const expectedPortNumber: number = 62442;
+    const expectedServicePortNumber: number = 62442;
+    const expectedHostPortRangeStart: number = 62442;
+    const expectedHostPortRangeStop: number = 62542;
 
     beforeEach(() => {
         adbMock = Mock.ofType<ADB>(undefined, MockBehavior.Strict);
         apkLocatorMock = Mock.ofType<AndroidServiceApkLocator>(undefined, MockBehavior.Strict);
-        testSubject = new AppiumServiceConfigurator(adbMock.object, apkLocatorMock.object);
+        portFinderMock = Mock.ofType<PortFinder>(undefined, MockBehavior.Strict);
+        testSubject = new AppiumServiceConfigurator(
+            adbMock.object,
+            apkLocatorMock.object,
+            portFinderMock.object,
+        );
     });
 
     it('getConnectedDevices, propagates error', async () => {
@@ -349,57 +360,111 @@ describe('AppiumServiceConfigurator tests', () => {
         apkLocatorMock.verifyAll();
     });
 
-    it('setTcpForwarding, propagates error', async () => {
-        const expectedMessage: string = 'Thrown duriung setTcpForwarding';
-        adbMock
-            .setup(m => m.setDeviceId(emulatorId))
-            .throws(new Error(expectedMessage))
-            .verifiable(Times.once());
-
-        await expect(testSubject.setTcpForwarding(emulatorId)).rejects.toThrowError(
-            expectedMessage,
-        );
-
-        adbMock.verifyAll();
-        apkLocatorMock.verifyAll();
+    describe('setupTcpForwarding', () => {
+        it('propagates error from portFinder', async () => {
+            const expectedMessage: string = 'Thrown from portFinder';
+            portFinderMock
+                .setup(m => m(It.isAny()))
+                .returns(() => Promise.reject(new Error(expectedMessage)))
+                .verifiable(Times.once());
+
+            await expect(testSubject.setupTcpForwarding(emulatorId)).rejects.toThrowError(
+                expectedMessage,
+            );
+
+            portFinderMock.verifyAll();
+            adbMock.verifyAll();
+            apkLocatorMock.verifyAll();
+        });
+
+        it('propagates error from ADB.forwardPort', async () => {
+            const portFinderOutput = 63000;
+            portFinderMock
+                .setup(m =>
+                    m({
+                        port: expectedHostPortRangeStart,
+                        stopPort: expectedHostPortRangeStop,
+                    }),
+                )
+                .returns(() => Promise.resolve(portFinderOutput))
+                .verifiable(Times.once());
+
+            adbMock.setup(m => m.setDeviceId(emulatorId)).verifiable(Times.once());
+
+            const expectedMessage: string = 'Thrown during forwardPort';
+            adbMock
+                .setup(m => m.forwardPort(portFinderOutput, expectedServicePortNumber))
+                .returns(() => Promise.reject(new Error(expectedMessage)))
+                .verifiable(Times.once());
+
+            await expect(testSubject.setupTcpForwarding(emulatorId)).rejects.toThrowError(
+                expectedMessage,
+            );
+
+            portFinderMock.verifyAll();
+            adbMock.verifyAll();
+            apkLocatorMock.verifyAll();
+        });
+
+        it('invokes ADB.forwardPort using the port from portFinder', async () => {
+            const portFinderOutput = 63000;
+            portFinderMock
+                .setup(m =>
+                    m({
+                        port: expectedHostPortRangeStart,
+                        stopPort: expectedHostPortRangeStop,
+                    }),
+                )
+                .returns(() => Promise.resolve(portFinderOutput))
+                .verifiable(Times.once());
+
+            adbMock.setup(m => m.setDeviceId(emulatorId)).verifiable(Times.once());
+            adbMock
+                .setup(m => m.forwardPort(portFinderOutput, expectedServicePortNumber))
+                .verifiable(Times.once());
+
+            const output = await testSubject.setupTcpForwarding(emulatorId);
+            expect(output).toBe(portFinderOutput);
+
+            portFinderMock.verifyAll();
+            adbMock.verifyAll();
+            apkLocatorMock.verifyAll();
+        });
     });
 
-    it('setTcpForwarding, succeeds', async () => {
-        adbMock.setup(m => m.setDeviceId(emulatorId)).verifiable(Times.once());
-        adbMock
-            .setup(m => m.forwardPort(expectedPortNumber, expectedPortNumber))
-            .verifiable(Times.once());
+    describe('removeTcpForwarding', () => {
+        it('calls ADB.removePortForward using hostPort', async () => {
+            const expectedHostPort = 123;
 
-        const output = await testSubject.setTcpForwarding(emulatorId);
-        expect(output).toBe(expectedPortNumber);
+            adbMock.setup(m => m.setDeviceId(emulatorId)).verifiable(Times.once());
+            adbMock
+                .setup(m => m.removePortForward(expectedHostPort))
+                .returns(() => Promise.resolve())
+                .verifiable(Times.once());
 
-        adbMock.verifyAll();
-        apkLocatorMock.verifyAll();
-    });
+            await testSubject.removeTcpForwarding(emulatorId, expectedHostPort);
 
-    it('removeTcpForwarding, propagates error', async () => {
-        const expectedMessage: string = 'Thrown during removeTcpForwarding';
-        adbMock
-            .setup(m => m.setDeviceId(emulatorId))
-            .throws(new Error(expectedMessage))
-            .verifiable(Times.once());
+            adbMock.verifyAll();
+            apkLocatorMock.verifyAll();
+        });
 
-        await expect(testSubject.removeTcpForwarding(emulatorId)).rejects.toThrowError(
-            expectedMessage,
-        );
+        it('propagates error from removePortForward', async () => {
+            const irrelevantHostPort = 123;
+            const expectedMessage: string = 'Thrown during removeTcpForwarding';
 
-        adbMock.verifyAll();
-        apkLocatorMock.verifyAll();
-    });
+            adbMock.setup(m => m.setDeviceId(emulatorId)).verifiable(Times.once());
+            adbMock
+                .setup(m => m.removePortForward(It.isAny()))
+                .returns(() => Promise.reject(new Error(expectedMessage)))
+                .verifiable(Times.once());
 
-    it('removeTcpForwarding, succeeds', async () => {
-        adbMock.setup(m => m.setDeviceId(emulatorId)).verifiable(Times.once());
-        adbMock.setup(m => m.removePortForward(expectedPortNumber)).verifiable(Times.once());
+            await expect(
+                testSubject.removeTcpForwarding(emulatorId, irrelevantHostPort),
+            ).rejects.toThrowError(expectedMessage);
 
-        await testSubject.removeTcpForwarding(emulatorId);
-
-        adbMock.verifyAll();
-        apkLocatorMock.verifyAll();
+            adbMock.verifyAll();
+            apkLocatorMock.verifyAll();
+        });
     });
     /*
     // For live testing, set ANDROID_HOME or ANDROID_SDK_ROOT to point
diff --git a/src/tests/unit/tests/electron/platform/android/setup/live-android-setup-deps.test.ts b/src/tests/unit/tests/electron/platform/android/setup/live-android-setup-deps.test.ts
index ba385ce91c7..73118604373 100644
--- a/src/tests/unit/tests/electron/platform/android/setup/live-android-setup-deps.test.ts
+++ b/src/tests/unit/tests/electron/platform/android/setup/live-android-setup-deps.test.ts
@@ -409,56 +409,90 @@ describe('LiveAndroidSetupDeps', () => {
         verifyAllMocks();
     });
 
-    it('setTcpForwarding propagates error from serviceConfig.setTcpForwarding', async () => {
+    it('setupTcpForwarding propagates error from serviceConfig.setupTcpForwarding', async () => {
         const deviceId = 'id1';
         const serviceConfigErrorMessage = 'error from serviceConfig';
         serviceConfigMock
-            .setup(m => m.setTcpForwarding(deviceId))
+            .setup(m => m.setupTcpForwarding(deviceId))
             .returns(() => Promise.reject(new Error(serviceConfigErrorMessage)))
             .verifiable(Times.once());
 
         await initializeServiceConfig();
 
         testSubject.setSelectedDeviceId(deviceId);
-        await expect(testSubject.setTcpForwarding()).rejects.toThrowError(
+        await expect(testSubject.setupTcpForwarding()).rejects.toThrowError(
             serviceConfigErrorMessage,
         );
 
         verifyAllMocks();
     });
 
-    it('getApplicationName returns app name when successful', async () => {
-        const config: DeviceConfig = {
-            appIdentifier: 'Wonderful App',
-        } as DeviceConfig;
+    it('setupTcpForwarding propagates output from serviceConfig.setupTcpForwarding', async () => {
+        const deviceId = 'id1';
+        const serviceConfigOutput = 63000;
+        serviceConfigMock
+            .setup(m => m.setupTcpForwarding(deviceId))
+            .returns(() => Promise.resolve(serviceConfigOutput))
+            .verifiable(Times.once());
+        await initializeServiceConfig();
 
-        const p = new Promise<DeviceConfig>(resolve => resolve(config));
+        testSubject.setSelectedDeviceId(deviceId);
+        const output = await testSubject.setupTcpForwarding();
 
-        fetchConfigMock
-            .setup(m => m(62442))
-            .returns(() => p)
-            .verifiable();
+        expect(output).toBe(serviceConfigOutput);
 
-        const appName = await testSubject.getApplicationName();
+        verifyAllMocks();
+    });
 
-        expect(appName).toEqual(config.appIdentifier);
+    it('removeTcpForwarding propagates error from serviceConfig.removeTcpForwarding', async () => {
+        const deviceId = 'id1';
+        const port = 2;
+        const serviceConfigErrorMessage = 'error from serviceConfig';
+        serviceConfigMock
+            .setup(m => m.removeTcpForwarding(deviceId, port))
+            .returns(() => Promise.reject(new Error(serviceConfigErrorMessage)))
+            .verifiable(Times.once());
+
+        await initializeServiceConfig();
+
+        testSubject.setSelectedDeviceId(deviceId);
+        await expect(testSubject.removeTcpForwarding(port)).rejects.toThrowError(
+            serviceConfigErrorMessage,
+        );
 
         verifyAllMocks();
     });
 
-    it('setTcpForwarding propagates output from serviceConfig.setTcpForwarding', async () => {
+    it('removeTcpForwarding propagates to serviceConfig.removeTcpForwarding', async () => {
         const deviceId = 'id1';
-        const serviceConfigOutput = 63000;
+        const port = 63000;
         serviceConfigMock
-            .setup(m => m.setTcpForwarding(deviceId))
-            .returns(() => Promise.resolve(serviceConfigOutput))
+            .setup(m => m.removeTcpForwarding(deviceId, port))
+            .returns(() => Promise.resolve())
             .verifiable(Times.once());
         await initializeServiceConfig();
 
         testSubject.setSelectedDeviceId(deviceId);
-        const output = await testSubject.setTcpForwarding();
+        await testSubject.removeTcpForwarding(port);
 
-        expect(output).toBe(serviceConfigOutput);
+        verifyAllMocks();
+    });
+
+    it('getApplicationName returns app name when successful', async () => {
+        const config: DeviceConfig = {
+            appIdentifier: 'Wonderful App',
+        } as DeviceConfig;
+
+        const p = new Promise<DeviceConfig>(resolve => resolve(config));
+
+        fetchConfigMock
+            .setup(m => m(62442))
+            .returns(() => p)
+            .verifiable();
+
+        const appName = await testSubject.getApplicationName();
+
+        expect(appName).toEqual(config.appIdentifier);
 
         verifyAllMocks();
     });
diff --git a/src/tests/unit/tests/electron/platform/android/setup/steps/configuring-port-forwarding.test.ts b/src/tests/unit/tests/electron/platform/android/setup/steps/configuring-port-forwarding.test.ts
index 0569ca3e5af..95454847fad 100644
--- a/src/tests/unit/tests/electron/platform/android/setup/steps/configuring-port-forwarding.test.ts
+++ b/src/tests/unit/tests/electron/platform/android/setup/steps/configuring-port-forwarding.test.ts
@@ -11,13 +11,6 @@ describe('Android setup step: configuringPortForwarding', () => {
         scanPort?: number;
     };
 
-    beforeEach(() => {
-        mockStoreState = {
-            appName: null,
-            scanPort: null,
-        };
-    });
-
     it('has expected properties', () => {
         const deps = {} as AndroidSetupStepConfigDeps;
         const step = configuringPortForwarding(deps);
@@ -26,13 +19,17 @@ describe('Android setup step: configuringPortForwarding', () => {
     });
 
     it('onEnter transitions to prompt-connected-start-testing with state set on success', async () => {
-        const scanPort = 63000;
-        const appName = 'my app name';
+        const scanPort = 2;
+        const appName = 'new app';
+        mockStoreState = {
+            appName: null,
+            scanPort: null,
+        };
 
         const depsMock = makeMockDepsForMockStore();
 
         depsMock
-            .setup(m => m.setTcpForwarding())
+            .setup(m => m.setupTcpForwarding())
             .returns(() => Promise.resolve(scanPort))
             .verifiable(Times.once());
 
@@ -51,46 +48,62 @@ describe('Android setup step: configuringPortForwarding', () => {
         depsMock.verifyAll();
     });
 
-    it('onEnter transitions to prompt-configuring-port-forwarding-failed with null state on setTcpForwarding failure', async () => {
+    it.each`
+        caseName                    | startingAppName | startingScanPort
+        ${'without previous state'} | ${null}         | ${null}
+        ${'with previous state'}    | ${'old app'}    | ${1}
+    `(
+        'onEnter clears previous forwarding, then transitions to prompt-connected-start-testing with state set on success',
+        async ({ startingAppName, startingScanPort }) => {
+            const newScanPort = 2;
+            const newAppName = 'new app';
+            mockStoreState = {
+                appName: startingAppName,
+                scanPort: startingScanPort,
+            };
+            const depsMock = makeMockDepsForMockStore();
+
+            depsMock
+                .setup(m => m.removeTcpForwarding(startingScanPort))
+                .returns(() => Promise.resolve())
+                .verifiable(startingScanPort === null ? Times.never() : Times.once());
+
+            depsMock
+                .setup(m => m.setupTcpForwarding())
+                .returns(() => Promise.resolve(newScanPort))
+                .verifiable(Times.once());
+
+            depsMock
+                .setup(m => m.getApplicationName())
+                .returns(_ => Promise.resolve(newAppName))
+                .verifiable(Times.once());
+
+            depsMock.setup(m => m.stepTransition('prompt-connected-start-testing'));
+
+            const step = configuringPortForwarding(depsMock.object);
+            await step.onEnter();
+
+            expect(mockStoreState.appName).toBe(newAppName);
+            expect(mockStoreState.scanPort).toBe(newScanPort);
+            depsMock.verifyAll();
+        },
+    );
+
+    it('onEnter (with previous state) transitions to prompt-configuring-port-forwarding-failed with old state on removeTcpForwarding failure', async () => {
+        const startingAppName = 'old app';
+        const startingScanPort = 1;
         mockStoreState = {
-            appName: 'old name which should get cleared on failure',
-            scanPort: 1,
+            appName: 'old app',
+            scanPort: startingScanPort,
         };
         const depsMock = makeMockDepsForMockStore();
 
         depsMock
-            .setup(m => m.setTcpForwarding())
-            .returns(() => Promise.reject(new Error('test error')))
+            .setup(m => m.removeTcpForwarding(startingScanPort))
+            .returns(() => Promise.reject(new Error('error from removeTcpForwarding')))
             .verifiable(Times.once());
 
-        depsMock
-            .setup(m => m.stepTransition('prompt-configuring-port-forwarding-failed'))
-            .verifiable(Times.once());
-
-        const step = configuringPortForwarding(depsMock.object);
-        await step.onEnter();
-
-        expect(mockStoreState.appName).toBeNull();
-        expect(mockStoreState.scanPort).toBeNull();
-        depsMock.verifyAll();
-    });
-
-    it('onEnter transitions to prompt-configuring-port-forwarding-failed with null state on getApplicationName failure', async () => {
-        mockStoreState = {
-            appName: 'old name which should get cleared on failure',
-            scanPort: 1,
-        };
-        const depsMock = makeMockDepsForMockStore();
-
-        depsMock
-            .setup(m => m.setTcpForwarding())
-            .returns(() => Promise.resolve(2))
-            .verifiable(Times.once());
-
-        depsMock
-            .setup(m => m.getApplicationName())
-            .returns(() => Promise.reject(new Error('error from getApplicationName')))
-            .verifiable(Times.once());
+        depsMock.setup(m => m.setupTcpForwarding()).verifiable(Times.never());
 
         depsMock
             .setup(m => m.stepTransition('prompt-configuring-port-forwarding-failed'))
@@ -99,11 +112,88 @@ describe('Android setup step: configuringPortForwarding', () => {
         const step = configuringPortForwarding(depsMock.object);
         await step.onEnter();
 
-        expect(mockStoreState.appName).toBeNull(); // not 2
-        expect(mockStoreState.scanPort).toBeNull();
+        expect(mockStoreState.appName).toBe(startingAppName);
+        expect(mockStoreState.scanPort).toBe(startingScanPort);
         depsMock.verifyAll();
     });
 
+    it.each`
+        caseName                    | startingAppName | startingScanPort
+        ${'without previous state'} | ${null}         | ${null}
+        ${'with previous state'}    | ${'old app'}    | ${1}
+    `(
+        'onEnter ($caseName) transitions to prompt-configuring-port-forwarding-failed with null state on setupTcpForwarding failure',
+        async ({ startingAppName, startingScanPort }) => {
+            mockStoreState = {
+                appName: startingAppName,
+                scanPort: startingScanPort,
+            };
+            const depsMock = makeMockDepsForMockStore();
+
+            depsMock
+                .setup(m => m.removeTcpForwarding(startingScanPort))
+                .returns(() => Promise.resolve())
+                .verifiable(startingScanPort === null ? Times.never() : Times.once());
+
+            depsMock
+                .setup(m => m.setupTcpForwarding())
+                .returns(() => Promise.reject(new Error('test error')))
+                .verifiable(Times.once());
+
+            depsMock
+                .setup(m => m.stepTransition('prompt-configuring-port-forwarding-failed'))
+                .verifiable(Times.once());
+
+            const step = configuringPortForwarding(depsMock.object);
+            await step.onEnter();
+
+            expect(mockStoreState.appName).toBeNull();
+            expect(mockStoreState.scanPort).toBeNull();
+            depsMock.verifyAll();
+        },
+    );
+
+    it.each`
+        caseName                    | startingAppName | startingScanPort
+        ${'without previous state'} | ${null}         | ${null}
+        ${'with previous state'}    | ${'old app'}    | ${1}
+    `(
+        'onEnter ($caseName) transitions to prompt-configuring-port-forwarding-failed with null state on getApplicationName failure',
+        async ({ startingAppName, startingScanPort }) => {
+            mockStoreState = {
+                appName: startingAppName,
+                scanPort: startingScanPort,
+            };
+            const depsMock = makeMockDepsForMockStore();
+
+            depsMock
+                .setup(m => m.removeTcpForwarding(startingScanPort))
+                .returns(() => Promise.resolve())
+                .verifiable(startingScanPort === null ? Times.never() : Times.once());
+
+            depsMock
+                .setup(m => m.setupTcpForwarding())
+                .returns(() => Promise.resolve(2))
+                .verifiable(Times.once());
+
+            depsMock
+                .setup(m => m.getApplicationName())
+                .returns(() => Promise.reject(new Error('error from getApplicationName')))
+                .verifiable(Times.once());
+
+            depsMock
+                .setup(m => m.stepTransition('prompt-configuring-port-forwarding-failed'))
+                .verifiable(Times.once());
+
+            const step = configuringPortForwarding(depsMock.object);
+            await step.onEnter();
+
+            expect(mockStoreState.appName).toBeNull(); // not 2
+            expect(mockStoreState.scanPort).toBeNull();
+            depsMock.verifyAll();
+        },
+    );
+
     function makeMockDepsForMockStore(): IMock<AndroidSetupStepConfigDeps> {
         const depsMock = Mock.ofType<AndroidSetupStepConfigDeps>(undefined, MockBehavior.Strict);
 
@@ -122,7 +212,12 @@ describe('Android setup step: configuringPortForwarding', () => {
                 mockStoreState.scanPort = newPort;
             })
             // We don't care how many times this is invoked, we only care about the final mockStoreState
-            .verifiable(Times.atLeastOnce());
+            .verifiable(Times.atLeast(0));
+
+        depsMock
+            .setup(m => m.getScanPort())
+            .returns(() => mockStoreState.scanPort)
+            .verifiable(Times.atLeast(0));
 
         depsMock
             .setup(m => m.setApplicationName(It.isAny()))
@@ -130,8 +225,7 @@ describe('Android setup step: configuringPortForwarding', () => {
                 mockStoreState.appName = newName;
             })
             // We don't care how many times this is invoked, we only care about the final mockStoreState
-
-            .verifiable(Times.atLeastOnce());
+            .verifiable(Times.atLeast(0));
 
         return depsMock;
     }
diff --git a/yarn.lock b/yarn.lock
index fa9fd697813..af67025fec9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2037,7 +2037,7 @@ async@0.9.x:
   resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
   integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=
 
-async@^2.0.0, async@^2.6.0, async@^2.6.1, async@^2.6.3:
+async@^2.0.0, async@^2.6.0, async@^2.6.1, async@^2.6.2, async@^2.6.3:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
   integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
@@ -3484,7 +3484,7 @@ debug@=3.1.0:
   dependencies:
     ms "2.0.0"
 
-debug@^3.0.0, debug@^3.1.0, debug@^3.2.6:
+debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.6:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@@ -8405,6 +8405,15 @@ pngjs@^5.0.0:
   resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-5.0.0.tgz#e79dd2b215767fd9c04561c01236df960bce7fbb"
   integrity sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==
 
+portfinder@^1.0.26:
+  version "1.0.26"
+  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.26.tgz#475658d56ca30bed72ac7f1378ed350bd1b64e70"
+  integrity sha512-Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ==
+  dependencies:
+    async "^2.6.2"
+    debug "^3.1.1"
+    mkdirp "^0.5.1"
+
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"