From 190020753bc0333fb85686a3f6f5d3839b4fda77 Mon Sep 17 00:00:00 2001
From: uttiya10 <56562649+uttiya10@users.noreply.github.com>
Date: Wed, 12 Jan 2022 15:57:55 -0500
Subject: [PATCH 01/88] Added Context Menu Handlers For ToolBar Button and
 Dropdown

---
 app/src/ui/lib/button.tsx       | 21 ++++++++++++++++++++-
 app/src/ui/toolbar/button.tsx   | 14 ++++++++++++++
 app/src/ui/toolbar/dropdown.tsx | 16 +++++++++++++++-
 3 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/app/src/ui/lib/button.tsx b/app/src/ui/lib/button.tsx
index 4e7f21409f..0cb7b53f16 100644
--- a/app/src/ui/lib/button.tsx
+++ b/app/src/ui/lib/button.tsx
@@ -8,10 +8,18 @@ export interface IButtonProps {
    * A callback which is invoked when the button is clicked
    * using a pointer device or keyboard. The source event is
    * passed along and can be used to prevent the default action
-   * or stop the even from bubbling.
+   * or stop the event from bubbling.
    */
   readonly onClick?: (event: React.MouseEvent<HTMLButtonElement>) => void
 
+  /**
+   * A callback which is invoked when the button's context menu
+   * is activated using a pointer device or keyboard. The source 
+   * event is passed along and can be used to prevent the default
+   * action or stop the event from bubbling.
+   */
+  readonly onContextMenu?: (event: React.MouseEvent<HTMLButtonElement>) => void
+
   /**
    * A function that's called when the user moves over the button with
    * a pointer device.
@@ -118,6 +126,7 @@ export class Button extends React.Component<IButtonProps, {}> {
       <button
         className={className}
         onClick={disabled ? preventDefault : this.onClick}
+        onContextMenu={disabled ? preventDefault : this.onContextMenu}
         type={this.props.type || 'button'}
         ref={this.innerButtonRef}
         tabIndex={this.props.tabIndex}
@@ -151,6 +160,16 @@ export class Button extends React.Component<IButtonProps, {}> {
       event.preventDefault()
     }
   }
+
+  private onContextMenu = (event: React.MouseEvent<HTMLButtonElement>) => {
+    if (this.props.onContextMenu) {
+      this.props.onContextMenu(event)
+    }
+
+    if (this.props.type === undefined) {
+      event.preventDefault()
+    }
+  }
 }
 
 const preventDefault = (e: Event | React.SyntheticEvent) => e.preventDefault()
diff --git a/app/src/ui/toolbar/button.tsx b/app/src/ui/toolbar/button.tsx
index d6ee1189e5..ceb10dcdfd 100644
--- a/app/src/ui/toolbar/button.tsx
+++ b/app/src/ui/toolbar/button.tsx
@@ -38,6 +38,13 @@ export interface IToolbarButtonProps {
    */
   readonly onClick?: (event: React.MouseEvent<HTMLButtonElement>) => void
 
+  /**
+   * An optional event handler for when the button's context menu
+   * is activated by a pointer event or by hitting the menu key 
+   * while focused.
+   */
+  readonly onContextMenu?: (event: React.MouseEvent<HTMLButtonElement>) => void
+
   /**
    * A function that's called when the user hovers over the button with
    * a pointer device.
@@ -137,6 +144,12 @@ export class ToolbarButton extends React.Component<IToolbarButtonProps, {}> {
     }
   }
 
+  private onContextMenu = (event: React.MouseEvent<HTMLButtonElement>) => {
+    if (this.props.onContextMenu) {
+      this.props.onContextMenu(event)
+    }
+  }
+
   private onButtonRef = (ref: Button | null) => {
     this.innerButton = ref
   }
@@ -206,6 +219,7 @@ export class ToolbarButton extends React.Component<IToolbarButtonProps, {}> {
         )}
         <Button
           onClick={this.onClick}
+          onContextMenu={this.onContextMenu}
           ref={this.onButtonRef}
           disabled={this.props.disabled}
           onMouseEnter={this.props.onMouseEnter}
diff --git a/app/src/ui/toolbar/dropdown.tsx b/app/src/ui/toolbar/dropdown.tsx
index c95b8392f3..8654f08c7e 100644
--- a/app/src/ui/toolbar/dropdown.tsx
+++ b/app/src/ui/toolbar/dropdown.tsx
@@ -65,6 +65,13 @@ export interface IToolbarDropdownProps {
    */
   readonly dropdownContentRenderer: () => JSX.Element | null
 
+  /**
+   * A callback which is invoked when the button's context menu 
+   * is activated. The source event is passed along and can be
+   * used to prevent the default action or stop the event from bubbling.
+   */
+  readonly onContextMenu?: (event: React.MouseEvent<HTMLButtonElement>) => void
+
   /**
    * A function that's called whenever something is dragged over the
    * dropdown.
@@ -175,7 +182,7 @@ interface IToolbarDropdownState {
 export class ToolbarDropdown extends React.Component<
   IToolbarDropdownProps,
   IToolbarDropdownState
-> {
+  > {
   private innerButton: ToolbarButton | null = null
   private focusTrapOptions: FocusTrapOptions
 
@@ -238,6 +245,12 @@ export class ToolbarDropdown extends React.Component<
     this.props.onDropdownStateChanged(newState, source)
   }
 
+  private onContextMenu = (event: React.MouseEvent<HTMLButtonElement>) => {
+    if (this.props.onContextMenu) {
+      this.props.onContextMenu(event)
+    }
+  }
+
   private updateClientRectIfNecessary() {
     if (this.props.dropdownState === 'open' && this.innerButton) {
       const newRect = this.innerButton.getButtonBoundingClientRect()
@@ -380,6 +393,7 @@ export class ToolbarDropdown extends React.Component<
           description={this.props.description}
           tooltip={this.props.tooltip}
           onClick={this.onClick}
+          onContextMenu={this.onContextMenu}
           onMouseEnter={this.props.onMouseEnter}
           style={this.props.style}
           iconClassName={this.props.iconClassName}

From ffa206542b94b72f8a0e743747f783ba7c5ac092 Mon Sep 17 00:00:00 2001
From: uttiya10 <56562649+uttiya10@users.noreply.github.com>
Date: Wed, 12 Jan 2022 17:08:22 -0500
Subject: [PATCH 02/88] Added Context Menu to Current Branch Dropdown Button

---
 .../branch-list-item-context-menu.tsx         | 35 ++++++++
 app/src/ui/branches/branch-list-item.tsx      | 34 ++------
 app/src/ui/branches/branches-container.tsx    | 56 ++-----------
 app/src/ui/toolbar/branch-dropdown.tsx        | 79 ++++++++++++++++++-
 4 files changed, 126 insertions(+), 78 deletions(-)
 create mode 100644 app/src/ui/branches/branch-list-item-context-menu.tsx

diff --git a/app/src/ui/branches/branch-list-item-context-menu.tsx b/app/src/ui/branches/branch-list-item-context-menu.tsx
new file mode 100644
index 0000000000..acc5c0db96
--- /dev/null
+++ b/app/src/ui/branches/branch-list-item-context-menu.tsx
@@ -0,0 +1,35 @@
+import { IMenuItem } from '../../lib/menu-item'
+import { clipboard } from 'electron'
+
+export function createBranchContextMenuItems(
+  name: string,
+  isLocal: boolean,
+  onRenameBranch?: (branchName: string) => void,
+  onDeleteBranch?: (branchName: string) => void
+): IMenuItem[] {
+  const items: Array<IMenuItem> = []
+
+  if (onRenameBranch !== undefined) {
+    items.push({
+      label: 'Rename…',
+      action: () => onRenameBranch(name),
+      enabled: isLocal,
+    })
+  }
+
+  items.push({
+    label: __DARWIN__ ? 'Copy Branch Name' : 'Copy branch name',
+    action: () => clipboard.writeText(name),
+  })
+
+  items.push({ type: 'separator' })
+
+  if (onDeleteBranch !== undefined) {
+    items.push({
+      label: 'Delete…',
+      action: () => onDeleteBranch(name),
+    })
+  }
+
+  return items
+}
diff --git a/app/src/ui/branches/branch-list-item.tsx b/app/src/ui/branches/branch-list-item.tsx
index 81ceba6645..8091a8d2f2 100644
--- a/app/src/ui/branches/branch-list-item.tsx
+++ b/app/src/ui/branches/branch-list-item.tsx
@@ -1,4 +1,3 @@
-import { clipboard } from 'electron'
 import * as React from 'react'
 
 import { IMatches } from '../../lib/fuzzy-find'
@@ -7,12 +6,12 @@ import { Octicon } from '../octicons'
 import * as OcticonSymbol from '../octicons/octicons.generated'
 import { HighlightText } from '../lib/highlight-text'
 import { showContextualMenu } from '../main-process-proxy'
-import { IMenuItem } from '../../lib/menu-item'
 import { dragAndDropManager } from '../../lib/drag-and-drop-manager'
 import { DragType, DropTargetType } from '../../models/drag-drop'
 import { TooltippedContent } from '../lib/tooltipped-content'
 import { RelativeTime } from '../relative-time'
 import classNames from 'classnames'
+import { createBranchContextMenuItems } from './branch-list-item-context-menu'
 
 interface IBranchListItemProps {
   /** The name of the branch */
@@ -54,7 +53,7 @@ interface IBranchListItemState {
 export class BranchListItem extends React.Component<
   IBranchListItemProps,
   IBranchListItemState
-> {
+  > {
   public constructor(props: IBranchListItemProps) {
     super(props)
     this.state = { isDragInProgress: false }
@@ -74,29 +73,12 @@ export class BranchListItem extends React.Component<
       return
     }
 
-    const items: Array<IMenuItem> = []
-
-    if (onRenameBranch !== undefined) {
-      items.push({
-        label: 'Rename…',
-        action: () => onRenameBranch(name),
-        enabled: isLocal,
-      })
-    }
-
-    items.push({
-      label: __DARWIN__ ? 'Copy Branch Name' : 'Copy branch name',
-      action: () => clipboard.writeText(name),
-    })
-
-    items.push({ type: 'separator' })
-
-    if (onDeleteBranch !== undefined) {
-      items.push({
-        label: 'Delete…',
-        action: () => onDeleteBranch(name),
-      })
-    }
+    const items = createBranchContextMenuItems(
+      name,
+      isLocal,
+      onRenameBranch,
+      onDeleteBranch
+    )
 
     showContextualMenu(items)
   }
diff --git a/app/src/ui/branches/branches-container.tsx b/app/src/ui/branches/branches-container.tsx
index 0b6215c3eb..1e42d5e812 100644
--- a/app/src/ui/branches/branches-container.tsx
+++ b/app/src/ui/branches/branches-container.tsx
@@ -5,7 +5,7 @@ import {
   Repository,
   isRepositoryWithGitHubRepository,
 } from '../../models/repository'
-import { Branch, BranchType } from '../../models/branch'
+import { Branch } from '../../models/branch'
 import { BranchesTab } from '../../models/branches-tab'
 import { PopupType } from '../../models/popup'
 
@@ -40,6 +40,8 @@ interface IBranchesContainerProps {
   readonly currentBranch: Branch | null
   readonly recentBranches: ReadonlyArray<Branch>
   readonly pullRequests: ReadonlyArray<PullRequest>
+  readonly onRenameBranch: (branchName: string) => void
+  readonly onDeleteBranch: (branchName: string) => void
 
   /** The pull request associated with the current branch. */
   readonly currentPullRequest: PullRequest | null
@@ -71,7 +73,7 @@ interface IBranchesContainerState {
 export class BranchesContainer extends React.Component<
   IBranchesContainerProps,
   IBranchesContainerState
-> {
+  > {
   public static getDerivedStateFromProps(
     props: IBranchesContainerProps,
     state: IBranchesContainerProps
@@ -204,8 +206,8 @@ export class BranchesContainer extends React.Component<
       item,
       matches,
       this.props.currentBranch,
-      this.onRenameBranch,
-      this.onDeleteBranch,
+      this.props.onRenameBranch,
+      this.props.onDeleteBranch,
       this.onDropOntoBranch,
       this.onDropOntoCurrentBranch
     )
@@ -401,52 +403,6 @@ export class BranchesContainer extends React.Component<
     this.setState({ selectedPullRequest })
   }
 
-  private getBranchWithName(branchName: string): Branch | undefined {
-    return this.props.allBranches.find(branch => branch.name === branchName)
-  }
-
-  private onRenameBranch = (branchName: string) => {
-    const branch = this.getBranchWithName(branchName)
-
-    if (branch === undefined) {
-      return
-    }
-
-    this.props.dispatcher.showPopup({
-      type: PopupType.RenameBranch,
-      repository: this.props.repository,
-      branch: branch,
-    })
-  }
-
-  private onDeleteBranch = async (branchName: string) => {
-    const branch = this.getBranchWithName(branchName)
-
-    if (branch === undefined) {
-      return
-    }
-
-    if (branch.type === BranchType.Remote) {
-      this.props.dispatcher.showPopup({
-        type: PopupType.DeleteRemoteBranch,
-        repository: this.props.repository,
-        branch,
-      })
-      return
-    }
-
-    const aheadBehind = await this.props.dispatcher.getBranchAheadBehind(
-      this.props.repository,
-      branch
-    )
-    this.props.dispatcher.showPopup({
-      type: PopupType.DeleteBranch,
-      repository: this.props.repository,
-      branch,
-      existsOnRemote: aheadBehind !== null,
-    })
-  }
-
   /**
    * Method is to handle when something is dragged and dropped onto a branch
    * in the branch dropdown.
diff --git a/app/src/ui/toolbar/branch-dropdown.tsx b/app/src/ui/toolbar/branch-dropdown.tsx
index e8c721987a..9f87111593 100644
--- a/app/src/ui/toolbar/branch-dropdown.tsx
+++ b/app/src/ui/toolbar/branch-dropdown.tsx
@@ -19,6 +19,10 @@ import { dragAndDropManager } from '../../lib/drag-and-drop-manager'
 import { DragType } from '../../models/drag-drop'
 import { CICheckRunPopover } from '../check-runs/ci-check-run-popover'
 import { TooltipTarget } from '../lib/tooltip'
+import { BranchType, Branch } from '../../models/branch'
+import { PopupType } from '../../models/popup'
+import { createBranchContextMenuItems } from '../branches/branch-list-item-context-menu'
+import { showContextualMenu } from '../main-process-proxy'
 
 interface IBranchDropdownProps {
   readonly dispatcher: Dispatcher
@@ -70,7 +74,7 @@ interface IBranchDropdownState {
 export class BranchDropdown extends React.Component<
   IBranchDropdownProps,
   IBranchDropdownState
-> {
+  > {
   public constructor(props: IBranchDropdownProps) {
     super(props)
     this.state = {
@@ -84,7 +88,6 @@ export class BranchDropdown extends React.Component<
 
     const tip = repositoryState.branchesState.tip
     const currentBranch = tip.kind === TipState.Valid ? tip.branch : null
-
     return (
       <BranchesContainer
         allBranches={branchesState.allBranches}
@@ -98,6 +101,8 @@ export class BranchDropdown extends React.Component<
         currentPullRequest={this.props.currentPullRequest}
         isLoadingPullRequests={this.props.isLoadingPullRequests}
         emoji={this.props.emoji}
+        onDeleteBranch={this.onDeleteBranch}
+        onRenameBranch={this.onRenameBranch}
       />
     )
   }
@@ -190,6 +195,7 @@ export class BranchDropdown extends React.Component<
           iconClassName={iconClassName}
           title={title}
           description={description}
+          onContextMenu={this.createContextMenuItems}
           tooltip={isOpen ? undefined : tooltip}
           onDropdownStateChanged={this.onDropDownStateChanged}
           dropdownContentRenderer={this.renderBranchFoldout}
@@ -222,6 +228,75 @@ export class BranchDropdown extends React.Component<
     }
   }
 
+  private createContextMenuItems = (event: React.MouseEvent<HTMLButtonElement>): void => {
+    event.preventDefault()
+
+    const repositoryState = this.props.repositoryState
+    const tip = repositoryState.branchesState.tip
+    const currentBranch = tip.kind === TipState.Valid ? tip.branch : null
+
+    if (currentBranch === null) {
+      return
+    }
+
+    const isLocal = currentBranch.type === BranchType.Local
+
+    const items = createBranchContextMenuItems(
+      currentBranch.name,
+      isLocal,
+      this.onRenameBranch,
+      this.onDeleteBranch
+    )
+
+    showContextualMenu(items)
+  }
+
+  private getBranchWithName(branchName: string): Branch | undefined {
+    return this.props.repositoryState.branchesState.allBranches.find(branch => branch.name === branchName)
+  }
+
+  private onRenameBranch = (branchName: string) => {
+    const branch = this.getBranchWithName(branchName)
+
+    if (branch === undefined) {
+      return
+    }
+
+    this.props.dispatcher.showPopup({
+      type: PopupType.RenameBranch,
+      repository: this.props.repository,
+      branch: branch,
+    })
+  }
+
+  private onDeleteBranch = async (branchName: string) => {
+    const branch = this.getBranchWithName(branchName)
+
+    if (branch === undefined) {
+      return
+    }
+
+    if (branch.type === BranchType.Remote) {
+      this.props.dispatcher.showPopup({
+        type: PopupType.DeleteRemoteBranch,
+        repository: this.props.repository,
+        branch,
+      })
+      return
+    }
+
+    const aheadBehind = await this.props.dispatcher.getBranchAheadBehind(
+      this.props.repository,
+      branch
+    )
+    this.props.dispatcher.showPopup({
+      type: PopupType.DeleteBranch,
+      repository: this.props.repository,
+      branch,
+      existsOnRemote: aheadBehind !== null,
+    })
+  }
+
   private onBadgeClick = () => {
     this.togglePopover()
   }

From d4fe4e806fb61637f8e261ada1ae7a5430a61e76 Mon Sep 17 00:00:00 2001
From: uttiya10 <56562649+uttiya10@users.noreply.github.com>
Date: Thu, 13 Jan 2022 18:42:33 -0500
Subject: [PATCH 03/88] Added Context Menu to Current Repository Dropdown
 Button

---
 app/src/ui/app.tsx                            |  49 ++++++-
 .../repository-list-item-context-menu.ts      | 112 ++++++++++++++++
 .../repository-list-item.tsx                  | 126 +++---------------
 3 files changed, 175 insertions(+), 112 deletions(-)
 create mode 100644 app/src/ui/repositories-list/repository-list-item-context-menu.ts

diff --git a/app/src/ui/app.tsx b/app/src/ui/app.tsx
index cb8556033c..0fa29de7c3 100644
--- a/app/src/ui/app.tsx
+++ b/app/src/ui/app.tsx
@@ -55,7 +55,11 @@ import {
 } from './toolbar'
 import { iconForRepository, OcticonSymbolType } from './octicons'
 import * as OcticonSymbol from './octicons/octicons.generated'
-import { showCertificateTrustDialog, sendReady } from './main-process-proxy'
+import {
+  showCertificateTrustDialog,
+  sendReady,
+  showContextualMenu,
+} from './main-process-proxy'
 import { DiscardChanges } from './discard-changes'
 import { Welcome } from './welcome'
 import { AppMenuBar } from './app-menu'
@@ -146,6 +150,7 @@ import { PullRequestChecksFailed } from './notifications/pull-request-checks-fai
 import { CICheckRunRerunDialog } from './check-runs/ci-check-run-rerun-dialog'
 import { WarnForcePushDialog } from './multi-commit-operation/dialog/warn-force-push-dialog'
 import { clamp } from '../lib/clamp'
+import { generateRepositoryListContextMenu } from './repositories-list/repository-list-item-context-menu'
 
 const MinuteInMilliseconds = 1000 * 60
 const HourInMilliseconds = MinuteInMilliseconds * 60
@@ -2441,6 +2446,7 @@ export class App extends React.Component<IAppProps, IAppState> {
         description={__DARWIN__ ? 'Current Repository' : 'Current repository'}
         tooltip={tooltip}
         foldoutStyle={foldoutStyle}
+        onContextMenu={this.onContextMenu}
         onDropdownStateChanged={this.onRepositoryDropdownStateChanged}
         dropdownContentRenderer={this.renderRepositoryList}
         dropdownState={currentState}
@@ -2448,6 +2454,47 @@ export class App extends React.Component<IAppProps, IAppState> {
     )
   }
 
+  private onContextMenu = () => {
+    const selection = this.state.selectedState
+
+    const repository = selection ? selection.repository : null
+    if (!repository) {
+      return
+    }
+
+    const externalEditorLabel = this.state.selectedExternalEditor
+      ? this.state.selectedExternalEditor
+      : undefined
+
+    const onChangeRepositoryAlias = (repository: Repository) => {
+      this.props.dispatcher.showPopup({
+        type: PopupType.ChangeRepositoryAlias,
+        repository,
+      })
+    }
+
+    const onRemoveRepositoryAlias = (repository: Repository) => {
+      this.props.dispatcher.changeRepositoryAlias(repository, null)
+    }
+
+    const items = generateRepositoryListContextMenu({
+      onRemoveRepository: this.removeRepository,
+      onShowRepository: this.showRepository,
+      onOpenInShell: this.openInShell,
+      onOpenInExternalEditor: this.openInExternalEditor,
+      askForConfirmationOnRemoveRepository: this.state
+        .askForConfirmationOnRepositoryRemoval,
+      externalEditorLabel: externalEditorLabel,
+      onChangeRepositoryAlias: onChangeRepositoryAlias,
+      onRemoveRepositoryAlias: onRemoveRepositoryAlias,
+      onViewOnGitHub: this.viewOnGitHub,
+      repository: repository,
+      shellLabel: this.state.selectedShell,
+    })
+
+    showContextualMenu(items)
+  }
+
   private renderPushPullToolbarButton() {
     const selection = this.state.selectedState
     if (!selection || selection.type !== SelectionType.Repository) {
diff --git a/app/src/ui/repositories-list/repository-list-item-context-menu.ts b/app/src/ui/repositories-list/repository-list-item-context-menu.ts
new file mode 100644
index 0000000000..63c29bdc27
--- /dev/null
+++ b/app/src/ui/repositories-list/repository-list-item-context-menu.ts
@@ -0,0 +1,112 @@
+import { Repository } from '../../models/repository'
+import { IMenuItem } from '../../lib/menu-item'
+import { enableRepositoryAliases } from '../../lib/feature-flag'
+import { Repositoryish } from './group-repositories'
+import { clipboard } from 'electron'
+import {
+  RevealInFileManagerLabel,
+  DefaultEditorLabel,
+} from '../lib/context-menu'
+
+interface IRepositoryListItemContextMenuConfig {
+  repository: Repositoryish
+  shellLabel: string
+  externalEditorLabel: string | undefined
+  askForConfirmationOnRemoveRepository: boolean
+  onViewOnGitHub: (repository: Repositoryish) => void
+  onOpenInShell: (repository: Repositoryish) => void
+  onShowRepository: (repository: Repositoryish) => void
+  onOpenInExternalEditor: (repository: Repositoryish) => void
+  onRemoveRepository: (repository: Repositoryish) => void
+  onChangeRepositoryAlias: (repository: Repository) => void
+  onRemoveRepositoryAlias: (repository: Repository) => void
+}
+
+export const generateRepositoryListContextMenu = (
+  config: IRepositoryListItemContextMenuConfig
+) => {
+  const missing =
+    config.repository instanceof Repository && config.repository.missing
+  const github =
+    config.repository instanceof Repository &&
+    config.repository.gitHubRepository != null
+  const openInExternalEditor = config.externalEditorLabel
+    ? `Open in ${config.externalEditorLabel}`
+    : DefaultEditorLabel
+
+  const items: ReadonlyArray<IMenuItem> = [
+    ...buildAliasMenuItems(config),
+    {
+      label: __DARWIN__ ? 'Copy Repo Name' : 'Copy repo name',
+      action: () => clipboard.writeText(config.repository.name),
+    },
+    { type: 'separator' },
+    {
+      label: 'View on GitHub',
+      action: () => config.onViewOnGitHub(config.repository),
+      enabled: github,
+    },
+    {
+      label: `Open in ${config.shellLabel}`,
+      action: () => config.onOpenInShell(config.repository),
+      enabled: !missing,
+    },
+    {
+      label: RevealInFileManagerLabel,
+      action: () => config.onShowRepository(config.repository),
+      enabled: !missing,
+    },
+    {
+      label: openInExternalEditor,
+      action: () => config.onOpenInExternalEditor(config.repository),
+      enabled: !missing,
+    },
+    { type: 'separator' },
+    {
+      label: config.askForConfirmationOnRemoveRepository ? 'Remove…' : 'Remove',
+      action: () => config.onRemoveRepository(config.repository),
+    },
+  ]
+
+  return items
+}
+
+const buildAliasMenuItems = (
+  config: IRepositoryListItemContextMenuConfig
+): ReadonlyArray<IMenuItem> => {
+  if (
+    !(config.repository instanceof Repository) ||
+    !enableRepositoryAliases()
+  ) {
+    return []
+  }
+
+  const removeAlias = () => {
+    if (config.repository instanceof Repository) {
+      config.onRemoveRepositoryAlias(config.repository)
+    }
+  }
+
+  const changeAlias = () => {
+    if (config.repository instanceof Repository) {
+      config.onChangeRepositoryAlias(config.repository)
+    }
+  }
+
+  const verb = config.repository.alias == null ? 'Create' : 'Change'
+  const items: Array<IMenuItem> = [
+    {
+      label: __DARWIN__ ? `${verb} Alias` : `${verb} alias`,
+      action: changeAlias,
+    },
+  ]
+
+  if (config.repository.alias !== null) {
+    items.push({
+      label: __DARWIN__ ? 'Remove Alias' : 'Remove alias',
+      action: removeAlias,
+    })
+  }
+
+  return items
+}
diff --git a/app/src/ui/repositories-list/repository-list-item.tsx b/app/src/ui/repositories-list/repository-list-item.tsx
index f660a56d31..833402d8ad 100644
--- a/app/src/ui/repositories-list/repository-list-item.tsx
+++ b/app/src/ui/repositories-list/repository-list-item.tsx
@@ -1,24 +1,18 @@
 import * as React from 'react'
-import { clipboard } from 'electron'
 
 import { Repository } from '../../models/repository'
 import { Octicon, iconForRepository } from '../octicons'
 import * as OcticonSymbol from '../octicons/octicons.generated'
 import { showContextualMenu } from '../main-process-proxy'
 import { Repositoryish } from './group-repositories'
-import { IMenuItem } from '../../lib/menu-item'
 import { HighlightText } from '../lib/highlight-text'
 import { IMatches } from '../../lib/fuzzy-find'
 import { IAheadBehind } from '../../models/branch'
-import {
-  RevealInFileManagerLabel,
-  DefaultEditorLabel,
-} from '../lib/context-menu'
-import { enableRepositoryAliases } from '../../lib/feature-flag'
 import classNames from 'classnames'
 import { createObservableRef } from '../lib/observable-ref'
 import { Tooltip } from '../lib/tooltip'
 import { TooltippedContent } from '../lib/tooltipped-content'
+import { generateRepositoryListContextMenu } from './repository-list-item-context-menu'
 
 interface IRepositoryListItemProps {
   readonly repository: Repositoryish
@@ -154,113 +148,23 @@ export class RepositoryListItem extends React.Component<
   private onContextMenu = (event: React.MouseEvent<any>) => {
     event.preventDefault()
 
-    const repository = this.props.repository
-    const missing = repository instanceof Repository && repository.missing
-    const github =
-      repository instanceof Repository && repository.gitHubRepository != null
-    const openInExternalEditor = this.props.externalEditorLabel
-      ? `Open in ${this.props.externalEditorLabel}`
-      : DefaultEditorLabel
-
-    const items: ReadonlyArray<IMenuItem> = [
-      ...this.buildAliasMenuItems(),
-      {
-        label: __DARWIN__ ? 'Copy Repo Name' : 'Copy repo name',
-        action: this.copyToClipboard,
-      },
-      { type: 'separator' },
-      {
-        label: 'View on GitHub',
-        action: this.viewOnGitHub,
-        enabled: github,
-      },
-      {
-        label: `Open in ${this.props.shellLabel}`,
-        action: this.openInShell,
-        enabled: !missing,
-      },
-      {
-        label: RevealInFileManagerLabel,
-        action: this.showRepository,
-        enabled: !missing,
-      },
-      {
-        label: openInExternalEditor,
-        action: this.openInExternalEditor,
-        enabled: !missing,
-      },
-      { type: 'separator' },
-      {
-        label: this.props.askForConfirmationOnRemoveRepository
-          ? 'Remove…'
-          : 'Remove',
-        action: this.removeRepository,
-      },
-    ]
+    const items = generateRepositoryListContextMenu({
+      onRemoveRepository: this.props.onRemoveRepository,
+      onShowRepository: this.props.onShowRepository,
+      onOpenInShell: this.props.onOpenInShell,
+      onOpenInExternalEditor: this.props.onOpenInExternalEditor,
+      askForConfirmationOnRemoveRepository: this.props
+        .askForConfirmationOnRemoveRepository,
+      externalEditorLabel: this.props.externalEditorLabel,
+      onChangeRepositoryAlias: this.props.onChangeRepositoryAlias,
+      onRemoveRepositoryAlias: this.props.onRemoveRepositoryAlias,
+      onViewOnGitHub: this.props.onViewOnGitHub,
+      repository: this.props.repository,
+      shellLabel: this.props.shellLabel,
+    })
 
     showContextualMenu(items)
   }
-
-  private buildAliasMenuItems(): ReadonlyArray<IMenuItem> {
-    const repository = this.props.repository
-
-    if (!(repository instanceof Repository) || !enableRepositoryAliases()) {
-      return []
-    }
-
-    const verb = repository.alias == null ? 'Create' : 'Change'
-    const items: Array<IMenuItem> = [
-      {
-        label: __DARWIN__ ? `${verb} Alias` : `${verb} alias`,
-        action: this.changeAlias,
-      },
-    ]
-
-    if (repository.alias !== null) {
-      items.push({
-        label: __DARWIN__ ? 'Remove Alias' : 'Remove alias',
-        action: this.removeAlias,
-      })
-    }
-
-    return items
-  }
-
-  private removeRepository = () => {
-    this.props.onRemoveRepository(this.props.repository)
-  }
-
-  private showRepository = () => {
-    this.props.onShowRepository(this.props.repository)
-  }
-
-  private viewOnGitHub = () => {
-    this.props.onViewOnGitHub(this.props.repository)
-  }
-
-  private openInShell = () => {
-    this.props.onOpenInShell(this.props.repository)
-  }
-
-  private openInExternalEditor = () => {
-    this.props.onOpenInExternalEditor(this.props.repository)
-  }
-
-  private changeAlias = () => {
-    if (this.props.repository instanceof Repository) {
-      this.props.onChangeRepositoryAlias(this.props.repository)
-    }
-  }
-
-  private removeAlias = () => {
-    if (this.props.repository instanceof Repository) {
-      this.props.onRemoveRepositoryAlias(this.props.repository)
-    }
-  }
-
-  private copyToClipboard = () => {
-    clipboard.writeText(this.props.repository.name)
-  }
 }
 
 const renderRepoIndicators: React.FunctionComponent<{

From 22a8ee76b66c6a4f1e61f5f624bad35c80245bb2 Mon Sep 17 00:00:00 2001
From: uttiya10 <56562649+uttiya10@users.noreply.github.com>
Date: Thu, 13 Jan 2022 18:53:55 -0500
Subject: [PATCH 04/88] Fix Code Styling

---
 app/src/ui/branches/branch-list-item.tsx   |  2 +-
 app/src/ui/branches/branches-container.tsx |  2 +-
 app/src/ui/lib/button.tsx                  |  2 +-
 app/src/ui/toolbar/branch-dropdown.tsx     | 10 +++++++---
 app/src/ui/toolbar/button.tsx              |  2 +-
 app/src/ui/toolbar/dropdown.tsx            |  4 ++--
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/src/ui/branches/branch-list-item.tsx b/app/src/ui/branches/branch-list-item.tsx
index 8091a8d2f2..e1f14a4e14 100644
--- a/app/src/ui/branches/branch-list-item.tsx
+++ b/app/src/ui/branches/branch-list-item.tsx
@@ -53,7 +53,7 @@ interface IBranchListItemState {
 export class BranchListItem extends React.Component<
   IBranchListItemProps,
   IBranchListItemState
-  > {
+> {
   public constructor(props: IBranchListItemProps) {
     super(props)
     this.state = { isDragInProgress: false }
diff --git a/app/src/ui/branches/branches-container.tsx b/app/src/ui/branches/branches-container.tsx
index 1e42d5e812..be94793be3 100644
--- a/app/src/ui/branches/branches-container.tsx
+++ b/app/src/ui/branches/branches-container.tsx
@@ -73,7 +73,7 @@ interface IBranchesContainerState {
 export class BranchesContainer extends React.Component<
   IBranchesContainerProps,
   IBranchesContainerState
-  > {
+> {
   public static getDerivedStateFromProps(
     props: IBranchesContainerProps,
     state: IBranchesContainerProps
diff --git a/app/src/ui/lib/button.tsx b/app/src/ui/lib/button.tsx
index 0cb7b53f16..57ceeb9e62 100644
--- a/app/src/ui/lib/button.tsx
+++ b/app/src/ui/lib/button.tsx
@@ -14,7 +14,7 @@ export interface IButtonProps {
 
   /**
    * A callback which is invoked when the button's context menu
-   * is activated using a pointer device or keyboard. The source 
+   * is activated using a pointer device or keyboard. The source
    * event is passed along and can be used to prevent the default
    * action or stop the event from bubbling.
    */
diff --git a/app/src/ui/toolbar/branch-dropdown.tsx b/app/src/ui/toolbar/branch-dropdown.tsx
index 9f87111593..f902fabf8f 100644
--- a/app/src/ui/toolbar/branch-dropdown.tsx
+++ b/app/src/ui/toolbar/branch-dropdown.tsx
@@ -74,7 +74,7 @@ interface IBranchDropdownState {
 export class BranchDropdown extends React.Component<
   IBranchDropdownProps,
   IBranchDropdownState
-  > {
+> {
   public constructor(props: IBranchDropdownProps) {
     super(props)
     this.state = {
@@ -228,7 +228,9 @@ export class BranchDropdown extends React.Component<
     }
   }
 
-  private createContextMenuItems = (event: React.MouseEvent<HTMLButtonElement>): void => {
+  private createContextMenuItems = (
+    event: React.MouseEvent<HTMLButtonElement>
+  ): void => {
     event.preventDefault()
 
     const repositoryState = this.props.repositoryState
@@ -252,7 +254,9 @@ export class BranchDropdown extends React.Component<
   }
 
   private getBranchWithName(branchName: string): Branch | undefined {
-    return this.props.repositoryState.branchesState.allBranches.find(branch => branch.name === branchName)
+    return this.props.repositoryState.branchesState.allBranches.find(
+      branch => branch.name === branchName
+    )
   }
 
   private onRenameBranch = (branchName: string) => {
diff --git a/app/src/ui/toolbar/button.tsx b/app/src/ui/toolbar/button.tsx
index ceb10dcdfd..1e11778237 100644
--- a/app/src/ui/toolbar/button.tsx
+++ b/app/src/ui/toolbar/button.tsx
@@ -40,7 +40,7 @@ export interface IToolbarButtonProps {
 
   /**
    * An optional event handler for when the button's context menu
-   * is activated by a pointer event or by hitting the menu key 
+   * is activated by a pointer event or by hitting the menu key
    * while focused.
    */
   readonly onContextMenu?: (event: React.MouseEvent<HTMLButtonElement>) => void
diff --git a/app/src/ui/toolbar/dropdown.tsx b/app/src/ui/toolbar/dropdown.tsx
index 8654f08c7e..e68fc2ebab 100644
--- a/app/src/ui/toolbar/dropdown.tsx
+++ b/app/src/ui/toolbar/dropdown.tsx
@@ -66,7 +66,7 @@ export interface IToolbarDropdownProps {
   readonly dropdownContentRenderer: () => JSX.Element | null
 
   /**
-   * A callback which is invoked when the button's context menu 
+   * A callback which is invoked when the button's context menu
    * is activated. The source event is passed along and can be
    * used to prevent the default action or stop the event from bubbling.
    */
@@ -182,7 +182,7 @@ interface IToolbarDropdownState {
 export class ToolbarDropdown extends React.Component<
   IToolbarDropdownProps,
   IToolbarDropdownState
-  > {
+> {
   private innerButton: ToolbarButton | null = null
   private focusTrapOptions: FocusTrapOptions
 

From 9d19033f28d58a71c0f612a8d395fd7e47a76ece Mon Sep 17 00:00:00 2001
From: uttiya10 <56562649+uttiya10@users.noreply.github.com>
Date: Tue, 18 Jan 2022 10:57:37 -0500
Subject: [PATCH 05/88] Refactor Code to Use Optional Chaining

---
 app/src/ui/lib/button.tsx       | 4 +---
 app/src/ui/toolbar/dropdown.tsx | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/src/ui/lib/button.tsx b/app/src/ui/lib/button.tsx
index 57ceeb9e62..3a79753c1b 100644
--- a/app/src/ui/lib/button.tsx
+++ b/app/src/ui/lib/button.tsx
@@ -162,9 +162,7 @@ export class Button extends React.Component<IButtonProps, {}> {
   }
 
   private onContextMenu = (event: React.MouseEvent<HTMLButtonElement>) => {
-    if (this.props.onContextMenu) {
-      this.props.onContextMenu(event)
-    }
+    this.props.onContextMenu?.(event)
 
     if (this.props.type === undefined) {
       event.preventDefault()
diff --git a/app/src/ui/toolbar/dropdown.tsx b/app/src/ui/toolbar/dropdown.tsx
index e68fc2ebab..bf6d25f513 100644
--- a/app/src/ui/toolbar/dropdown.tsx
+++ b/app/src/ui/toolbar/dropdown.tsx
@@ -246,9 +246,7 @@ export class ToolbarDropdown extends React.Component<
   }
 
   private onContextMenu = (event: React.MouseEvent<HTMLButtonElement>) => {
-    if (this.props.onContextMenu) {
-      this.props.onContextMenu(event)
-    }
+    this.props.onContextMenu?.(event)
   }
 
   private updateClientRectIfNecessary() {

From 1f8dd49073733e39fe163906f1c2bb9bae41151f Mon Sep 17 00:00:00 2001
From: uttiya10 <56562649+uttiya10@users.noreply.github.com>
Date: Tue, 18 Jan 2022 11:01:37 -0500
Subject: [PATCH 06/88] Refactor Code for Clarity

---
 app/src/ui/app.tsx                            | 14 ++----
 .../branch-list-item-context-menu.tsx         | 15 ++++--
 app/src/ui/branches/branch-list-item.tsx      | 14 +++---
 .../repository-list-item-context-menu.ts      | 46 +++++++------------
 app/src/ui/toolbar/branch-dropdown.tsx        | 18 ++++----
 5 files changed, 47 insertions(+), 60 deletions(-)

diff --git a/app/src/ui/app.tsx b/app/src/ui/app.tsx
index 0fa29de7c3..82dd5aec46 100644
--- a/app/src/ui/app.tsx
+++ b/app/src/ui/app.tsx
@@ -2446,7 +2446,7 @@ export class App extends React.Component<IAppProps, IAppState> {
         description={__DARWIN__ ? 'Current Repository' : 'Current repository'}
         tooltip={tooltip}
         foldoutStyle={foldoutStyle}
-        onContextMenu={this.onContextMenu}
+        onContextMenu={this.onRepositoryToolbarButtonContextMenu}
         onDropdownStateChanged={this.onRepositoryDropdownStateChanged}
         dropdownContentRenderer={this.renderRepositoryList}
         dropdownState={currentState}
@@ -2454,17 +2454,13 @@ export class App extends React.Component<IAppProps, IAppState> {
     )
   }
 
-  private onContextMenu = () => {
-    const selection = this.state.selectedState
-
-    const repository = selection ? selection.repository : null
-    if (!repository) {
+  private onRepositoryToolbarButtonContextMenu = () => {
+    const repository = this.state.selectedState?.repository
+    if (repository === undefined) {
       return
     }
 
-    const externalEditorLabel = this.state.selectedExternalEditor
-      ? this.state.selectedExternalEditor
-      : undefined
+    const externalEditorLabel = this.state.selectedExternalEditor ?? undefined
 
     const onChangeRepositoryAlias = (repository: Repository) => {
       this.props.dispatcher.showPopup({
diff --git a/app/src/ui/branches/branch-list-item-context-menu.tsx b/app/src/ui/branches/branch-list-item-context-menu.tsx
index acc5c0db96..88334e3044 100644
--- a/app/src/ui/branches/branch-list-item-context-menu.tsx
+++ b/app/src/ui/branches/branch-list-item-context-menu.tsx
@@ -1,13 +1,18 @@
 import { IMenuItem } from '../../lib/menu-item'
 import { clipboard } from 'electron'
 
-export function createBranchContextMenuItems(
-  name: string,
-  isLocal: boolean,
-  onRenameBranch?: (branchName: string) => void,
+interface IBranchContextMenuConfig {
+  name: string
+  isLocal: boolean
+  onRenameBranch?: (branchName: string) => void
   onDeleteBranch?: (branchName: string) => void
+}
+
+export function generateBranchContextMenuItems(
+  config: IBranchContextMenuConfig
 ): IMenuItem[] {
-  const items: Array<IMenuItem> = []
+  const { name, isLocal, onRenameBranch, onDeleteBranch } = config
+  const items = new Array<IMenuItem>()
 
   if (onRenameBranch !== undefined) {
     items.push({
diff --git a/app/src/ui/branches/branch-list-item.tsx b/app/src/ui/branches/branch-list-item.tsx
index e1f14a4e14..fe2c8a87e1 100644
--- a/app/src/ui/branches/branch-list-item.tsx
+++ b/app/src/ui/branches/branch-list-item.tsx
@@ -11,7 +11,7 @@ import { DragType, DropTargetType } from '../../models/drag-drop'
 import { TooltippedContent } from '../lib/tooltipped-content'
 import { RelativeTime } from '../relative-time'
 import classNames from 'classnames'
-import { createBranchContextMenuItems } from './branch-list-item-context-menu'
+import { generateBranchContextMenuItems } from './branch-list-item-context-menu'
 
 interface IBranchListItemProps {
   /** The name of the branch */
@@ -73,12 +73,12 @@ export class BranchListItem extends React.Component<
       return
     }
 
-    const items = createBranchContextMenuItems(
-      name,
-      isLocal,
-      onRenameBranch,
-      onDeleteBranch
-    )
+    const items = generateBranchContextMenuItems({
+      name: name,
+      isLocal: isLocal,
+      onRenameBranch: onRenameBranch,
+      onDeleteBranch: onDeleteBranch,
+    })
 
     showContextualMenu(items)
   }
diff --git a/app/src/ui/repositories-list/repository-list-item-context-menu.ts b/app/src/ui/repositories-list/repository-list-item-context-menu.ts
index 63c29bdc27..ab210d94a3 100644
--- a/app/src/ui/repositories-list/repository-list-item-context-menu.ts
+++ b/app/src/ui/repositories-list/repository-list-item-context-menu.ts
@@ -25,11 +25,10 @@ interface IRepositoryListItemContextMenuConfig {
 export const generateRepositoryListContextMenu = (
   config: IRepositoryListItemContextMenuConfig
 ) => {
-  const missing =
-    config.repository instanceof Repository && config.repository.missing
+  const { repository } = config
+  const missing = repository instanceof Repository && repository.missing
   const github =
-    config.repository instanceof Repository &&
-    config.repository.gitHubRepository != null
+    repository instanceof Repository && repository.gitHubRepository != null
   const openInExternalEditor = config.externalEditorLabel
     ? `Open in ${config.externalEditorLabel}`
     : DefaultEditorLabel
@@ -38,33 +37,33 @@ export const generateRepositoryListContextMenu = (
     ...buildAliasMenuItems(config),
     {
       label: __DARWIN__ ? 'Copy Repo Name' : 'Copy repo name',
-      action: () => clipboard.writeText(config.repository.name),
+      action: () => clipboard.writeText(repository.name),
     },
     { type: 'separator' },
     {
       label: 'View on GitHub',
-      action: () => config.onViewOnGitHub(config.repository),
+      action: () => config.onViewOnGitHub(repository),
       enabled: github,
     },
     {
       label: `Open in ${config.shellLabel}`,
-      action: () => config.onOpenInShell(config.repository),
+      action: () => config.onOpenInShell(repository),
       enabled: !missing,
     },
     {
       label: RevealInFileManagerLabel,
-      action: () => config.onShowRepository(config.repository),
+      action: () => config.onShowRepository(repository),
       enabled: !missing,
     },
     {
       label: openInExternalEditor,
-      action: () => config.onOpenInExternalEditor(config.repository),
+      action: () => config.onOpenInExternalEditor(repository),
       enabled: !missing,
     },
     { type: 'separator' },
     {
       label: config.askForConfirmationOnRemoveRepository ? 'Remove…' : 'Remove',
-      action: () => config.onRemoveRepository(config.repository),
+      action: () => config.onRemoveRepository(repository),
     },
   ]
 
@@ -74,37 +73,24 @@ export const generateRepositoryListContextMenu = (
 const buildAliasMenuItems = (
   config: IRepositoryListItemContextMenuConfig
 ): ReadonlyArray<IMenuItem> => {
-  if (
-    !(config.repository instanceof Repository) ||
-    !enableRepositoryAliases()
-  ) {
+  const { repository } = config
+
+  if (!(repository instanceof Repository) || !enableRepositoryAliases()) {
     return []
   }
 
-  const removeAlias = () => {
-    if (config.repository instanceof Repository) {
-      config.onRemoveRepositoryAlias(config.repository)
-    }
-  }
-
-  const changeAlias = () => {
-    if (config.repository instanceof Repository) {
-      config.onChangeRepositoryAlias(config.repository)
-    }
-  }
-
-  const verb = config.repository.alias == null ? 'Create' : 'Change'
+  const verb = repository.alias == null ? 'Create' : 'Change'
   const items: Array<IMenuItem> = [
     {
       label: __DARWIN__ ? `${verb} Alias` : `${verb} alias`,
-      action: changeAlias,
+      action: () => config.onChangeRepositoryAlias(repository),
     },
   ]
 
-  if (config.repository.alias !== null) {
+  if (repository.alias !== null) {
     items.push({
       label: __DARWIN__ ? 'Remove Alias' : 'Remove alias',
-      action: removeAlias,
+      action: () => config.onRemoveRepositoryAlias(repository),
     })
   }
 
diff --git a/app/src/ui/toolbar/branch-dropdown.tsx b/app/src/ui/toolbar/branch-dropdown.tsx
index f902fabf8f..fdaf28a3f2 100644
--- a/app/src/ui/toolbar/branch-dropdown.tsx
+++ b/app/src/ui/toolbar/branch-dropdown.tsx
@@ -21,7 +21,7 @@ import { CICheckRunPopover } from '../check-runs/ci-check-run-popover'
 import { TooltipTarget } from '../lib/tooltip'
 import { BranchType, Branch } from '../../models/branch'
 import { PopupType } from '../../models/popup'
-import { createBranchContextMenuItems } from '../branches/branch-list-item-context-menu'
+import { generateBranchContextMenuItems } from '../branches/branch-list-item-context-menu'
 import { showContextualMenu } from '../main-process-proxy'
 
 interface IBranchDropdownProps {
@@ -195,7 +195,7 @@ export class BranchDropdown extends React.Component<
           iconClassName={iconClassName}
           title={title}
           description={description}
-          onContextMenu={this.createContextMenuItems}
+          onContextMenu={this.onBranchToolbarButtonContextMenu}
           tooltip={isOpen ? undefined : tooltip}
           onDropdownStateChanged={this.onDropDownStateChanged}
           dropdownContentRenderer={this.renderBranchFoldout}
@@ -228,7 +228,7 @@ export class BranchDropdown extends React.Component<
     }
   }
 
-  private createContextMenuItems = (
+  private onBranchToolbarButtonContextMenu = (
     event: React.MouseEvent<HTMLButtonElement>
   ): void => {
     event.preventDefault()
@@ -243,12 +243,12 @@ export class BranchDropdown extends React.Component<
 
     const isLocal = currentBranch.type === BranchType.Local
 
-    const items = createBranchContextMenuItems(
-      currentBranch.name,
-      isLocal,
-      this.onRenameBranch,
-      this.onDeleteBranch
-    )
+    const items = generateBranchContextMenuItems({
+      name: currentBranch.name,
+      isLocal: isLocal,
+      onRenameBranch: this.onRenameBranch,
+      onDeleteBranch: this.onDeleteBranch,
+    })
 
     showContextualMenu(items)
   }

From f0bcb6cedd6728bd945f2708f6c8943ba94fb5f1 Mon Sep 17 00:00:00 2001
From: uttiya10 <56562649+uttiya10@users.noreply.github.com>
Date: Tue, 18 Jan 2022 11:09:35 -0500
Subject: [PATCH 07/88] Use Optional Chaining on Toolbar Button's Context Menu

---
 app/src/ui/toolbar/button.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/src/ui/toolbar/button.tsx b/app/src/ui/toolbar/button.tsx
index 1e11778237..3e303f55db 100644
--- a/app/src/ui/toolbar/button.tsx
+++ b/app/src/ui/toolbar/button.tsx
@@ -145,9 +145,7 @@ export class ToolbarButton extends React.Component<IToolbarButtonProps, {}> {
   }
 
   private onContextMenu = (event: React.MouseEvent<HTMLButtonElement>) => {
-    if (this.props.onContextMenu) {
-      this.props.onContextMenu(event)
-    }
+    this.props.onContextMenu?.(event)
   }
 
   private onButtonRef = (ref: Button | null) => {

From af63ad21d0af4f44905b9693b0d67195347540d9 Mon Sep 17 00:00:00 2001
From: uttiya10 <56562649+uttiya10@users.noreply.github.com>
Date: Thu, 17 Mar 2022 15:51:10 -0400
Subject: [PATCH 08/88] Update menu item to allow quick merge of upstream

If the user is contributing to the parent repo, we now choose the upstream's default branch as the merging branch rather then the fork's default branch.
---
 app/src/lib/branch.ts                         | 29 +++++++++++++++++++
 app/src/lib/menu-update.ts                    |  6 ++--
 app/src/lib/stores/app-store.ts               | 16 ++++++----
 .../main-process/menu/build-default-menu.ts   | 15 ++++++----
 app/src/main-process/menu/menu-event.ts       |  2 +-
 app/src/models/menu-ids.ts                    |  2 +-
 app/src/models/menu-labels.ts                 |  9 ++++--
 app/src/ui/app.tsx                            | 17 ++++++-----
 8 files changed, 69 insertions(+), 27 deletions(-)

diff --git a/app/src/lib/branch.ts b/app/src/lib/branch.ts
index 93ee13b937..46815f0a0d 100644
--- a/app/src/lib/branch.ts
+++ b/app/src/lib/branch.ts
@@ -3,7 +3,10 @@ import { UpstreamRemoteName } from './stores'
 import {
   RepositoryWithGitHubRepository,
   getNonForkGitHubRepository,
+  isRepositoryWithGitHubRepository,
+  Repository,
 } from '../models/repository'
+import { IBranchesState } from './app-state'
 
 /**
  * Finds the default branch of the upstream repository of the passed repository.
@@ -41,3 +44,29 @@ export function findDefaultUpstreamBranch(
 
   return foundBranch !== undefined ? foundBranch : null
 }
+
+/**
+ * 
+ * @param repository The repository to use.
+ * @param branchesState The branches state of the repository.
+ * @returns The default branch of the user's contribution target, or null if it's not known.
+ * 
+ * This method will return the fork's upstream default branch, if the user
+ * is contributing to the parent repository.
+ * 
+ * Otherwise, this method will return the default branch of the passed in repository.
+ */
+export function findContributionTargetDefaultBranch(
+  repository: Repository,
+  branchesState: IBranchesState
+): Branch | null {
+  let contributionTargetDefaultBranch: Branch | null
+    if (isRepositoryWithGitHubRepository(repository)) {
+      contributionTargetDefaultBranch = findDefaultUpstreamBranch(
+        repository,
+        branchesState.allBranches
+      )
+    }
+    contributionTargetDefaultBranch ??= branchesState.defaultBranch
+    return contributionTargetDefaultBranch
+}
diff --git a/app/src/lib/menu-update.ts b/app/src/lib/menu-update.ts
index 93c6c03ce3..a1e48d7b3e 100644
--- a/app/src/lib/menu-update.ts
+++ b/app/src/lib/menu-update.ts
@@ -112,7 +112,7 @@ const allMenuIds: ReadonlyArray<MenuIDs> = [
   'discard-all-changes',
   'stash-all-changes',
   'preferences',
-  'update-branch',
+  'update-branch-with-contribution-target-branch',
   'compare-to-branch',
   'merge-branch',
   'rebase-branch',
@@ -260,7 +260,7 @@ function getRepositoryMenuBuilder(state: IAppState): MenuStateBuilder {
       onNonDefaultBranch && !branchIsUnborn && !onDetachedHead
     )
     menuStateBuilder.setEnabled(
-      'update-branch',
+      'update-branch-with-contribution-target-branch',
       onNonDefaultBranch && hasDefaultBranch && !onDetachedHead
     )
     menuStateBuilder.setEnabled('merge-branch', onBranch)
@@ -337,7 +337,7 @@ function getRepositoryMenuBuilder(state: IAppState): MenuStateBuilder {
     menuStateBuilder.disable('delete-branch')
     menuStateBuilder.disable('discard-all-changes')
     menuStateBuilder.disable('stash-all-changes')
-    menuStateBuilder.disable('update-branch')
+    menuStateBuilder.disable('update-branch-with-contribution-target-branch')
     menuStateBuilder.disable('merge-branch')
     if (enableSquashMerging()) {
       menuStateBuilder.disable('squash-and-merge-branch')
diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts
index dfe1d879b2..136f1861e6 100644
--- a/app/src/lib/stores/app-store.ts
+++ b/app/src/lib/stores/app-store.ts
@@ -295,6 +295,7 @@ import {
 import * as ipcRenderer from '../ipc-renderer'
 import { pathExists } from '../../ui/lib/path-exists'
 import { offsetFromNow } from '../offset-from'
+import { findContributionTargetDefaultBranch } from '../branch'
 
 const LastSelectedRepositoryIDKey = 'last-selected-repository-id'
 
@@ -1996,6 +1997,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
   private updateMenuItemLabels(state: IRepositoryState | null) {
     const {
       selectedShell,
+      selectedRepository,
       selectedExternalEditor,
       askForConfirmationOnRepositoryRemoval,
       askForConfirmationOnForcePush,
@@ -2014,12 +2016,14 @@ export class AppStore extends TypedBaseStore<IAppState> {
     }
 
     const { changesState, branchesState, aheadBehind } = state
-    const { defaultBranch, currentPullRequest } = branchesState
+    const { currentPullRequest } = branchesState
 
-    const defaultBranchName =
-      defaultBranch === null || defaultBranch.upstreamWithoutRemote === null
-        ? undefined
-        : defaultBranch.upstreamWithoutRemote
+    let contributionTargetDefaultBranch: string | undefined
+    if (selectedRepository instanceof Repository) {
+      contributionTargetDefaultBranch =
+        findContributionTargetDefaultBranch(selectedRepository, branchesState)
+          ?.name ?? undefined
+    }
 
     const isForcePushForCurrentRepository = isCurrentBranchForcePush(
       branchesState,
@@ -2034,7 +2038,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
 
     updatePreferredAppMenuItemLabels({
       ...labels,
-      defaultBranchName,
+      contributionTargetDefaultBranch,
       isForcePushForCurrentRepository,
       isStashedChangesVisible,
       hasCurrentPullRequest: currentPullRequest !== null,
diff --git a/app/src/main-process/menu/build-default-menu.ts b/app/src/main-process/menu/build-default-menu.ts
index d789c9e75a..483652f5f3 100644
--- a/app/src/main-process/menu/build-default-menu.ts
+++ b/app/src/main-process/menu/build-default-menu.ts
@@ -38,12 +38,15 @@ export function buildDefaultMenu({
   askForConfirmationOnForcePush,
   askForConfirmationOnRepositoryRemoval,
   hasCurrentPullRequest = false,
-  defaultBranchName = defaultBranchNameValue,
+  contributionTargetDefaultBranch = defaultBranchNameValue,
   isForcePushForCurrentRepository = false,
   isStashedChangesVisible = false,
   askForConfirmationWhenStashingAllChanges = true,
 }: MenuLabelsEvent): Electron.Menu {
-  defaultBranchName = truncateWithEllipsis(defaultBranchName, 25)
+  contributionTargetDefaultBranch = truncateWithEllipsis(
+    contributionTargetDefaultBranch,
+    25
+  )
 
   const removeRepoLabel = askForConfirmationOnRepositoryRemoval
     ? confirmRepositoryRemovalLabel
@@ -376,11 +379,11 @@ export function buildDefaultMenu({
     separator,
     {
       label: __DARWIN__
-        ? `Update from ${defaultBranchName}`
-        : `&Update from ${defaultBranchName}`,
-      id: 'update-branch',
+        ? `Update from ${contributionTargetDefaultBranch}`
+        : `&Update from ${contributionTargetDefaultBranch}`,
+      id: 'update-branch-with-contribution-target-branch',
       accelerator: 'CmdOrCtrl+Shift+U',
-      click: emit('update-branch'),
+      click: emit('update-branch-with-contribution-target-branch'),
     },
     {
       label: __DARWIN__ ? 'Compare to Branch' : '&Compare to branch',
diff --git a/app/src/main-process/menu/menu-event.ts b/app/src/main-process/menu/menu-event.ts
index be494c1a08..8ea133b77b 100644
--- a/app/src/main-process/menu/menu-event.ts
+++ b/app/src/main-process/menu/menu-event.ts
@@ -16,7 +16,7 @@ export type MenuEvent =
   | 'show-preferences'
   | 'choose-repository'
   | 'open-working-directory'
-  | 'update-branch'
+  | 'update-branch-with-contribution-target-branch'
   | 'compare-to-branch'
   | 'merge-branch'
   | 'squash-and-merge-branch'
diff --git a/app/src/models/menu-ids.ts b/app/src/models/menu-ids.ts
index 1eebcb839a..b874bc4434 100644
--- a/app/src/models/menu-ids.ts
+++ b/app/src/models/menu-ids.ts
@@ -5,7 +5,7 @@ export type MenuIDs =
   | 'discard-all-changes'
   | 'stash-all-changes'
   | 'preferences'
-  | 'update-branch'
+  | 'update-branch-with-contribution-target-branch'
   | 'merge-branch'
   | 'squash-and-merge-branch'
   | 'rebase-branch'
diff --git a/app/src/models/menu-labels.ts b/app/src/models/menu-labels.ts
index 974297d61d..1093e0c474 100644
--- a/app/src/models/menu-labels.ts
+++ b/app/src/models/menu-labels.ts
@@ -28,11 +28,16 @@ export type MenuLabelsEvent = {
   readonly askForConfirmationOnRepositoryRemoval: boolean
 
   /**
-   * Specify the default branch associated with the current repository.
+   * Specify the default branch of the user's contribution target.
+   *
+   * This value should be the fork's upstream default branch, if the user
+   * is contributing to the parent repository.
+   *
+   * Otherwise, this value should be the default branch of the repository.
    *
    * Omit this value to indicate that the default branch is unknown.
    */
-  readonly defaultBranchName?: string
+  readonly contributionTargetDefaultBranch?: string
 
   /**
    * Is the current branch in a state where it can be force pushed to the remote?
diff --git a/app/src/ui/app.tsx b/app/src/ui/app.tsx
index a9f105f1e5..c22f34687e 100644
--- a/app/src/ui/app.tsx
+++ b/app/src/ui/app.tsx
@@ -105,7 +105,7 @@ import { TutorialStep, isValidTutorialStep } from '../models/tutorial-step'
 import { WorkflowPushRejectedDialog } from './workflow-push-rejected/workflow-push-rejected'
 import { SAMLReauthRequiredDialog } from './saml-reauth-required/saml-reauth-required'
 import { CreateForkDialog } from './forks/create-fork-dialog'
-import { findDefaultUpstreamBranch } from '../lib/branch'
+import { findContributionTargetDefaultBranch, findDefaultUpstreamBranch } from '../lib/branch'
 import {
   GitHubRepository,
   hasWritePermission,
@@ -367,9 +367,9 @@ export class App extends React.Component<IAppProps, IAppState> {
         return this.props.dispatcher.showPopup({ type: PopupType.Preferences })
       case 'open-working-directory':
         return this.openCurrentRepositoryWorkingDirectory()
-      case 'update-branch':
+      case 'update-branch-with-contribution-target-branch':
         this.props.dispatcher.recordMenuInitiatedUpdate()
-        return this.updateBranch()
+        return this.updateBranchWithContributionTargetBranch()
       case 'compare-to-branch':
         return this.showHistory(true)
       case 'merge-branch':
@@ -551,7 +551,7 @@ export class App extends React.Component<IAppProps, IAppState> {
     return enterpriseAccount || null
   }
 
-  private updateBranch() {
+  private updateBranchWithContributionTargetBranch() {
     const { selectedState } = this.state
     if (
       selectedState == null ||
@@ -561,19 +561,20 @@ export class App extends React.Component<IAppProps, IAppState> {
     }
 
     const { state, repository } = selectedState
-    const defaultBranch = state.branchesState.defaultBranch
-    if (!defaultBranch) {
+    
+    const contributionTargetDefaultBranch = findContributionTargetDefaultBranch(repository, state.branchesState)
+    if (!contributionTargetDefaultBranch) {
       return
     }
 
     this.props.dispatcher.initializeMergeOperation(
       repository,
       false,
-      defaultBranch
+      contributionTargetDefaultBranch
     )
 
     const { mergeStatus } = state.compareState
-    this.props.dispatcher.mergeBranch(repository, defaultBranch, mergeStatus)
+    this.props.dispatcher.mergeBranch(repository, contributionTargetDefaultBranch, mergeStatus)
   }
 
   private mergeBranch(isSquash: boolean = false) {

From 95427cdd3afe649f7c7d645ae0bc1888edc92eb5 Mon Sep 17 00:00:00 2001
From: uttiya10 <56562649+uttiya10@users.noreply.github.com>
Date: Thu, 17 Mar 2022 16:18:37 -0400
Subject: [PATCH 09/88] LINT!

---
 app/src/ui/app.tsx | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/src/ui/app.tsx b/app/src/ui/app.tsx
index c22f34687e..a681003c05 100644
--- a/app/src/ui/app.tsx
+++ b/app/src/ui/app.tsx
@@ -105,7 +105,10 @@ import { TutorialStep, isValidTutorialStep } from '../models/tutorial-step'
 import { WorkflowPushRejectedDialog } from './workflow-push-rejected/workflow-push-rejected'
 import { SAMLReauthRequiredDialog } from './saml-reauth-required/saml-reauth-required'
 import { CreateForkDialog } from './forks/create-fork-dialog'
-import { findContributionTargetDefaultBranch, findDefaultUpstreamBranch } from '../lib/branch'
+import {
+  findContributionTargetDefaultBranch,
+  findDefaultUpstreamBranch,
+} from '../lib/branch'
 import {
   GitHubRepository,
   hasWritePermission,
@@ -561,8 +564,11 @@ export class App extends React.Component<IAppProps, IAppState> {
     }
 
     const { state, repository } = selectedState
-    
-    const contributionTargetDefaultBranch = findContributionTargetDefaultBranch(repository, state.branchesState)
+
+    const contributionTargetDefaultBranch = findContributionTargetDefaultBranch(
+      repository,
+      state.branchesState
+    )
     if (!contributionTargetDefaultBranch) {
       return
     }
@@ -574,7 +580,11 @@ export class App extends React.Component<IAppProps, IAppState> {
     )
 
     const { mergeStatus } = state.compareState
-    this.props.dispatcher.mergeBranch(repository, contributionTargetDefaultBranch, mergeStatus)
+    this.props.dispatcher.mergeBranch(
+      repository,
+      contributionTargetDefaultBranch,
+      mergeStatus
+    )
   }
 
   private mergeBranch(isSquash: boolean = false) {

From bcc3dd9a7c0a5790dd34c4e4079e889c9c5cd2f8 Mon Sep 17 00:00:00 2001
From: uttiya10 <56562649+uttiya10@users.noreply.github.com>
Date: Fri, 18 Mar 2022 14:32:34 -0400
Subject: [PATCH 10/88] Remove mutable variables

---
 app/src/lib/branch.ts | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/app/src/lib/branch.ts b/app/src/lib/branch.ts
index 46815f0a0d..052895dd8f 100644
--- a/app/src/lib/branch.ts
+++ b/app/src/lib/branch.ts
@@ -46,27 +46,21 @@ export function findDefaultUpstreamBranch(
 }
 
 /**
- * 
+ *
  * @param repository The repository to use.
  * @param branchesState The branches state of the repository.
  * @returns The default branch of the user's contribution target, or null if it's not known.
- * 
+ *
  * This method will return the fork's upstream default branch, if the user
  * is contributing to the parent repository.
- * 
+ *
  * Otherwise, this method will return the default branch of the passed in repository.
  */
 export function findContributionTargetDefaultBranch(
   repository: Repository,
-  branchesState: IBranchesState
+  { allBranches, defaultBranch }: IBranchesState
 ): Branch | null {
-  let contributionTargetDefaultBranch: Branch | null
-    if (isRepositoryWithGitHubRepository(repository)) {
-      contributionTargetDefaultBranch = findDefaultUpstreamBranch(
-        repository,
-        branchesState.allBranches
-      )
-    }
-    contributionTargetDefaultBranch ??= branchesState.defaultBranch
-    return contributionTargetDefaultBranch
+  return isRepositoryWithGitHubRepository(repository)
+    ? findDefaultUpstreamBranch(repository, allBranches) ?? defaultBranch
+    : defaultBranch
 }

From 5a234ea1a98ff8c392100b92a5b6cbe4502b83e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrique=20Corr=C3=AAa?=
 <75134774+HeCorr@users.noreply.github.com>
Date: Sun, 12 Jun 2022 18:56:12 -0300
Subject: [PATCH 11/88] bump description-scroll-view's max-height again

previously bumped from 61px to 69px on b8ee7244c5248ec22e31e04b4b9c9ba1264fdf37
---
 app/styles/ui/history/_commit-summary.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/styles/ui/history/_commit-summary.scss b/app/styles/ui/history/_commit-summary.scss
index 704ba0762e..50efb91f98 100644
--- a/app/styles/ui/history/_commit-summary.scss
+++ b/app/styles/ui/history/_commit-summary.scss
@@ -104,7 +104,7 @@
   &-description-scroll-view {
     overflow: hidden;
     // The extra pixel makes the space align up with the commit list.
-    max-height: 69px;
+    max-height: 70px;
     flex: 1;
   }
 

From 1335d18a3ea85c5aee758c5d25114953649b9bee Mon Sep 17 00:00:00 2001
From: Sergio Padrino <sergio.padrino@gmail.com>
Date: Thu, 16 Jun 2022 17:21:12 +0200
Subject: [PATCH 12/88] Verify sender of IPC messages

---
 app/src/main-process/ipc-main.ts | 75 +++++++++++++++++++++++++-------
 1 file changed, 59 insertions(+), 16 deletions(-)

diff --git a/app/src/main-process/ipc-main.ts b/app/src/main-process/ipc-main.ts
index 1260ccfa25..634b0abf8b 100644
--- a/app/src/main-process/ipc-main.ts
+++ b/app/src/main-process/ipc-main.ts
@@ -1,7 +1,19 @@
 import { RequestChannels, RequestResponseChannels } from '../lib/ipc-shared'
 // eslint-disable-next-line no-restricted-imports
-import { ipcMain } from 'electron'
+import { ipcMain, app } from 'electron'
 import { IpcMainEvent, IpcMainInvokeEvent } from 'electron/main'
+import * as path from 'path'
+import * as url from 'url'
+
+type RequestChannelListener<T extends keyof RequestChannels> = (
+  event: IpcMainEvent,
+  ...args: Parameters<RequestChannels[T]>
+) => void
+
+type RequestResponseChannelListener<T extends keyof RequestResponseChannels> = (
+  event: IpcMainInvokeEvent,
+  ...args: Parameters<RequestResponseChannels[T]>
+) => ReturnType<RequestResponseChannels[T]>
 
 /**
  * Subscribes to the specified IPC channel and provides strong typing of
@@ -10,12 +22,9 @@ import { IpcMainEvent, IpcMainInvokeEvent } from 'electron/main'
  */
 export function on<T extends keyof RequestChannels>(
   channel: T,
-  listener: (
-    event: IpcMainEvent,
-    ...args: Parameters<RequestChannels[T]>
-  ) => void
+  listener: RequestChannelListener<T>
 ) {
-  ipcMain.on(channel, (event, ...args) => listener(event, ...(args as any)))
+  withVerifiedRequestSender(ipcMain.on, channel, listener)
 }
 
 /**
@@ -25,12 +34,9 @@ export function on<T extends keyof RequestChannels>(
  */
 export function once<T extends keyof RequestChannels>(
   channel: T,
-  listener: (
-    event: IpcMainEvent,
-    ...args: Parameters<RequestChannels[T]>
-  ) => void
+  listener: RequestChannelListener<T>
 ) {
-  ipcMain.once(channel, (event, ...args) => listener(event, ...(args as any)))
+  withVerifiedRequestSender(ipcMain.once, channel, listener)
 }
 
 /**
@@ -40,10 +46,47 @@ export function once<T extends keyof RequestChannels>(
  */
 export function handle<T extends keyof RequestResponseChannels>(
   channel: T,
-  listener: (
-    event: IpcMainInvokeEvent,
-    ...args: Parameters<RequestResponseChannels[T]>
-  ) => ReturnType<RequestResponseChannels[T]>
+  listener: RequestResponseChannelListener<T>
 ) {
-  ipcMain.handle(channel, (event, ...args) => listener(event, ...(args as any)))
+  withVerifiedRequestResponseSender(ipcMain.handle, channel, listener)
+}
+
+function withVerifiedRequestSender<T extends keyof RequestChannels>(
+  ipcFunction: typeof ipcMain.on | typeof ipcMain.once,
+  channel: T,
+  listener: RequestChannelListener<T>
+) {
+  ipcFunction(channel, (event, ...args) => {
+    if (isValidSender(event.senderFrame.url)) {
+      log.error(
+        `IPC request channel ${channel} called from invalid sender: ${event.senderFrame.url}`
+      )
+      return
+    }
+    return listener(event, ...(args as any))
+  })
+}
+
+function withVerifiedRequestResponseSender<
+  T extends keyof RequestResponseChannels
+>(
+  ipcFunction: typeof ipcMain.handle,
+  channel: T,
+  listener: RequestResponseChannelListener<T>
+) {
+  ipcFunction(channel, (event, ...args) => {
+    if (isValidSender(event.senderFrame.url)) {
+      log.error(
+        `IPC request-response channel ${channel} called from invalid sender: ${event.senderFrame.url}`
+      )
+      return
+    }
+    return listener(event, ...(args as any))
+  })
+}
+
+function isValidSender(senderUrl: string) {
+  const validSenderPath = path.join(app.getAppPath(), 'index.html')
+  const validSenderUrl = url.pathToFileURL(validSenderPath).toString()
+  return senderUrl === validSenderUrl
 }

From 81e72951c95881f80ac2274d946728feaf0be872 Mon Sep 17 00:00:00 2001
From: Sergio Padrino <sergio.padrino@gmail.com>
Date: Fri, 17 Jun 2022 13:02:33 +0200
Subject: [PATCH 13/88] Use a cleaner approach (that works)

---
 app/src/main-process/ipc-main.ts | 52 ++++++++------------------------
 1 file changed, 13 insertions(+), 39 deletions(-)

diff --git a/app/src/main-process/ipc-main.ts b/app/src/main-process/ipc-main.ts
index 634b0abf8b..d28e539c8d 100644
--- a/app/src/main-process/ipc-main.ts
+++ b/app/src/main-process/ipc-main.ts
@@ -1,9 +1,8 @@
 import { RequestChannels, RequestResponseChannels } from '../lib/ipc-shared'
 // eslint-disable-next-line no-restricted-imports
-import { ipcMain, app } from 'electron'
+import { ipcMain } from 'electron'
 import { IpcMainEvent, IpcMainInvokeEvent } from 'electron/main'
-import * as path from 'path'
-import * as url from 'url'
+import { encodePathAsUrl } from '../lib/path'
 
 type RequestChannelListener<T extends keyof RequestChannels> = (
   event: IpcMainEvent,
@@ -24,7 +23,7 @@ export function on<T extends keyof RequestChannels>(
   channel: T,
   listener: RequestChannelListener<T>
 ) {
-  withVerifiedRequestSender(ipcMain.on, channel, listener)
+  ipcMain.on(channel, safeListener(listener))
 }
 
 /**
@@ -36,7 +35,7 @@ export function once<T extends keyof RequestChannels>(
   channel: T,
   listener: RequestChannelListener<T>
 ) {
-  withVerifiedRequestSender(ipcMain.once, channel, listener)
+  ipcMain.once(channel, safeListener(listener))
 }
 
 /**
@@ -48,45 +47,20 @@ export function handle<T extends keyof RequestResponseChannels>(
   channel: T,
   listener: RequestResponseChannelListener<T>
 ) {
-  withVerifiedRequestResponseSender(ipcMain.handle, channel, listener)
+  ipcMain.handle(channel, safeListener(listener))
 }
 
-function withVerifiedRequestSender<T extends keyof RequestChannels>(
-  ipcFunction: typeof ipcMain.on | typeof ipcMain.once,
-  channel: T,
-  listener: RequestChannelListener<T>
-) {
-  ipcFunction(channel, (event, ...args) => {
-    if (isValidSender(event.senderFrame.url)) {
+const validSenderUrl = encodePathAsUrl(__dirname, 'index.html').toString()
+
+function safeListener(listener: (...args: any[]) => any) {
+  return (event: IpcMainEvent | IpcMainInvokeEvent, ...args: any[]) => {
+    if (event.senderFrame.url !== validSenderUrl) {
       log.error(
-        `IPC request channel ${channel} called from invalid sender: ${event.senderFrame.url}`
+        `IPC message received from invalid sender: ${event.senderFrame.url}`
       )
       return
     }
-    return listener(event, ...(args as any))
-  })
-}
 
-function withVerifiedRequestResponseSender<
-  T extends keyof RequestResponseChannels
->(
-  ipcFunction: typeof ipcMain.handle,
-  channel: T,
-  listener: RequestResponseChannelListener<T>
-) {
-  ipcFunction(channel, (event, ...args) => {
-    if (isValidSender(event.senderFrame.url)) {
-      log.error(
-        `IPC request-response channel ${channel} called from invalid sender: ${event.senderFrame.url}`
-      )
-      return
-    }
-    return listener(event, ...(args as any))
-  })
-}
-
-function isValidSender(senderUrl: string) {
-  const validSenderPath = path.join(app.getAppPath(), 'index.html')
-  const validSenderUrl = url.pathToFileURL(validSenderPath).toString()
-  return senderUrl === validSenderUrl
+    return listener(event, ...args)
+  }
 }

From a37d2e18f11af9b6996479047d9c98d741c77a15 Mon Sep 17 00:00:00 2001
From: tidy-dev <tidy-dev@github.com>
Date: Thu, 2 Jun 2022 10:01:59 -0400
Subject: [PATCH 14/88] Get shas in the diff

---
 app/src/lib/app-state.ts                     | 19 ++++++++
 app/src/lib/git/log.ts                       |  7 +++
 app/src/lib/stores/app-store.ts              | 46 +++++++++++++++++++-
 app/src/lib/stores/repository-state-cache.ts |  1 +
 4 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/app/src/lib/app-state.ts b/app/src/lib/app-state.ts
index d02694c324..cd5a3fc421 100644
--- a/app/src/lib/app-state.ts
+++ b/app/src/lib/app-state.ts
@@ -553,6 +553,25 @@ export interface ICommitSelection {
   /** The commits currently selected in the app */
   readonly shas: ReadonlyArray<string>
 
+  /**
+   * When multiple commits are selected, the diff is created using the rev range
+   * of firstSha^..lastSha in the selected shas. Thus comparing the trees of the
+   * the lastSha and the first parent of the first sha. However, our history
+   * list shows commits in chronological order. Thus, when a branch is merged,
+   * the commits from that branch are injected in their chronological order into
+   * the history list. Therefore, given a branch history of A, B, C, D,
+   * MergeCommit where B and C are from the merged branch, diffing on the
+   * selection of A through D would not have the changes from B an C.
+   *
+   * This is a list of the shas that are reachable by following the parent links
+   * (aka the graph) from the lastSha to the firstSha^ in the selection.
+   *
+   * Other notes: Given a selection A through D, executing `git diff A..D` would
+   * give us the changes since A but not including A; since the user will have
+   * selected A, we do `git diff A^..D` so that we include the changes of A.
+   * */
+  readonly shasInDiff: ReadonlyArray<string>
+
   /**
    * Whether the a selection of commits are group of adjacent to each other.
    * Example: Given these are indexes of sha's in history, 3, 4, 5, 6 is contiguous as
diff --git a/app/src/lib/git/log.ts b/app/src/lib/git/log.ts
index b415705f49..2c8213e198 100644
--- a/app/src/lib/git/log.ts
+++ b/app/src/lib/git/log.ts
@@ -302,3 +302,10 @@ export async function doMergeCommitsExistAfterCommit(
 
   return mergeCommits.length > 0
 }
+
+export async function getParentSha(repository: Repository, sha: string) {
+  const args = ['log', '-1', '--format=%P', sha, '--']
+
+  const result = await git(args, repository.path, 'getParentSha')
+  return result.stdout.trim()
+}
diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts
index 3bc0ff1659..a6afbfba33 100644
--- a/app/src/lib/stores/app-store.ts
+++ b/app/src/lib/stores/app-store.ts
@@ -1114,7 +1114,8 @@ export class AppStore extends TypedBaseStore<IAppState> {
     shas: ReadonlyArray<string>,
     isContiguous: boolean
   ): Promise<void> {
-    const { commitSelection } = this.repositoryStateCache.get(repository)
+    const { commitSelection, commitLookup } =
+      this.repositoryStateCache.get(repository)
 
     if (
       commitSelection.shas.length === shas.length &&
@@ -1123,8 +1124,11 @@ export class AppStore extends TypedBaseStore<IAppState> {
       return
     }
 
+    const shasInDiff = this.getShasInDiff(shas, isContiguous, commitLookup)
+
     this.repositoryStateCache.updateCommitSelection(repository, () => ({
       shas,
+      shasInDiff,
       isContiguous,
       file: null,
       changesetData: { files: [], linesAdded: 0, linesDeleted: 0 },
@@ -1134,6 +1138,46 @@ export class AppStore extends TypedBaseStore<IAppState> {
     this.emitUpdate()
   }
 
+  private getShasInDiff(
+    shas: ReadonlyArray<string>,
+    isContiguous: boolean,
+    commitLookup: Map<string, Commit>
+  ) {
+    const shasInDiff = new Array<string>()
+
+    if (shas.length <= 1 || !isContiguous) {
+      return shasInDiff
+    }
+
+    let currentSha = shas.at(-1)
+
+    if (currentSha === undefined) {
+      // shouldn't happen - typing check
+      return shasInDiff
+    }
+
+    let traversing = true
+    while (traversing) {
+      shasInDiff.push(currentSha)
+      const commit = commitLookup.get(currentSha)
+      if (commit === undefined) {
+        // shouldn't happen - shas are selection of history which should be in lookup
+        traversing = false
+        continue
+      }
+
+      const firstParent = commit.parentSHAs[0]
+      const parent = shas.find(sha => sha === firstParent)
+      if (parent === undefined) {
+        traversing = false
+        continue
+      }
+      currentSha = parent
+    }
+
+    return shasInDiff
+  }
+
   private updateOrSelectFirstCommit(
     repository: Repository,
     commitSHAs: ReadonlyArray<string>
diff --git a/app/src/lib/stores/repository-state-cache.ts b/app/src/lib/stores/repository-state-cache.ts
index d7e2586657..58d3eb8e72 100644
--- a/app/src/lib/stores/repository-state-cache.ts
+++ b/app/src/lib/stores/repository-state-cache.ts
@@ -178,6 +178,7 @@ function getInitialRepositoryState(): IRepositoryState {
   return {
     commitSelection: {
       shas: [],
+      shasInDiff: [],
       isContiguous: true,
       file: null,
       changesetData: { files: [], linesAdded: 0, linesDeleted: 0 },

From e1bc4ec043689526726f5b6ed82d782ac1e71748 Mon Sep 17 00:00:00 2001
From: tidy-dev <tidy-dev@github.com>
Date: Thu, 2 Jun 2022 10:06:25 -0400
Subject: [PATCH 15/88] Rename selectedCommit file

---
 app/src/ui/history/index.ts                                     | 2 +-
 .../ui/history/{selected-commit.tsx => selected-commits.tsx}    | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename app/src/ui/history/{selected-commit.tsx => selected-commits.tsx} (100%)

diff --git a/app/src/ui/history/index.ts b/app/src/ui/history/index.ts
index 7603ced06a..f4fabb6e82 100644
--- a/app/src/ui/history/index.ts
+++ b/app/src/ui/history/index.ts
@@ -1,2 +1,2 @@
-export { SelectedCommits } from './selected-commit'
+export { SelectedCommits } from './selected-commits'
 export { CompareSidebar } from './compare'
diff --git a/app/src/ui/history/selected-commit.tsx b/app/src/ui/history/selected-commits.tsx
similarity index 100%
rename from app/src/ui/history/selected-commit.tsx
rename to app/src/ui/history/selected-commits.tsx

From c8cebdb62163c026bc321cef1604459077d46a0a Mon Sep 17 00:00:00 2001
From: tidy-dev <tidy-dev@github.com>
Date: Thu, 2 Jun 2022 10:09:26 -0400
Subject: [PATCH 16/88] Rename variable commits to selectedCommits

---
 app/src/ui/history/commit-summary.tsx   | 38 +++++++++++++------------
 app/src/ui/history/selected-commits.tsx |  2 +-
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/app/src/ui/history/commit-summary.tsx b/app/src/ui/history/commit-summary.tsx
index f16c83a66a..643da30260 100644
--- a/app/src/ui/history/commit-summary.tsx
+++ b/app/src/ui/history/commit-summary.tsx
@@ -22,7 +22,7 @@ import _ from 'lodash'
 
 interface ICommitSummaryProps {
   readonly repository: Repository
-  readonly commits: ReadonlyArray<Commit>
+  readonly selectedCommits: ReadonlyArray<Commit>
   readonly changesetData: IChangesetData
   readonly emoji: Map<string, string>
 
@@ -99,12 +99,12 @@ function createState(
   isOverflowed: boolean,
   props: ICommitSummaryProps
 ): ICommitSummaryState {
-  const { emoji, repository, commits } = props
+  const { emoji, repository, selectedCommits } = props
   const tokenizer = new Tokenizer(emoji, repository)
 
   const plainTextBody =
-    commits.length > 1
-      ? commits
+    selectedCommits.length > 1
+      ? selectedCommits
           .map(
             c =>
               `${c.shortSha} - ${c.summary}${
@@ -112,15 +112,15 @@ function createState(
               }`
           )
           .join('\n\n')
-      : commits[0].body
+      : selectedCommits[0].body
 
   const { summary, body } = wrapRichTextCommitMessage(
-    commits[0].summary,
+    selectedCommits[0].summary,
     plainTextBody,
     tokenizer
   )
 
-  const allAvatarUsers = commits.flatMap(c =>
+  const allAvatarUsers = selectedCommits.flatMap(c =>
     getAvatarUsersForCommit(repository.gitHubRepository, c)
   )
   const avatarUsers = _.uniqWith(
@@ -260,9 +260,9 @@ export class CommitSummary extends React.Component<
 
   public componentWillUpdate(nextProps: ICommitSummaryProps) {
     if (
-      nextProps.commits.length !== this.props.commits.length ||
-      !nextProps.commits.every((nextCommit, i) =>
-        messageEquals(nextCommit, this.props.commits[i])
+      nextProps.selectedCommits.length !== this.props.selectedCommits.length ||
+      !nextProps.selectedCommits.every((nextCommit, i) =>
+        messageEquals(nextCommit, this.props.selectedCommits[i])
       )
     ) {
       this.setState(createState(false, nextProps))
@@ -316,14 +316,16 @@ export class CommitSummary extends React.Component<
   }
 
   private getShaRef = (useShortSha?: boolean) => {
-    const { commits } = this.props
-    const oldest = useShortSha ? commits[0].shortSha : commits[0].sha
+    const { selectedCommits } = this.props
+    const oldest = useShortSha
+      ? selectedCommits[0].shortSha
+      : selectedCommits[0].sha
 
-    if (commits.length === 1) {
+    if (selectedCommits.length === 1) {
       return oldest
     }
 
-    const latestCommit = commits.at(-1)
+    const latestCommit = selectedCommits.at(-1)
     const latest = useShortSha ? latestCommit?.shortSha : latestCommit?.sha
 
     return `${oldest}^..${latest}`
@@ -340,8 +342,8 @@ export class CommitSummary extends React.Component<
     const hasEmptySummary = this.state.summary.length === 0
     const commitSummary = hasEmptySummary
       ? 'Empty commit message'
-      : this.props.commits.length > 1
-      ? `Viewing the diff of ${this.props.commits.length} commits`
+      : this.props.selectedCommits.length > 1
+      ? `Viewing the diff of ${this.props.selectedCommits.length} commits`
       : this.state.summary
 
     const summaryClassNames = classNames('commit-summary-title', {
@@ -366,7 +368,7 @@ export class CommitSummary extends React.Component<
               <AvatarStack users={this.state.avatarUsers} />
               <CommitAttribution
                 gitHubRepository={this.props.repository.gitHubRepository}
-                commits={this.props.commits}
+                commits={this.props.selectedCommits}
               />
             </li>
 
@@ -528,7 +530,7 @@ export class CommitSummary extends React.Component<
   }
 
   private renderTags() {
-    const tags = this.props.commits.flatMap(c => c.tags) || []
+    const tags = this.props.selectedCommits.flatMap(c => c.tags) || []
 
     if (tags.length === 0) {
       return null
diff --git a/app/src/ui/history/selected-commits.tsx b/app/src/ui/history/selected-commits.tsx
index 3b31b63dff..d8c2673d5a 100644
--- a/app/src/ui/history/selected-commits.tsx
+++ b/app/src/ui/history/selected-commits.tsx
@@ -166,7 +166,7 @@ export class SelectedCommits extends React.Component<
   private renderCommitSummary(commits: ReadonlyArray<Commit>) {
     return (
       <CommitSummary
-        commits={commits}
+        selectedCommits={commits}
         changesetData={this.props.changesetData}
         emoji={this.props.emoji}
         repository={this.props.repository}

From fa383f8f3e2ee917a07fdf2f5c3f6cc28af694eb Mon Sep 17 00:00:00 2001
From: tidy-dev <tidy-dev@github.com>
Date: Thu, 2 Jun 2022 10:14:46 -0400
Subject: [PATCH 17/88] Pass shas in diff down to commit summary

---
 app/src/ui/history/commit-summary.tsx   | 1 +
 app/src/ui/history/selected-commits.tsx | 2 ++
 app/src/ui/repository.tsx               | 4 +++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/ui/history/commit-summary.tsx b/app/src/ui/history/commit-summary.tsx
index 643da30260..14cd84acad 100644
--- a/app/src/ui/history/commit-summary.tsx
+++ b/app/src/ui/history/commit-summary.tsx
@@ -23,6 +23,7 @@ import _ from 'lodash'
 interface ICommitSummaryProps {
   readonly repository: Repository
   readonly selectedCommits: ReadonlyArray<Commit>
+  readonly shasInDiff: ReadonlyArray<string>
   readonly changesetData: IChangesetData
   readonly emoji: Map<string, string>
 
diff --git a/app/src/ui/history/selected-commits.tsx b/app/src/ui/history/selected-commits.tsx
index d8c2673d5a..db7214193c 100644
--- a/app/src/ui/history/selected-commits.tsx
+++ b/app/src/ui/history/selected-commits.tsx
@@ -42,6 +42,7 @@ interface ISelectedCommitsProps {
   readonly dispatcher: Dispatcher
   readonly emoji: Map<string, string>
   readonly selectedCommits: ReadonlyArray<Commit>
+  readonly shasInDiff: ReadonlyArray<string>
   readonly localCommitSHAs: ReadonlyArray<string>
   readonly changesetData: IChangesetData
   readonly selectedFile: CommittedFileChange | null
@@ -167,6 +168,7 @@ export class SelectedCommits extends React.Component<
     return (
       <CommitSummary
         selectedCommits={commits}
+        shasInDiff={this.props.shasInDiff}
         changesetData={this.props.changesetData}
         emoji={this.props.emoji}
         repository={this.props.repository}
diff --git a/app/src/ui/repository.tsx b/app/src/ui/repository.tsx
index 9d9ac732c0..b8ae492fdd 100644
--- a/app/src/ui/repository.tsx
+++ b/app/src/ui/repository.tsx
@@ -373,7 +373,8 @@ export class RepositoryView extends React.Component<
 
   private renderContentForHistory(): JSX.Element {
     const { commitSelection, commitLookup, localCommitSHAs } = this.props.state
-    const { changesetData, file, diff, shas, isContiguous } = commitSelection
+    const { changesetData, file, diff, shas, shasInDiff, isContiguous } =
+      commitSelection
 
     const selectedCommits = []
     for (const sha of shas) {
@@ -393,6 +394,7 @@ export class RepositoryView extends React.Component<
         isLocalRepository={this.props.state.remote === null}
         dispatcher={this.props.dispatcher}
         selectedCommits={selectedCommits}
+        shasInDiff={shasInDiff}
         isContiguous={isContiguous}
         localCommitSHAs={localCommitSHAs}
         changesetData={changesetData}

From d72be142f7e6d7d0f1d944ccacd0e9c0ffe9a4e2 Mon Sep 17 00:00:00 2001
From: tidy-dev <tidy-dev@github.com>
Date: Tue, 21 Jun 2022 11:56:15 -0400
Subject: [PATCH 18/88] Refactor rendering/getting commit summary title

---
 app/src/ui/history/commit-summary.tsx | 72 +++++++++++++++++----------
 1 file changed, 47 insertions(+), 25 deletions(-)

diff --git a/app/src/ui/history/commit-summary.tsx b/app/src/ui/history/commit-summary.tsx
index 14cd84acad..7198f958a8 100644
--- a/app/src/ui/history/commit-summary.tsx
+++ b/app/src/ui/history/commit-summary.tsx
@@ -63,6 +63,11 @@ interface ICommitSummaryState {
    */
   readonly summary: ReadonlyArray<TokenResult>
 
+  /**
+   * Whether the commit summary was empty.
+   */
+  readonly hasEmptySummary: boolean
+
   /**
    * The commit message body, i.e. anything after the first line of text in the
    * commit message. Note that this may differ from the body property in the
@@ -100,36 +105,60 @@ function createState(
   isOverflowed: boolean,
   props: ICommitSummaryProps
 ): ICommitSummaryState {
-  const { emoji, repository, selectedCommits } = props
+  const { emoji, repository, selectedCommits, shasInDiff } = props
   const tokenizer = new Tokenizer(emoji, repository)
 
-  const plainTextBody =
-    selectedCommits.length > 1
-      ? selectedCommits
-          .map(
-            c =>
-              `${c.shortSha} - ${c.summary}${
-                c.body.trim() !== '' ? `\n${c.body}` : ''
-              }`
-          )
-          .join('\n\n')
-      : selectedCommits[0].body
-
   const { summary, body } = wrapRichTextCommitMessage(
-    selectedCommits[0].summary,
-    plainTextBody,
+    getCommitSummary(selectedCommits, shasInDiff),
+    selectedCommits[0].body,
     tokenizer
   )
 
+  const hasEmptySummary =
+    selectedCommits.length === 1 && selectedCommits[0].summary.length === 0
+
   const allAvatarUsers = selectedCommits.flatMap(c =>
     getAvatarUsersForCommit(repository.gitHubRepository, c)
   )
+
   const avatarUsers = _.uniqWith(
     allAvatarUsers,
     (a, b) => a.email === b.email && a.name === b.name
   )
 
-  return { isOverflowed, summary, body, avatarUsers }
+  return { isOverflowed, summary, body, avatarUsers, hasEmptySummary }
+}
+
+function getCommitSummary(
+  selectedCommits: ReadonlyArray<Commit>,
+  shasInDiff: ReadonlyArray<string>
+) {
+  if (selectedCommits.length === 1) {
+    return selectedCommits[0].summary.length === 0
+      ? 'Empty commit message'
+      : selectedCommits[0].summary
+  }
+
+  const numInDiff =
+    selectedCommits.length -
+    getCountCommitsNotInDiff(selectedCommits, shasInDiff)
+
+  return `Showing changes from ${numInDiff} commits`
+}
+
+function getCountCommitsNotInDiff(
+  selectedCommits: ReadonlyArray<Commit>,
+  shasInDiff: ReadonlyArray<string>
+) {
+  if (selectedCommits.length === 1) {
+    return 0
+  }
+
+  const excludedCommits = selectedCommits.filter(
+    ({ sha }) => !shasInDiff.includes(sha)
+  )
+
+  return excludedCommits.length
 }
 
 /**
@@ -340,13 +369,7 @@ export class CommitSummary extends React.Component<
       'hide-description-border': this.props.hideDescriptionBorder,
     })
 
-    const hasEmptySummary = this.state.summary.length === 0
-    const commitSummary = hasEmptySummary
-      ? 'Empty commit message'
-      : this.props.selectedCommits.length > 1
-      ? `Viewing the diff of ${this.props.selectedCommits.length} commits`
-      : this.state.summary
-
+    const { summary, hasEmptySummary } = this.state
     const summaryClassNames = classNames('commit-summary-title', {
       'empty-summary': hasEmptySummary,
     })
@@ -358,9 +381,8 @@ export class CommitSummary extends React.Component<
             className={summaryClassNames}
             emoji={this.props.emoji}
             repository={this.props.repository}
-            text={commitSummary}
+            text={summary}
           />
-
           <ul className="commit-summary-meta">
             <li
               className="commit-summary-meta-item without-truncation"

From 967cb7967b111623714e14c5e8c88760a468e5de Mon Sep 17 00:00:00 2001
From: tidy-dev <tidy-dev@github.com>
Date: Tue, 21 Jun 2022 13:20:30 -0400
Subject: [PATCH 19/88] Add unreachable commit warning

---
 app/src/ui/history/commit-summary.tsx      | 25 ++++++++++++++++++++++
 app/styles/ui/history/_commit-summary.scss | 15 +++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/app/src/ui/history/commit-summary.tsx b/app/src/ui/history/commit-summary.tsx
index 7198f958a8..2d89adf6a3 100644
--- a/app/src/ui/history/commit-summary.tsx
+++ b/app/src/ui/history/commit-summary.tsx
@@ -19,6 +19,7 @@ import { clipboard } from 'electron'
 import { TooltipDirection } from '../lib/tooltip'
 import { AppFileStatusKind } from '../../models/status'
 import _ from 'lodash'
+import { LinkButton } from '../lib/link-button'
 
 interface ICommitSummaryProps {
   readonly repository: Repository
@@ -361,6 +362,29 @@ export class CommitSummary extends React.Component<
     return `${oldest}^..${latest}`
   }
 
+  private renderCommitsNotReachable = () => {
+    const { selectedCommits, shasInDiff } = this.props
+    if (selectedCommits.length === 1) {
+      return
+    }
+
+    const excludedCommitsCount = getCountCommitsNotInDiff(
+      selectedCommits,
+      shasInDiff
+    )
+
+    if (excludedCommitsCount === 0) {
+      return
+    }
+
+    return (
+      <div className="commit-unreachable-info">
+        <Octicon symbol={OcticonSymbol.info} /> {excludedCommitsCount}{' '}
+        unreachable commits not included. <LinkButton>Learn why</LinkButton>
+      </div>
+    )
+  }
+
   public render() {
     const className = classNames({
       expanded: this.props.isExpanded,
@@ -436,6 +460,7 @@ export class CommitSummary extends React.Component<
         </div>
 
         {this.renderDescription()}
+        {this.renderCommitsNotReachable()}
       </div>
     )
   }
diff --git a/app/styles/ui/history/_commit-summary.scss b/app/styles/ui/history/_commit-summary.scss
index 704ba0762e..c0268b5b0f 100644
--- a/app/styles/ui/history/_commit-summary.scss
+++ b/app/styles/ui/history/_commit-summary.scss
@@ -60,6 +60,21 @@
       }
     }
   }
+
+  .commit-unreachable-info {
+    padding: var(--spacing-half) var(--spacing);
+    border-bottom: var(--base-border);
+    display: flex;
+    align-items: center;
+
+    .octicon {
+      margin-right: var(--spacing-half);
+    }
+
+    .link-button-component {
+      margin-left: var(--spacing-half);
+    }
+  }
 }
 
 // NOTE: This isn't a real class, it's an SCSS hack to allow us to only write

From 7148bce0e163001b999ecb8e0c3fd52344aac483 Mon Sep 17 00:00:00 2001
From: tidy-dev <tidy-dev@github.com>
Date: Tue, 21 Jun 2022 14:00:15 -0400
Subject: [PATCH 20/88] docs

---
 app/src/lib/stores/app-store.ts | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts
index a6afbfba33..94e7e41a8f 100644
--- a/app/src/lib/stores/app-store.ts
+++ b/app/src/lib/stores/app-store.ts
@@ -1138,6 +1138,21 @@ export class AppStore extends TypedBaseStore<IAppState> {
     this.emitUpdate()
   }
 
+  /**
+   * When multiple commits are selected, the diff is created using the rev range
+   * of firstSha^..lastSha in the selected shas. Thus comparing the trees of the
+   * the lastSha and the first parent of the first sha. However, our history
+   * list shows commits in chronological order. Thus, when a branch is merged,
+   * the commits from that branch are injected in their chronological order into
+   * the history list. Therefore, given a branch history of A, B, C, D,
+   * MergeCommit where B and C are from the merged branch, diffing on the
+   * selection of A through D would not have the changes from B an C.
+   *
+   * This method traverses the ancestral path from the last commit in the
+   * selection back to the first commit via checking the first parent. The
+   * commits on this path are the commits whose changes will be seen in the
+   * diff. This is equivalent to doing `git rev-list firstSha^..lastSha`.
+   */
   private getShasInDiff(
     shas: ReadonlyArray<string>,
     isContiguous: boolean,

From 4d4f77632410342be37fdaad481ee987c28dec0f Mon Sep 17 00:00:00 2001
From: naveen <172697+naveensrinivasan@users.noreply.github.com>
Date: Wed, 22 Jun 2022 01:32:00 +0000
Subject: [PATCH 21/88] chore: Included githubactions in the dependabot config

This should help with keeping the GitHub actions updated on new releases. This will also help with keeping it secure.

Dependabot helps in keeping the supply chain secure https://docs.github.com/en/code-security/dependabot

GitHub actions up to date https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot

https://github.com/ossf/scorecard/blob/main/docs/checks.md#dependency-update-tool
Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.github.com>
---
 .github/dependabot.yml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000000..5ace4600a1
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

From 33b1269eb978ab90a970cbef5f201e787e209568 Mon Sep 17 00:00:00 2001
From: Sergio Padrino <sergio.padrino@gmail.com>
Date: Wed, 22 Jun 2022 12:02:25 +0200
Subject: [PATCH 22/88] Use the process' webContents id to verify IPC sender

---
 app/src/main-process/app-window.ts            |  4 ++++
 app/src/main-process/crash-window.ts          |  4 ++++
 app/src/main-process/ipc-main.ts              | 19 +++++++++++++------
 app/src/main-process/main.ts                  |  2 +-
 .../main-process/show-uncaught-exception.ts   | 18 +++++++++---------
 5 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/app/src/main-process/app-window.ts b/app/src/main-process/app-window.ts
index 54fff826f0..82a14f95e3 100644
--- a/app/src/main-process/app-window.ts
+++ b/app/src/main-process/app-window.ts
@@ -211,6 +211,10 @@ export class AppWindow {
     return !!this.loadTime && !!this.rendererReadyTime
   }
 
+  public get webContentsId(): number {
+    return this.window.webContents.id
+  }
+
   public onClose(fn: () => void) {
     this.window.on('closed', fn)
   }
diff --git a/app/src/main-process/crash-window.ts b/app/src/main-process/crash-window.ts
index 3a934d0589..250f372cd3 100644
--- a/app/src/main-process/crash-window.ts
+++ b/app/src/main-process/crash-window.ts
@@ -56,6 +56,10 @@ export class CrashWindow {
     this.errorType = errorType
   }
 
+  public get webContentsId(): number {
+    return this.window.webContents.id
+  }
+
   public load() {
     log.debug('Starting crash process')
 
diff --git a/app/src/main-process/ipc-main.ts b/app/src/main-process/ipc-main.ts
index d28e539c8d..92e3f16561 100644
--- a/app/src/main-process/ipc-main.ts
+++ b/app/src/main-process/ipc-main.ts
@@ -2,7 +2,8 @@ import { RequestChannels, RequestResponseChannels } from '../lib/ipc-shared'
 // eslint-disable-next-line no-restricted-imports
 import { ipcMain } from 'electron'
 import { IpcMainEvent, IpcMainInvokeEvent } from 'electron/main'
-import { encodePathAsUrl } from '../lib/path'
+import { mainWindow } from './main'
+import { crashWindow } from './show-uncaught-exception'
 
 type RequestChannelListener<T extends keyof RequestChannels> = (
   event: IpcMainEvent,
@@ -50,11 +51,17 @@ export function handle<T extends keyof RequestResponseChannels>(
   ipcMain.handle(channel, safeListener(listener))
 }
 
-const validSenderUrl = encodePathAsUrl(__dirname, 'index.html').toString()
-
-function safeListener(listener: (...args: any[]) => any) {
-  return (event: IpcMainEvent | IpcMainInvokeEvent, ...args: any[]) => {
-    if (event.senderFrame.url !== validSenderUrl) {
+function safeListener<E extends IpcMainEvent | IpcMainInvokeEvent, R>(
+  listener: (event: E, ...a: any) => R
+) {
+  return (event: E, ...args: any) => {
+    const senderId = event.sender.id
+    // TODO: replace these ternary checks with optional chaining. We couldn't
+    // do that at the time of writing this because of a bug in Webpack <5.71.0:
+    // https://github.com/webpack/webpack/issues/12960
+    const rendererId = mainWindow ? mainWindow.webContentsId : null
+    const crashId = crashWindow ? crashWindow.webContentsId : null
+    if (![rendererId, crashId].includes(senderId)) {
       log.error(
         `IPC message received from invalid sender: ${event.senderFrame.url}`
       )
diff --git a/app/src/main-process/main.ts b/app/src/main-process/main.ts
index 114480145f..64c1581465 100644
--- a/app/src/main-process/main.ts
+++ b/app/src/main-process/main.ts
@@ -50,7 +50,7 @@ import { initializeDesktopNotifications } from './notifications'
 app.setAppLogsPath()
 enableSourceMaps()
 
-let mainWindow: AppWindow | null = null
+export let mainWindow: AppWindow | null = null
 
 const launchTime = now()
 
diff --git a/app/src/main-process/show-uncaught-exception.ts b/app/src/main-process/show-uncaught-exception.ts
index e5b5c3151c..c2f041a265 100644
--- a/app/src/main-process/show-uncaught-exception.ts
+++ b/app/src/main-process/show-uncaught-exception.ts
@@ -3,6 +3,7 @@ import { setCrashMenu } from './menu'
 import { formatError } from '../lib/logging/format-error'
 import { CrashWindow } from './crash-window'
 
+export let crashWindow: CrashWindow | null = null
 let hasReportedUncaughtException = false
 
 /** Show the uncaught exception UI. */
@@ -17,16 +18,13 @@ export function showUncaughtException(isLaunchError: boolean, error: Error) {
 
   setCrashMenu()
 
-  const crashWindow = new CrashWindow(
-    isLaunchError ? 'launch' : 'generic',
-    error
-  )
+  const window = new CrashWindow(isLaunchError ? 'launch' : 'generic', error)
 
-  crashWindow.onDidLoad(() => {
-    crashWindow.show()
+  window.onDidLoad(() => {
+    window.show()
   })
 
-  crashWindow.onFailedToLoad(async () => {
+  window.onFailedToLoad(async () => {
     await dialog.showMessageBox({
       type: 'error',
       title: __DARWIN__ ? `Unrecoverable Error` : 'Unrecoverable error',
@@ -44,12 +42,14 @@ export function showUncaughtException(isLaunchError: boolean, error: Error) {
     app.quit()
   })
 
-  crashWindow.onClose(() => {
+  window.onClose(() => {
     if (!__DEV__) {
       app.relaunch()
     }
     app.quit()
   })
 
-  crashWindow.load()
+  window.load()
+
+  crashWindow = window
 }

From 9098225e66137b01971bd8594742c7f0f0973741 Mon Sep 17 00:00:00 2001
From: Sergio Padrino <sergio.padrino@gmail.com>
Date: Wed, 22 Jun 2022 13:44:12 +0200
Subject: [PATCH 23/88] Fix release notes detection with multiple "Notes:"
 lines

---
 script/changelog/parser.ts           | 15 ++++++++++++---
 script/changelog/test/parser-test.ts | 13 +++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/script/changelog/parser.ts b/script/changelog/parser.ts
index 9c1d49fdec..5a6ee3af72 100644
--- a/script/changelog/parser.ts
+++ b/script/changelog/parser.ts
@@ -48,12 +48,21 @@ function capitalized(str: string): string {
  */
 export function findReleaseNote(body: string): string | null | undefined {
   const re = /^Notes: (.+)$/gm
-  const matches = re.exec(body)
-  if (!matches || matches.length < 2) {
+  let lastMatches = null
+
+  // There might be multiple lines starting with "Notes: ", but we're only
+  // interested in the last one.
+  let matches = re.exec(body)
+  while (matches) {
+    lastMatches = matches
+    matches = re.exec(body)
+  }
+
+  if (!lastMatches || lastMatches.length < 2) {
     return undefined
   }
 
-  const note = matches[1].replace(/\.$/, '')
+  const note = lastMatches[1].replace(/\.$/, '')
   return note === 'no-notes' ? null : note
 }
 
diff --git a/script/changelog/test/parser-test.ts b/script/changelog/test/parser-test.ts
index 4b771b0c8a..04a26d0cd9 100644
--- a/script/changelog/test/parser-test.ts
+++ b/script/changelog/test/parser-test.ts
@@ -84,6 +84,19 @@ Notes: [Fixed] Fix lorem impsum dolor sit amet.
       )
     })
 
+    it('looks for the last Notes entry if there are several', () => {
+      const body = `
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer sollicitudin turpis
+tempor euismod fermentum. Nullam hendrerit neque eget risus faucibus volutpat. Donec
+ultrices, orci quis auctor ultrices, nulla lacus gravida lectus, non rutrum dolor
+quam vel augue.
+Notes: ignore this notes
+
+Notes: These are valid notes
+`
+      expect(findReleaseNote(body)).toBe('These are valid notes')
+    })
+
     it('detected no release notes wanted for the PR', () => {
       const body = `
 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer sollicitudin turpis

From 39efbacf7f72527d60844da76d1eb5c55764b0db Mon Sep 17 00:00:00 2001
From: Sergio Padrino <sergio.padrino@gmail.com>
Date: Wed, 22 Jun 2022 13:48:11 +0200
Subject: [PATCH 24/88] Fix typo

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

diff --git a/changelog.json b/changelog.json
index f18883b4b9..4d60e626a4 100644
--- a/changelog.json
+++ b/changelog.json
@@ -3,7 +3,7 @@
     "3.0.3-beta1": [
       "[Added] Add Aptana Studio support - #14669. Thanks @tsvetilian-ty!",
       "[Fixed]  Fix crash when user's locale is unsupported by the spellchecker - #14817. Thanks @tsvetilian-ty!",
-      "[Fixed] On windows, remember the apps zoom level on update - #5315",
+      "[Fixed] On Windows, remember the apps zoom level on update - #5315",
       "[Fixed] Fix Markdown syntax highlighting - #14710",
       "[Improved] Add copy repo path - #14785. Thanks @novialriptide!",
       "[Improved] Add copy paths when multiple files are selected - #14638. Thanks @tsvetilian-ty!",

From 0c04d2d367a99552f31c6d093e70178e013458ff Mon Sep 17 00:00:00 2001
From: Sergio Padrino <sergio.padrino@gmail.com>
Date: Wed, 22 Jun 2022 13:57:15 +0200
Subject: [PATCH 25/88] Fix another typo and improve wording (I hope)

---
 changelog.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/changelog.json b/changelog.json
index 4d60e626a4..82078a9780 100644
--- a/changelog.json
+++ b/changelog.json
@@ -2,11 +2,11 @@
   "releases": {
     "3.0.3-beta1": [
       "[Added] Add Aptana Studio support - #14669. Thanks @tsvetilian-ty!",
-      "[Fixed]  Fix crash when user's locale is unsupported by the spellchecker - #14817. Thanks @tsvetilian-ty!",
+      "[Fixed] Fix crash when user's locale is unsupported by the spellchecker - #14817. Thanks @tsvetilian-ty!",
       "[Fixed] On Windows, remember the apps zoom level on update - #5315",
       "[Fixed] Fix Markdown syntax highlighting - #14710",
-      "[Improved] Add copy repo path - #14785. Thanks @novialriptide!",
-      "[Improved] Add copy paths when multiple files are selected - #14638. Thanks @tsvetilian-ty!",
+      "[Improved] Add context menu option to copy repository paths - #14785. Thanks @novialriptide!",
+      "[Improved] Allow copying paths when multiple files are selected - #14638. Thanks @tsvetilian-ty!",
       "[Improved] Add support for SSH password prompts when accessing repositories - #14676",
       "[Improved] Upgrade to Electron v19.0.0 - #14813"
     ],

From 444596df261fdbe6688cd3d166a20abbd8795fed Mon Sep 17 00:00:00 2001
From: Markus Olsson <j.markus.olsson@gmail.com>
Date: Wed, 22 Jun 2022 14:19:18 +0200
Subject: [PATCH 26/88] Manual merge after conflict

#13664 vs #14785
---
 .../ui/repositories-list/repository-list-item-context-menu.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/ui/repositories-list/repository-list-item-context-menu.ts b/app/src/ui/repositories-list/repository-list-item-context-menu.ts
index ab210d94a3..eaf92ad8a5 100644
--- a/app/src/ui/repositories-list/repository-list-item-context-menu.ts
+++ b/app/src/ui/repositories-list/repository-list-item-context-menu.ts
@@ -39,6 +39,10 @@ export const generateRepositoryListContextMenu = (
       label: __DARWIN__ ? 'Copy Repo Name' : 'Copy repo name',
       action: () => clipboard.writeText(repository.name),
     },
+    {
+      label: __DARWIN__ ? 'Copy Repo Path' : 'Copy repo path',
+      action: () => clipboard.writeText(repository.path),
+    },
     { type: 'separator' },
     {
       label: 'View on GitHub',

From 66c33f25471ec554ed11176118a02848d930e132 Mon Sep 17 00:00:00 2001
From: Markus Olsson <j.markus.olsson@gmail.com>
Date: Wed, 22 Jun 2022 14:24:25 +0200
Subject: [PATCH 27/88] More merge problems

---
 app/src/ui/app.tsx                     | 5 ++---
 app/src/ui/toolbar/branch-dropdown.tsx | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/src/ui/app.tsx b/app/src/ui/app.tsx
index db9421bb57..7d9e191f76 100644
--- a/app/src/ui/app.tsx
+++ b/app/src/ui/app.tsx
@@ -54,7 +54,6 @@ import * as OcticonSymbol from './octicons/octicons.generated'
 import {
   showCertificateTrustDialog,
   sendReady,
-  showContextualMenu,
   isInApplicationFolder,
   selectAllWindowContents,
 } from './main-process-proxy'
@@ -2589,8 +2588,8 @@ export class App extends React.Component<IAppProps, IAppState> {
       onShowRepository: this.showRepository,
       onOpenInShell: this.openInShell,
       onOpenInExternalEditor: this.openInExternalEditor,
-      askForConfirmationOnRemoveRepository: this.state
-        .askForConfirmationOnRepositoryRemoval,
+      askForConfirmationOnRemoveRepository:
+        this.state.askForConfirmationOnRepositoryRemoval,
       externalEditorLabel: externalEditorLabel,
       onChangeRepositoryAlias: onChangeRepositoryAlias,
       onRemoveRepositoryAlias: onRemoveRepositoryAlias,
diff --git a/app/src/ui/toolbar/branch-dropdown.tsx b/app/src/ui/toolbar/branch-dropdown.tsx
index d1ce61af56..5ef13d1e04 100644
--- a/app/src/ui/toolbar/branch-dropdown.tsx
+++ b/app/src/ui/toolbar/branch-dropdown.tsx
@@ -22,7 +22,7 @@ import { TooltipTarget } from '../lib/tooltip'
 import { BranchType, Branch } from '../../models/branch'
 import { PopupType } from '../../models/popup'
 import { generateBranchContextMenuItems } from '../branches/branch-list-item-context-menu'
-import { showContextualMenu } from '../main-process-proxy'
+import { showContextualMenu } from '../../lib/menu-item'
 
 interface IBranchDropdownProps {
   readonly dispatcher: Dispatcher

From e35fa23cfb6a6ada91cfc401b7054378ff1921a4 Mon Sep 17 00:00:00 2001
From: Markus Olsson <j.markus.olsson@gmail.com>
Date: Wed, 22 Jun 2022 14:30:24 +0200
Subject: [PATCH 28/88] Maybe try saving before committing

---
 app/src/ui/app.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/ui/app.tsx b/app/src/ui/app.tsx
index 7d9e191f76..3b6f14874d 100644
--- a/app/src/ui/app.tsx
+++ b/app/src/ui/app.tsx
@@ -156,6 +156,7 @@ import { PullRequestReview } from './notifications/pull-request-review'
 import { getPullRequestCommitRef } from '../models/pull-request'
 import { getRepositoryType } from '../lib/git'
 import { SSHUserPassword } from './ssh/ssh-user-password'
+import { showContextualMenu } from '../lib/menu-item'
 
 const MinuteInMilliseconds = 1000 * 60
 const HourInMilliseconds = MinuteInMilliseconds * 60

From 9d3e0518fea0c88549d2a60d651496c23ba465e6 Mon Sep 17 00:00:00 2001
From: Markus Olsson <j.markus.olsson@gmail.com>
Date: Wed, 22 Jun 2022 14:46:58 +0200
Subject: [PATCH 29/88] :art: cleanup

---
 app/src/ui/branches/branch-list-item.tsx |  8 +++----
 app/src/ui/toolbar/branch-dropdown.tsx   | 27 +++++++++++-------------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/app/src/ui/branches/branch-list-item.tsx b/app/src/ui/branches/branch-list-item.tsx
index ebeff81ccb..27dc741f10 100644
--- a/app/src/ui/branches/branch-list-item.tsx
+++ b/app/src/ui/branches/branch-list-item.tsx
@@ -74,10 +74,10 @@ export class BranchListItem extends React.Component<
     }
 
     const items = generateBranchContextMenuItems({
-      name: name,
-      isLocal: isLocal,
-      onRenameBranch: onRenameBranch,
-      onDeleteBranch: onDeleteBranch,
+      name,
+      isLocal,
+      onRenameBranch,
+      onDeleteBranch,
     })
 
     showContextualMenu(items)
diff --git a/app/src/ui/toolbar/branch-dropdown.tsx b/app/src/ui/toolbar/branch-dropdown.tsx
index 5ef13d1e04..0004087378 100644
--- a/app/src/ui/toolbar/branch-dropdown.tsx
+++ b/app/src/ui/toolbar/branch-dropdown.tsx
@@ -233,19 +233,15 @@ export class BranchDropdown extends React.Component<
   ): void => {
     event.preventDefault()
 
-    const repositoryState = this.props.repositoryState
-    const tip = repositoryState.branchesState.tip
-    const currentBranch = tip.kind === TipState.Valid ? tip.branch : null
+    const { tip } = this.props.repositoryState.branchesState
 
-    if (currentBranch === null) {
+    if (tip.kind !== TipState.Valid) {
       return
     }
 
-    const isLocal = currentBranch.type === BranchType.Local
-
     const items = generateBranchContextMenuItems({
-      name: currentBranch.name,
-      isLocal: isLocal,
+      name: tip.branch.name,
+      isLocal: tip.branch.type === BranchType.Local,
       onRenameBranch: this.onRenameBranch,
       onDeleteBranch: this.onDeleteBranch,
     })
@@ -269,33 +265,34 @@ export class BranchDropdown extends React.Component<
     this.props.dispatcher.showPopup({
       type: PopupType.RenameBranch,
       repository: this.props.repository,
-      branch: branch,
+      branch,
     })
   }
 
   private onDeleteBranch = async (branchName: string) => {
     const branch = this.getBranchWithName(branchName)
+    const { dispatcher, repository } = this.props
 
     if (branch === undefined) {
       return
     }
 
     if (branch.type === BranchType.Remote) {
-      this.props.dispatcher.showPopup({
+      dispatcher.showPopup({
         type: PopupType.DeleteRemoteBranch,
-        repository: this.props.repository,
+        repository,
         branch,
       })
       return
     }
 
-    const aheadBehind = await this.props.dispatcher.getBranchAheadBehind(
-      this.props.repository,
+    const aheadBehind = await dispatcher.getBranchAheadBehind(
+      repository,
       branch
     )
-    this.props.dispatcher.showPopup({
+    dispatcher.showPopup({
       type: PopupType.DeleteBranch,
-      repository: this.props.repository,
+      repository,
       branch,
       existsOnRemote: aheadBehind !== null,
     })

From 742710d764eae758483d37ca60b129a4d4a1c05c Mon Sep 17 00:00:00 2001
From: Markus Olsson <j.markus.olsson@gmail.com>
Date: Wed, 22 Jun 2022 14:47:59 +0200
Subject: [PATCH 30/88] No need to wrap onContextMenu prop

---
 app/src/ui/toolbar/button.tsx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/src/ui/toolbar/button.tsx b/app/src/ui/toolbar/button.tsx
index 3e303f55db..497c8b970b 100644
--- a/app/src/ui/toolbar/button.tsx
+++ b/app/src/ui/toolbar/button.tsx
@@ -144,10 +144,6 @@ export class ToolbarButton extends React.Component<IToolbarButtonProps, {}> {
     }
   }
 
-  private onContextMenu = (event: React.MouseEvent<HTMLButtonElement>) => {
-    this.props.onContextMenu?.(event)
-  }
-
   private onButtonRef = (ref: Button | null) => {
     this.innerButton = ref
   }
@@ -217,7 +213,7 @@ export class ToolbarButton extends React.Component<IToolbarButtonProps, {}> {
         )}
         <Button
           onClick={this.onClick}
-          onContextMenu={this.onContextMenu}
+          onContextMenu={this.props.onContextMenu}
           ref={this.onButtonRef}
           disabled={this.props.disabled}
           onMouseEnter={this.props.onMouseEnter}

From 6a64c839134f1d0c3166eabe6b18455655946ed3 Mon Sep 17 00:00:00 2001
From: tidy-dev <tidy-dev@github.com>
Date: Wed, 22 Jun 2022 09:14:21 -0400
Subject: [PATCH 31/88] Streamline commit diff summary for multiple commits

---
 app/src/ui/history/commit-summary.tsx | 97 ++++++++++++++++-----------
 1 file changed, 56 insertions(+), 41 deletions(-)

diff --git a/app/src/ui/history/commit-summary.tsx b/app/src/ui/history/commit-summary.tsx
index 2d89adf6a3..21ed0292e3 100644
--- a/app/src/ui/history/commit-summary.tsx
+++ b/app/src/ui/history/commit-summary.tsx
@@ -348,18 +348,7 @@ export class CommitSummary extends React.Component<
 
   private getShaRef = (useShortSha?: boolean) => {
     const { selectedCommits } = this.props
-    const oldest = useShortSha
-      ? selectedCommits[0].shortSha
-      : selectedCommits[0].sha
-
-    if (selectedCommits.length === 1) {
-      return oldest
-    }
-
-    const latestCommit = selectedCommits.at(-1)
-    const latest = useShortSha ? latestCommit?.shortSha : latestCommit?.sha
-
-    return `${oldest}^..${latest}`
+    return useShortSha ? selectedCommits[0].shortSha : selectedCommits[0].sha
   }
 
   private renderCommitsNotReachable = () => {
@@ -385,6 +374,52 @@ export class CommitSummary extends React.Component<
     )
   }
 
+  private renderAuthors = () => {
+    const { selectedCommits, repository } = this.props
+    const { avatarUsers } = this.state
+    if (selectedCommits.length > 1) {
+      return
+    }
+
+    return (
+      <li
+        className="commit-summary-meta-item without-truncation"
+        aria-label="Author"
+      >
+        <AvatarStack users={avatarUsers} />
+        <CommitAttribution
+          gitHubRepository={repository.gitHubRepository}
+          commits={selectedCommits}
+        />
+      </li>
+    )
+  }
+
+  private renderCommitRef = () => {
+    const { selectedCommits } = this.props
+    if (selectedCommits.length > 1) {
+      return
+    }
+
+    return (
+      <li
+        className="commit-summary-meta-item without-truncation"
+        aria-label="SHA"
+      >
+        <Octicon symbol={OcticonSymbol.gitCommit} />
+        <TooltippedContent
+          className="sha"
+          tooltip={this.renderShaTooltip()}
+          tooltipClassName="sha-hint"
+          interactive={true}
+          direction={TooltipDirection.SOUTH}
+        >
+          {this.getShaRef(true)}
+        </TooltippedContent>
+      </li>
+    )
+  }
+
   public render() {
     const className = classNames({
       expanded: this.props.isExpanded,
@@ -408,33 +443,8 @@ export class CommitSummary extends React.Component<
             text={summary}
           />
           <ul className="commit-summary-meta">
-            <li
-              className="commit-summary-meta-item without-truncation"
-              aria-label="Author"
-            >
-              <AvatarStack users={this.state.avatarUsers} />
-              <CommitAttribution
-                gitHubRepository={this.props.repository.gitHubRepository}
-                commits={this.props.selectedCommits}
-              />
-            </li>
-
-            <li
-              className="commit-summary-meta-item without-truncation"
-              aria-label="SHA"
-            >
-              <Octicon symbol={OcticonSymbol.gitCommit} />
-              <TooltippedContent
-                className="sha"
-                tooltip={this.renderShaTooltip()}
-                tooltipClassName="sha-hint"
-                interactive={true}
-                direction={TooltipDirection.SOUTH}
-              >
-                {this.getShaRef(true)}
-              </TooltippedContent>
-            </li>
-
+            {this.renderAuthors()}
+            {this.renderCommitRef()}
             {this.renderChangedFilesDescription()}
             {this.renderLinesChanged()}
             {this.renderTags()}
@@ -578,10 +588,15 @@ export class CommitSummary extends React.Component<
   }
 
   private renderTags() {
-    const tags = this.props.selectedCommits.flatMap(c => c.tags) || []
+    const { selectedCommits } = this.props
+    if (selectedCommits.length > 1) {
+      return
+    }
+
+    const tags = selectedCommits[0].tags
 
     if (tags.length === 0) {
-      return null
+      return
     }
 
     return (

From 0d90f2d328b44de330b31f0010cc12ce59b6e031 Mon Sep 17 00:00:00 2001
From: tidy-dev <tidy-dev@github.com>
Date: Wed, 22 Jun 2022 13:46:32 -0400
Subject: [PATCH 32/88] Differentiate commits not in diff on message hover

---
 app/src/lib/app-state.ts                        |  4 ++++
 app/src/lib/stores/app-store.ts                 | 17 ++++++++++++++---
 app/src/lib/stores/repository-state-cache.ts    |  1 +
 app/src/ui/dispatcher/dispatcher.ts             | 13 ++++++++++++-
 .../ui/drag-elements/commit-drag-element.tsx    |  1 +
 app/src/ui/history/commit-list-item.tsx         |  9 +++++++--
 app/src/ui/history/commit-list.tsx              | 13 +++++++++++++
 app/src/ui/history/commit-summary.tsx           | 17 ++++++++++++++++-
 app/src/ui/history/compare.tsx                  |  4 ++++
 app/src/ui/history/selected-commits.tsx         |  8 ++++++++
 app/src/ui/lib/configure-git-user.tsx           |  1 +
 app/src/ui/lib/list/list.tsx                    | 13 ++++++++++---
 app/src/ui/repository.tsx                       |  4 +++-
 app/styles/ui/history/_commit-list.scss         |  4 ++++
 14 files changed, 98 insertions(+), 11 deletions(-)

diff --git a/app/src/lib/app-state.ts b/app/src/lib/app-state.ts
index cd5a3fc421..57b2814eb5 100644
--- a/app/src/lib/app-state.ts
+++ b/app/src/lib/app-state.ts
@@ -572,6 +572,10 @@ export interface ICommitSelection {
    * */
   readonly shasInDiff: ReadonlyArray<string>
 
+  /** Whether or not the shas not in the diff should be differentiated from the
+   * shas in the diff in the commit list */
+  readonly shasNotInDiffHighlighted: boolean
+
   /**
    * Whether the a selection of commits are group of adjacent to each other.
    * Example: Given these are indexes of sha's in history, 3, 4, 5, 6 is contiguous as
diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts
index 94e7e41a8f..06649188c1 100644
--- a/app/src/lib/stores/app-store.ts
+++ b/app/src/lib/stores/app-store.ts
@@ -1109,11 +1109,11 @@ export class AppStore extends TypedBaseStore<IAppState> {
   }
 
   /** This shouldn't be called directly. See `Dispatcher`. */
-  public async _changeCommitSelection(
+  public _changeCommitSelection(
     repository: Repository,
     shas: ReadonlyArray<string>,
     isContiguous: boolean
-  ): Promise<void> {
+  ): void {
     const { commitSelection, commitLookup } =
       this.repositoryStateCache.get(repository)
 
@@ -1138,6 +1138,17 @@ export class AppStore extends TypedBaseStore<IAppState> {
     this.emitUpdate()
   }
 
+  /** This shouldn't be called directly. See `Dispatcher`. */
+  public async _updateShasNotInDiffHighlighted(
+    repository: Repository,
+    shasNotInDiffHighlighted: boolean
+  ) {
+    this.repositoryStateCache.updateCommitSelection(repository, () => ({
+      shasNotInDiffHighlighted,
+    }))
+    this.emitUpdate()
+  }
+
   /**
    * When multiple commits are selected, the diff is created using the rev range
    * of firstSha^..lastSha in the selected shas. Thus comparing the trees of the
@@ -1161,7 +1172,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
     const shasInDiff = new Array<string>()
 
     if (shas.length <= 1 || !isContiguous) {
-      return shasInDiff
+      return shas
     }
 
     let currentSha = shas.at(-1)
diff --git a/app/src/lib/stores/repository-state-cache.ts b/app/src/lib/stores/repository-state-cache.ts
index 58d3eb8e72..eae435244a 100644
--- a/app/src/lib/stores/repository-state-cache.ts
+++ b/app/src/lib/stores/repository-state-cache.ts
@@ -179,6 +179,7 @@ function getInitialRepositoryState(): IRepositoryState {
     commitSelection: {
       shas: [],
       shasInDiff: [],
+      shasNotInDiffHighlighted: false,
       isContiguous: true,
       file: null,
       changesetData: { files: [], linesAdded: 0, linesDeleted: 0 },
diff --git a/app/src/ui/dispatcher/dispatcher.ts b/app/src/ui/dispatcher/dispatcher.ts
index dfa8a15813..1e09eb5a63 100644
--- a/app/src/ui/dispatcher/dispatcher.ts
+++ b/app/src/ui/dispatcher/dispatcher.ts
@@ -237,10 +237,21 @@ export class Dispatcher {
     repository: Repository,
     shas: ReadonlyArray<string>,
     isContiguous: boolean
-  ): Promise<void> {
+  ): void {
     return this.appStore._changeCommitSelection(repository, shas, isContiguous)
   }
 
+  /** Update whether shas not in the diff should be highlighted (or opposite of highlighted..) */
+  public updateShasNotInDiffHighlighted(
+    repository: Repository,
+    shasNotInDiffHighlighted: boolean
+  ) {
+    this.appStore._updateShasNotInDiffHighlighted(
+      repository,
+      shasNotInDiffHighlighted
+    )
+  }
+
   /**
    * Change the selected changed file in the history view.
    *
diff --git a/app/src/ui/drag-elements/commit-drag-element.tsx b/app/src/ui/drag-elements/commit-drag-element.tsx
index fc674e7d32..4d95ca9570 100644
--- a/app/src/ui/drag-elements/commit-drag-element.tsx
+++ b/app/src/ui/drag-elements/commit-drag-element.tsx
@@ -183,6 +183,7 @@ export class CommitDragElement extends React.Component<
             canBeResetTo={false}
             isLocal={false}
             showUnpushedIndicator={false}
+            isNotInDiff={false}
           />
         </div>
         {this.renderDragToolTip()}
diff --git a/app/src/ui/history/commit-list-item.tsx b/app/src/ui/history/commit-list-item.tsx
index 374a299173..d81d89e278 100644
--- a/app/src/ui/history/commit-list-item.tsx
+++ b/app/src/ui/history/commit-list-item.tsx
@@ -57,6 +57,7 @@ interface ICommitProps {
   readonly unpushedTags?: ReadonlyArray<string>
   readonly isCherryPickInProgress?: boolean
   readonly disableSquashing?: boolean
+  readonly isNotInDiff: boolean
 }
 
 interface ICommitListItemState {
@@ -127,7 +128,7 @@ export class CommitListItem extends React.PureComponent<
   }
 
   public render() {
-    const { commit } = this.props
+    const { commit, isNotInDiff } = this.props
     const {
       author: { date },
     } = commit
@@ -142,6 +143,10 @@ export class CommitListItem extends React.PureComponent<
       'empty-summary': hasEmptySummary,
     })
 
+    const commitClassNames = classNames('commit', {
+      'not-in-diff': isNotInDiff,
+    })
+
     return (
       <Draggable
         isEnabled={isDraggable}
@@ -156,7 +161,7 @@ export class CommitListItem extends React.PureComponent<
         ]}
       >
         <div
-          className="commit"
+          className={commitClassNames}
           onContextMenu={this.onContextMenu}
           onMouseEnter={this.onMouseEnter}
           onMouseLeave={this.onMouseLeave}
diff --git a/app/src/ui/history/commit-list.tsx b/app/src/ui/history/commit-list.tsx
index 3943ed78ee..4a33cb3c75 100644
--- a/app/src/ui/history/commit-list.tsx
+++ b/app/src/ui/history/commit-list.tsx
@@ -132,6 +132,12 @@ interface ICommitListProps {
 
   /** Whether squashing should be enabled on the commit list */
   readonly disableSquashing?: boolean
+
+  /** Which shas are shown in the diff */
+  readonly shasInDiff: ReadonlyArray<string>
+
+  /** Whether the shas not in the diff should be highlighted */
+  readonly shasNotInDiffHighlighted: boolean
 }
 
 /** A component which displays the list of commits. */
@@ -180,6 +186,11 @@ export class CommitList extends React.Component<ICommitListProps, {}> {
     const isResettableCommit =
       row > 0 && row <= this.props.localCommitSHAs.length
 
+    const isNotInDiff =
+      this.props.selectedSHAs.includes(commit.sha) &&
+      !this.props.shasInDiff.includes(commit.sha) &&
+      this.props.shasNotInDiffHighlighted
+
     return (
       <CommitListItem
         key={commit.sha}
@@ -211,6 +222,7 @@ export class CommitList extends React.Component<ICommitListProps, {}> {
         onRenderCommitDragElement={this.onRenderCommitDragElement}
         onRemoveDragElement={this.props.onRemoveCommitDragElement}
         disableSquashing={this.props.disableSquashing}
+        isNotInDiff={isNotInDiff}
       />
     )
   }
@@ -363,6 +375,7 @@ export class CommitList extends React.Component<ICommitListProps, {}> {
           rowCount={this.props.commitSHAs.length}
           rowHeight={RowHeight}
           selectedRows={this.props.selectedSHAs.map(sha => this.rowForSHA(sha))}
+          forceGridUpdate={this.props.shasNotInDiffHighlighted}
           rowRenderer={this.renderCommit}
           onDropDataInsertion={this.onDropDataInsertion}
           onSelectionChanged={this.onSelectionChanged}
diff --git a/app/src/ui/history/commit-summary.tsx b/app/src/ui/history/commit-summary.tsx
index 21ed0292e3..72e5806bf2 100644
--- a/app/src/ui/history/commit-summary.tsx
+++ b/app/src/ui/history/commit-summary.tsx
@@ -54,6 +54,9 @@ interface ICommitSummaryProps {
 
   /** Called when the user opens the diff options popover */
   readonly onDiffOptionsOpened: () => void
+
+  /** called when user hovers over count of commits excluded from the diff */
+  readonly onHighlightShasNotInDiff: (shasNotInDiffHighlighted: boolean) => void
 }
 
 interface ICommitSummaryState {
@@ -351,6 +354,14 @@ export class CommitSummary extends React.Component<
     return useShortSha ? selectedCommits[0].shortSha : selectedCommits[0].sha
   }
 
+  private onHighlightShasInDiff = () => {
+    this.props.onHighlightShasNotInDiff(true)
+  }
+
+  private onRemoveHighlightShasInDiff = () => {
+    this.props.onHighlightShasNotInDiff(false)
+  }
+
   private renderCommitsNotReachable = () => {
     const { selectedCommits, shasInDiff } = this.props
     if (selectedCommits.length === 1) {
@@ -367,7 +378,11 @@ export class CommitSummary extends React.Component<
     }
 
     return (
-      <div className="commit-unreachable-info">
+      <div
+        className="commit-unreachable-info"
+        onMouseOver={this.onHighlightShasInDiff}
+        onMouseOut={this.onRemoveHighlightShasInDiff}
+      >
         <Octicon symbol={OcticonSymbol.info} /> {excludedCommitsCount}{' '}
         unreachable commits not included. <LinkButton>Learn why</LinkButton>
       </div>
diff --git a/app/src/ui/history/compare.tsx b/app/src/ui/history/compare.tsx
index 7d74d46edd..d7fa51f0fe 100644
--- a/app/src/ui/history/compare.tsx
+++ b/app/src/ui/history/compare.tsx
@@ -55,6 +55,8 @@ interface ICompareSidebarProps {
   readonly tagsToPush: ReadonlyArray<string> | null
   readonly aheadBehindStore: AheadBehindStore
   readonly isCherryPickInProgress: boolean
+  readonly shasInDiff: ReadonlyArray<string>
+  readonly shasNotInDiffHighlighted: boolean
 }
 
 interface ICompareSidebarState {
@@ -230,6 +232,8 @@ export class CompareSidebar extends React.Component<
         commitLookup={this.props.commitLookup}
         commitSHAs={commitSHAs}
         selectedSHAs={this.props.selectedCommitShas}
+        shasInDiff={this.props.shasInDiff}
+        shasNotInDiffHighlighted={this.props.shasNotInDiffHighlighted}
         localCommitSHAs={this.props.localCommitSHAs}
         canResetToCommits={formState.kind === HistoryTabMode.History}
         canUndoCommits={formState.kind === HistoryTabMode.History}
diff --git a/app/src/ui/history/selected-commits.tsx b/app/src/ui/history/selected-commits.tsx
index db7214193c..0d92a7b075 100644
--- a/app/src/ui/history/selected-commits.tsx
+++ b/app/src/ui/history/selected-commits.tsx
@@ -181,10 +181,18 @@ export class SelectedCommits extends React.Component<
         onHideWhitespaceInDiffChanged={this.onHideWhitespaceInDiffChanged}
         onShowSideBySideDiffChanged={this.onShowSideBySideDiffChanged}
         onDiffOptionsOpened={this.props.onDiffOptionsOpened}
+        onHighlightShasNotInDiff={this.onHighlightShasNotInDiff}
       />
     )
   }
 
+  private onHighlightShasNotInDiff = (shasNotInDiffHighlighted: boolean) => {
+    this.props.dispatcher.updateShasNotInDiffHighlighted(
+      this.props.repository,
+      shasNotInDiffHighlighted
+    )
+  }
+
   private onExpandChanged = (isExpanded: boolean) => {
     this.setState({ isExpanded })
   }
diff --git a/app/src/ui/lib/configure-git-user.tsx b/app/src/ui/lib/configure-git-user.tsx
index fa652d57cf..1c033c77a0 100644
--- a/app/src/ui/lib/configure-git-user.tsx
+++ b/app/src/ui/lib/configure-git-user.tsx
@@ -254,6 +254,7 @@ export class ConfigureGitUser extends React.Component<
           isLocal={false}
           showUnpushedIndicator={false}
           selectedCommits={[dummyCommit]}
+          isNotInDiff={false}
         />
       </div>
     )
diff --git a/app/src/ui/lib/list/list.tsx b/app/src/ui/lib/list/list.tsx
index b326473316..b3a73348c4 100644
--- a/app/src/ui/lib/list/list.tsx
+++ b/app/src/ui/lib/list/list.tsx
@@ -225,6 +225,8 @@ interface IListProps {
    * where to scroll do on rendering of the list.
    */
   readonly setScrollTop?: number
+
+  readonly forceGridUpdate?: boolean
 }
 
 interface IListState {
@@ -752,12 +754,19 @@ export class List extends React.Component<IListProps, IListState> {
           this.props.invalidationProps
         )
 
+        const forceRowRerenderChanged =
+          prevProps.forceGridUpdate !== this.props.forceGridUpdate
+
         // Now we need to figure out whether anything changed in such a way that
         // the Grid has to update regardless of its props. Previously we passed
         // our selectedRow and invalidationProps down to Grid and figured that
         // it, being a pure component, would do the right thing but that's not
         // quite the case since invalidationProps is a complex object.
-        if (selectedRowChanged || invalidationPropsChanged) {
+        if (
+          selectedRowChanged ||
+          invalidationPropsChanged ||
+          forceRowRerenderChanged
+        ) {
           this.grid.forceUpdate()
         }
       }
@@ -849,7 +858,6 @@ export class List extends React.Component<IListProps, IListState> {
 
   public render() {
     let content: JSX.Element[] | JSX.Element | null
-
     if (this.resizeObserver) {
       content = this.renderContents(
         this.state.width ?? 0,
@@ -932,7 +940,6 @@ export class List extends React.Component<IListProps, IListState> {
     // it with keyboard navigation and select an item.
     const tabIndex =
       this.props.selectedRows.length < 1 && this.props.rowCount > 0 ? 0 : -1
-
     return (
       <FocusContainer
         className="list-focus-container"
diff --git a/app/src/ui/repository.tsx b/app/src/ui/repository.tsx
index b8ae492fdd..932d1109bb 100644
--- a/app/src/ui/repository.tsx
+++ b/app/src/ui/repository.tsx
@@ -238,7 +238,7 @@ export class RepositoryView extends React.Component<
       remote,
       compareState,
       branchesState,
-      commitSelection: { shas },
+      commitSelection: { shas, shasInDiff, shasNotInDiffHighlighted },
       commitLookup,
       localCommitSHAs,
       localTags,
@@ -265,6 +265,8 @@ export class RepositoryView extends React.Component<
         isLocalRepository={remote === null}
         compareState={compareState}
         selectedCommitShas={shas}
+        shasInDiff={shasInDiff}
+        shasNotInDiffHighlighted={shasNotInDiffHighlighted}
         currentBranch={currentBranch}
         emoji={emoji}
         commitLookup={commitLookup}
diff --git a/app/styles/ui/history/_commit-list.scss b/app/styles/ui/history/_commit-list.scss
index 083f095fc9..a1de840765 100644
--- a/app/styles/ui/history/_commit-list.scss
+++ b/app/styles/ui/history/_commit-list.scss
@@ -96,6 +96,10 @@
   padding-right: calc(var(--spacing) + var(--spacing-half));
   padding-left: var(--spacing);
 
+  &.not-in-diff {
+    opacity: 50%;
+  }
+
   .info {
     display: flex;
     flex: 1 1 auto;

From 38dd3278a50ce7a250b8358b2118cde7de72ecb1 Mon Sep 17 00:00:00 2001
From: tidy-dev <tidy-dev@github.com>
Date: Wed, 22 Jun 2022 14:15:14 -0400
Subject: [PATCH 33/88] Need to traverse all parents.. merge commits

---
 app/src/lib/stores/app-store.ts | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts
index 06649188c1..b98245df3a 100644
--- a/app/src/lib/stores/app-store.ts
+++ b/app/src/lib/stores/app-store.ts
@@ -1160,7 +1160,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
    * selection of A through D would not have the changes from B an C.
    *
    * This method traverses the ancestral path from the last commit in the
-   * selection back to the first commit via checking the first parent. The
+   * selection back to the first commit via checking the parents. The
    * commits on this path are the commits whose changes will be seen in the
    * diff. This is equivalent to doing `git rev-list firstSha^..lastSha`.
    */
@@ -1175,15 +1175,16 @@ export class AppStore extends TypedBaseStore<IAppState> {
       return shas
     }
 
-    let currentSha = shas.at(-1)
-
-    if (currentSha === undefined) {
-      // shouldn't happen - typing check
-      return shasInDiff
-    }
-
+    const shasToTraverse = [shas.at(-1)]
     let traversing = true
     while (traversing) {
+      const currentSha = shasToTraverse.pop()
+      if (currentSha === undefined) {
+        // no more to traverse
+        traversing = false
+        continue
+      }
+
       shasInDiff.push(currentSha)
       const commit = commitLookup.get(currentSha)
       if (commit === undefined) {
@@ -1192,13 +1193,13 @@ export class AppStore extends TypedBaseStore<IAppState> {
         continue
       }
 
-      const firstParent = commit.parentSHAs[0]
-      const parent = shas.find(sha => sha === firstParent)
-      if (parent === undefined) {
-        traversing = false
-        continue
+      for (const parentSha of commit.parentSHAs) {
+        const parent = shas.find(sha => sha === parentSha)
+        if (parent === undefined) {
+          continue
+        }
+        shasToTraverse.push(parent)
       }
-      currentSha = parent
     }
 
     return shasInDiff

From 73f31b209fd6303becd583cf31da1bf8d09ff5c4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 23 Jun 2022 03:42:07 +0000
Subject: [PATCH 34/88] Bump jsdom from 16.4.0 to 16.7.0

Bumps [jsdom](https://github.com/jsdom/jsdom) from 16.4.0 to 16.7.0.
- [Release notes](https://github.com/jsdom/jsdom/releases)
- [Changelog](https://github.com/jsdom/jsdom/blob/master/Changelog.md)
- [Commits](https://github.com/jsdom/jsdom/compare/16.4.0...16.7.0)

---
updated-dependencies:
- dependency-name: jsdom
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 438 +++++++++++++++++++-----------------------------------
 1 file changed, 154 insertions(+), 284 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 6c949d2685..599ec75aeb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -838,6 +838,11 @@
   dependencies:
     defer-to-connect "^1.0.1"
 
+"@tootallnate/once@1":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
+  integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
+
 "@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7":
   version "7.1.12"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.12.tgz#4d8e9e51eb265552a7e4f1ff2219ab6133bdfb2d"
@@ -1659,10 +1664,10 @@
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
-abab@^2.0.3:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
-  integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==
+abab@^2.0.3, abab@^2.0.5:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
+  integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
 
 accepts@~1.3.7:
   version "1.3.7"
@@ -1700,20 +1705,22 @@ acorn-walk@^8.0.0:
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
   integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
 
-acorn@^7.1.1:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz#85010754db53c3fbaf3b9ea3e083aa5c5d147ffd"
-  integrity sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA==
+acorn@^7.1.1, acorn@^7.3.1:
+  version "7.4.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
+  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^7.3.1:
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.0.tgz#e1ad486e6c54501634c6c397c5c121daa383607c"
-  integrity sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==
+acorn@^8.0.4, acorn@^8.2.4, acorn@^8.4.1:
+  version "8.7.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
+  integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
 
-acorn@^8.0.4, acorn@^8.4.1:
-  version "8.7.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
-  integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==
+agent-base@6:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
+  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
+  dependencies:
+    debug "4"
 
 airbnb-browser-shims@^3.0.0:
   version "3.0.0"
@@ -1785,16 +1792,6 @@ ajv@^4.9.2:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
 
-ajv@^5.1.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.3.0.tgz#4414ff74a50879c208ee5fdc826e32c303549eda"
-  integrity sha1-RBT/dKUIecII7l/cgm4ywwNUnto=
-  dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^1.0.0"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
-
 ajv@^6.10.0, ajv@^6.12.0, ajv@^6.12.5, ajv@^6.9.1:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
@@ -2103,7 +2100,7 @@ async@^3.2.3:
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
+  integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
 
 at-least-node@^1.0.0:
   version "1.0.0"
@@ -2132,11 +2129,6 @@ aws-sign2@~0.7.0:
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
   integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
-aws4@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
-  integrity sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=
-
 aws4@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
@@ -2320,20 +2312,6 @@ boolean@^3.0.1:
   resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.0.2.tgz#df1baa18b6a2b0e70840475e1d93ec8fe75b2570"
   integrity sha512-RwywHlpCRc3/Wh81MiCKun4ydaIFyW5Ea6JbL6sRCVx5q5irDw7pMXBUFYF/jArQ6YrG36q0kpovc9P/Kd3I4g==
 
-boom@4.x.x:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
-  integrity sha1-T4owBctKfjiJ90kDD9JbluAdLjE=
-  dependencies:
-    hoek "4.x.x"
-
-boom@5.x.x:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
-  integrity sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==
-  dependencies:
-    hoek "4.x.x"
-
 boxen@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/boxen/-/boxen-4.2.0.tgz#e411b62357d6d6d36587c8ac3d5d974daa070e64"
@@ -2748,10 +2726,10 @@ combined-stream@1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-combined-stream@^1.0.5, combined-stream@~1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
-  integrity sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=
+combined-stream@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
   dependencies:
     delayed-stream "~1.0.0"
 
@@ -2921,13 +2899,6 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.2:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
-cryptiles@3.x.x:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"
-  integrity sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=
-  dependencies:
-    boom "5.x.x"
-
 crypto-random-string@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
@@ -2978,7 +2949,7 @@ cssom@~0.3.6:
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
   integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
 
-cssstyle@^2.2.0:
+cssstyle@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852"
   integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==
@@ -3018,6 +2989,13 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
   dependencies:
     ms "2.0.0"
 
+debug@4:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
 debug@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
@@ -3063,10 +3041,10 @@ decamelize@^1.2.0:
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
-decimal.js@^10.2.0:
-  version "10.2.1"
-  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz#238ae7b0f0c793d3e3cea410108b35a2c01426a3"
-  integrity sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==
+decimal.js@^10.2.1:
+  version "10.3.1"
+  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783"
+  integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==
 
 decode-uri-component@^0.2.0:
   version "0.2.0"
@@ -3085,11 +3063,16 @@ deep-extend@^0.6.0:
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
   integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
-deep-is@^0.1.3, deep-is@~0.1.3:
+deep-is@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
+deep-is@~0.1.3:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
+  integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
+
 deepmerge@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
@@ -3132,7 +3115,7 @@ define-property@^2.0.2:
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
+  integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
 
 depd@~1.1.2:
   version "1.1.2"
@@ -3632,13 +3615,13 @@ escape-string-regexp@^4.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-escodegen@^1.14.1:
-  version "1.14.3"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503"
-  integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==
+escodegen@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd"
+  integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==
   dependencies:
     esprima "^4.0.1"
-    estraverse "^4.2.0"
+    estraverse "^5.2.0"
     esutils "^2.0.2"
     optionator "^0.8.1"
   optionalDependencies:
@@ -3835,7 +3818,7 @@ esrecurse@^4.3.0:
   dependencies:
     estraverse "^5.2.0"
 
-estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
+estraverse@^4.1.0, estraverse@^4.1.1:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
   integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
@@ -3851,9 +3834,9 @@ estraverse@^5.2.0:
   integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
 
 esutils@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
-  integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
 etag@~1.8.1:
   version "1.8.1"
@@ -3996,7 +3979,7 @@ extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@^3.0.2, extend@~3.0.1, extend@~3.0.2:
+extend@^3.0.2, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
@@ -4050,11 +4033,6 @@ fake-indexeddb@^2.0.4:
     realistic-structured-clone "^2.0.1"
     setimmediate "^1.0.5"
 
-fast-deep-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
-  integrity sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=
-
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
@@ -4081,7 +4059,7 @@ fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0:
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
-fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.4:
+fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
@@ -4220,13 +4198,13 @@ forever-agent@~0.6.1:
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
   integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
-form-data@~2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.1.tgz#6fb94fbd71885306d73d15cc497fe4cc4ecd44bf"
-  integrity sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=
+form-data@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
+  integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==
   dependencies:
     asynckit "^0.4.0"
-    combined-stream "^1.0.5"
+    combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
 form-data@~2.3.2:
@@ -4595,14 +4573,6 @@ har-schema@^2.0.0:
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
   integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
 
-har-validator@~5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
-  integrity sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=
-  dependencies:
-    ajv "^5.1.0"
-    har-schema "^2.0.0"
-
 har-validator@~5.1.3:
   version "5.1.5"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
@@ -4718,26 +4688,11 @@ hash-base@^3.0.0:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
-hawk@~6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
-  integrity sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==
-  dependencies:
-    boom "4.x.x"
-    cryptiles "3.x.x"
-    hoek "4.x.x"
-    sntp "2.x.x"
-
 he@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
 
-hoek@4.x.x:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d"
-  integrity sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==
-
 hosted-git-info@^2.1.4:
   version "2.8.9"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
@@ -4817,6 +4772,15 @@ http-errors@1.7.2, http-errors@~1.7.2:
     statuses ">= 1.5.0 < 2"
     toidentifier "1.0.0"
 
+http-proxy-agent@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"
+  integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==
+  dependencies:
+    "@tootallnate/once" "1"
+    agent-base "6"
+    debug "4"
+
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
@@ -4826,6 +4790,14 @@ http-signature@~1.2.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
+https-proxy-agent@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
+  integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
+  dependencies:
+    agent-base "6"
+    debug "4"
+
 human-signals@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
@@ -4938,11 +4910,6 @@ interpret@^1.0.1:
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.4.tgz#820cdd588b868ffb191a809506d6c9c8f212b1b0"
   integrity sha1-ggzdWIuGj/sZGoCVBtbJyPISsbA=
 
-ip-regex@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
-  integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
-
 ipaddr.js@1.9.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65"
@@ -5193,10 +5160,10 @@ is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
-is-potential-custom-element-name@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397"
-  integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c=
+is-potential-custom-element-name@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
+  integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
 
 is-regex@^1.0.4:
   version "1.0.4"
@@ -5902,35 +5869,36 @@ jsdoc-type-pratt-parser@~2.2.2:
   integrity sha512-zRokSWcPLSWkoNzsWn9pq7YYSwDhKyEe+cJYT2qaPqLOOJb5sFSi46BPj81vP+e8chvCNdQL9RG86Bi9EI6MDw==
 
 jsdom@^16.4.0:
-  version "16.4.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz#36005bde2d136f73eee1a830c6d45e55408edddb"
-  integrity sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w==
+  version "16.7.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710"
+  integrity sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==
   dependencies:
-    abab "^2.0.3"
-    acorn "^7.1.1"
+    abab "^2.0.5"
+    acorn "^8.2.4"
     acorn-globals "^6.0.0"
     cssom "^0.4.4"
-    cssstyle "^2.2.0"
+    cssstyle "^2.3.0"
     data-urls "^2.0.0"
-    decimal.js "^10.2.0"
+    decimal.js "^10.2.1"
     domexception "^2.0.1"
-    escodegen "^1.14.1"
+    escodegen "^2.0.0"
+    form-data "^3.0.0"
     html-encoding-sniffer "^2.0.1"
-    is-potential-custom-element-name "^1.0.0"
+    http-proxy-agent "^4.0.1"
+    https-proxy-agent "^5.0.0"
+    is-potential-custom-element-name "^1.0.1"
     nwsapi "^2.2.0"
-    parse5 "5.1.1"
-    request "^2.88.2"
-    request-promise-native "^1.0.8"
-    saxes "^5.0.0"
+    parse5 "6.0.1"
+    saxes "^5.0.1"
     symbol-tree "^3.2.4"
-    tough-cookie "^3.0.1"
+    tough-cookie "^4.0.0"
     w3c-hr-time "^1.0.2"
     w3c-xmlserializer "^2.0.0"
     webidl-conversions "^6.1.0"
     whatwg-encoding "^1.0.5"
     whatwg-mimetype "^2.3.0"
-    whatwg-url "^8.0.0"
-    ws "^7.2.3"
+    whatwg-url "^8.5.0"
+    ws "^7.4.6"
     xml-name-validator "^3.0.0"
 
 jsesc@^2.5.1:
@@ -5960,11 +5928,6 @@ json-parse-even-better-errors@^2.3.0:
   resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
   integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
 
-json-schema-traverse@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
-  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
-
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
@@ -6171,7 +6134,7 @@ levn@^0.4.1:
 levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
+  integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==
   dependencies:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
@@ -6286,7 +6249,7 @@ lodash.templatesettings@^4.0.0:
   dependencies:
     lodash._reinterpolate "~3.0.0"
 
-lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21:
+lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -6470,22 +6433,22 @@ mime-db@1.51.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c"
   integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==
 
-mime-db@~1.30.0:
-  version "1.30.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
-  integrity sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=
+mime-db@1.52.0:
+  version "1.52.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
+  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
 mime-db@~1.36.0:
   version "1.36.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.36.0.tgz#5020478db3c7fe93aad7bbcc4dcf869c43363397"
   integrity sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==
 
-mime-types@^2.1.12, mime-types@~2.1.17:
-  version "2.1.17"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
-  integrity sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=
+mime-types@^2.1.12:
+  version "2.1.35"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
+  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
   dependencies:
-    mime-db "~1.30.0"
+    mime-db "1.52.0"
 
 mime-types@^2.1.27, mime-types@^2.1.31:
   version "2.1.34"
@@ -6774,11 +6737,6 @@ nwsapi@^2.2.0:
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
   integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
 
-oauth-sign@~0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
-  integrity sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=
-
 oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
@@ -6942,16 +6900,16 @@ opener@^1.5.2:
   integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==
 
 optionator@^0.8.1:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
-  integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
+  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
   dependencies:
     deep-is "~0.1.3"
-    fast-levenshtein "~2.0.4"
+    fast-levenshtein "~2.0.6"
     levn "~0.3.0"
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
-    wordwrap "~1.0.0"
+    word-wrap "~1.2.3"
 
 optionator@^0.9.1:
   version "0.9.1"
@@ -7088,10 +7046,10 @@ parse-json@^5.0.0:
     json-parse-even-better-errors "^2.3.0"
     lines-and-columns "^1.1.6"
 
-parse5@5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"
-  integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==
+parse5@6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
+  integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
 
 parseurl@~1.3.3:
   version "1.3.3"
@@ -7284,7 +7242,7 @@ prelude-ls@^1.2.1:
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
-  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
+  integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==
 
 prepend-http@^2.0.0:
   version "2.0.0"
@@ -7418,7 +7376,7 @@ pseudomap@^1.0.2:
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
   integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
 
-psl@^1.1.28:
+psl@^1.1.28, psl@^1.1.33:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
   integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
@@ -7431,11 +7389,6 @@ pump@^3.0.0:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
-punycode@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
-
 punycode@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.0.tgz#5f863edc89b96db09074bad7947bf09056ca4e7d"
@@ -7458,11 +7411,6 @@ qs@6.7.0:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
   integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
 
-qs@~6.5.1:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
-  integrity sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==
-
 qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
@@ -7761,51 +7709,7 @@ repeat-string@^1.6.1:
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
-request-promise-core@1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f"
-  integrity sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==
-  dependencies:
-    lodash "^4.17.19"
-
-request-promise-native@^1.0.8:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28"
-  integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==
-  dependencies:
-    request-promise-core "1.1.4"
-    stealthy-require "^1.1.1"
-    tough-cookie "^2.3.3"
-
-request@^2.72.0:
-  version "2.83.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
-  integrity sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.6.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.1"
-    forever-agent "~0.6.1"
-    form-data "~2.3.1"
-    har-validator "~5.0.3"
-    hawk "~6.0.2"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.17"
-    oauth-sign "~0.8.2"
-    performance-now "^2.1.0"
-    qs "~6.5.1"
-    safe-buffer "^5.1.1"
-    stringstream "~0.0.5"
-    tough-cookie "~2.3.3"
-    tunnel-agent "^0.6.0"
-    uuid "^3.1.0"
-
-request@^2.86.0, request@^2.88.2:
+request@^2.72.0, request@^2.86.0:
   version "2.88.2"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
   integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
@@ -7975,7 +7879,7 @@ safe-buffer@5.1.2, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1:
+safe-buffer@^5.0.1, safe-buffer@^5.1.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
   integrity sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==
@@ -8047,7 +7951,7 @@ sax@>=0.6.0, sax@^1.2.4:
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
-saxes@^5.0.0:
+saxes@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d"
   integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==
@@ -8336,13 +8240,6 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^2.0.0"
 
-sntp@2.x.x:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
-  integrity sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==
-  dependencies:
-    hoek "4.x.x"
-
 source-map-js@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
@@ -8507,11 +8404,6 @@ static-extend@^0.1.1:
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
 
-stealthy-require@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
-  integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
-
 string-length@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz#4a973bf31ef77c4edbceadd6af2611996985f8a1"
@@ -8616,11 +8508,6 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-stringstream@~0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
-  integrity sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=
-
 strip-ansi@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
@@ -8933,7 +8820,16 @@ totalist@^1.0.0:
   resolved "https://registry.yarnpkg.com/totalist/-/totalist-1.1.0.tgz#a4d65a3e546517701e3e5c37a47a70ac97fe56df"
   integrity sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==
 
-tough-cookie@^2.3.3, tough-cookie@~2.5.0:
+tough-cookie@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4"
+  integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==
+  dependencies:
+    psl "^1.1.33"
+    punycode "^2.1.1"
+    universalify "^0.1.2"
+
+tough-cookie@~2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
   integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
@@ -8941,22 +8837,6 @@ tough-cookie@^2.3.3, tough-cookie@~2.5.0:
     psl "^1.1.28"
     punycode "^2.1.1"
 
-tough-cookie@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2"
-  integrity sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==
-  dependencies:
-    ip-regex "^2.1.0"
-    psl "^1.1.28"
-    punycode "^2.1.1"
-
-tough-cookie@~2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
-  integrity sha1-C2GKVWW23qkL80JdBNVe3EdadWE=
-  dependencies:
-    punycode "^1.4.1"
-
 tr46@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
@@ -8964,10 +8844,10 @@ tr46@^1.0.0:
   dependencies:
     punycode "^2.1.0"
 
-tr46@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz#03273586def1595ae08fedb38d7733cee91d2479"
-  integrity sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==
+tr46@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"
+  integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==
   dependencies:
     punycode "^2.1.1"
 
@@ -9085,7 +8965,7 @@ type-check@^0.4.0, type-check@~0.4.0:
 type-check@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
-  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
+  integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==
   dependencies:
     prelude-ls "~1.1.2"
 
@@ -9191,7 +9071,7 @@ unique-string@^2.0.0:
   dependencies:
     crypto-random-string "^2.0.0"
 
-universalify@^0.1.0:
+universalify@^0.1.0, universalify@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
@@ -9296,7 +9176,7 @@ uuid@^3.0.0:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
-uuid@^3.1.0, uuid@^3.3.2:
+uuid@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
   integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
@@ -9527,13 +9407,13 @@ whatwg-url@6.4.0:
     tr46 "^1.0.0"
     webidl-conversions "^4.0.1"
 
-whatwg-url@^8.0.0:
-  version "8.4.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.4.0.tgz#50fb9615b05469591d2b2bd6dfaed2942ed72837"
-  integrity sha512-vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw==
+whatwg-url@^8.0.0, whatwg-url@^8.5.0:
+  version "8.7.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77"
+  integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==
   dependencies:
-    lodash.sortby "^4.7.0"
-    tr46 "^2.0.2"
+    lodash "^4.7.0"
+    tr46 "^2.1.0"
     webidl-conversions "^6.1.0"
 
 which-boxed-primitive@^1.0.2:
@@ -9583,16 +9463,11 @@ window-location-origin@^0.1.0:
   resolved "https://registry.yarnpkg.com/window-location-origin/-/window-location-origin-0.1.0.tgz#e0a0b3cbe8802c4966b358f859315355d3a15e04"
   integrity sha1-4KCzy+iALElms1j4WTFTVdOhXgQ=
 
-word-wrap@^1.2.3:
+word-wrap@^1.2.3, word-wrap@~1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
 
-wordwrap@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
-  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
-
 worker-farm@^1.3.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.5.1.tgz#8e9f4a7da4f3c595aa600903051b969390423fa1"
@@ -9632,15 +9507,10 @@ write@1.0.3:
   dependencies:
     mkdirp "^0.5.1"
 
-ws@^7.2.3:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.3.1.tgz#d0547bf67f7ce4f12a72dfe31262c68d7dc551c8"
-  integrity sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==
-
-ws@^7.3.1:
-  version "7.5.7"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67"
-  integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==
+ws@^7.3.1, ws@^7.4.6:
+  version "7.5.8"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.8.tgz#ac2729881ab9e7cbaf8787fe3469a48c5c7f636a"
+  integrity sha512-ri1Id1WinAX5Jqn9HejiGb8crfRio0Qgu8+MtL36rlTA6RLsMdWt1Az/19A2Qij6uSHUMphEFaTKa4WG+UNHNw==
 
 xdg-basedir@^4.0.0:
   version "4.0.0"

From 6558795c067c8e127b7af8865fa92f1f6f0a9ed5 Mon Sep 17 00:00:00 2001
From: Sergio Padrino <sergio.padrino@gmail.com>
Date: Thu, 23 Jun 2022 12:35:13 +0200
Subject: [PATCH 35/88] Mention new improvements in release docs

---
 docs/process/releasing-updates.md | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/docs/process/releasing-updates.md b/docs/process/releasing-updates.md
index 0434d8aedb..d770b7031c 100644
--- a/docs/process/releasing-updates.md
+++ b/docs/process/releasing-updates.md
@@ -54,17 +54,15 @@ $ set GITHUB_ACCESS_TOKEN={your token here}
 $ $env:GITHUB_ACCESS_TOKEN="{your token here}"
 ```
 
-### 2. Create Release Branch
+### 2. Switch to the Commit of the Release
 
-Create a new branch to represent the work that will be released to users:
+You have to switch to the commit that represents the work that will be released to users:
 
- - for `beta` releases, branch from `development` to ensure the latest changes are published
- - for `production` releases, branch from the latest beta tag
+ - for `beta` releases, switch to `development` to ensure the latest changes are published
+ - for `production` releases, check out the latest beta tag
     - to find this tag: `git tag | grep 'beta' | sort -r | head -n 1`
 
-When naming the branch, ensure you use the `releases/[version]` pattern to ensure all CI platforms are aware of the branch and will build any PRs that target the branch.
-
-### 3. Create Draft Release
+### 3. Create Draft Release and Release Branch
 
 Run the script below (which relies on the your personal access token being set), which will determine the next version from what was previously published, based on the desired channel.
 
@@ -78,12 +76,11 @@ If you are creating a new beta release, the `yarn draft-release beta` command wi
 
 If you are create a new `production` release, you should just combine and sort the previous `beta` changelog entries.
 
-
-The script will output a draft changelog, which covers everything that's been merged, and probably needs some love.
-The output will then explain the next steps:
+The script will output a draft changelog, which covers everything that's been merged, and probably needs some love. It will also create the release branch for you. If that fails for whatever reason and you must create the branch manually, ensure you use the `releases/[version]` pattern for its name to ensure all CI platforms are aware of the branch and will build any PRs that target the branch.
 
 If you have pretext release note drafted in `app/static/common/pretext-draft.md`, you can add the `--pretext` flag to generate a pretext change log entry it. Example: `yarn draft-release test --pretext`
 
+The output will then explain the next steps:
 ```shellsession
 Here's what you should do next:
 
@@ -135,6 +132,8 @@ Add your new changelog entries to `changelog.json`, update the version in `app/p
 
 If a maintainer would like to backport a pull request to the next release, it is their responsibility to co-ordinate with the release owner and ensure they are fine with accepting this work.
 
+After pushing the branch, an action will create a release Pull Request for it. If that action fails for whatever reason, you can fall back to using the `yarn draft-release:pr` command, or create it manually.
+
 Once your release branch is ready to review and ship, ask the other maintainers to review and approve the changes!
 
 IMPORTANT NOTE: Do NOT "Update branch" and merge development into the release branch. This might be tempting if the "branch is out-of-date with the base branch" dotcom feature is enabled. However, doing so would inadvertently release everything on development to production or beta 🙀

From 2e5fac8d3534a08878e2454405e0a768ea785658 Mon Sep 17 00:00:00 2001
From: tidy-dev <tidy-dev@github.com>
Date: Thu, 23 Jun 2022 09:18:16 -0400
Subject: [PATCH 36/88] Use invalidation props

---
 app/src/ui/history/commit-list.tsx |  2 +-
 app/src/ui/lib/list/list.tsx       | 11 +----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/app/src/ui/history/commit-list.tsx b/app/src/ui/history/commit-list.tsx
index 4a33cb3c75..cecc49eece 100644
--- a/app/src/ui/history/commit-list.tsx
+++ b/app/src/ui/history/commit-list.tsx
@@ -375,7 +375,6 @@ export class CommitList extends React.Component<ICommitListProps, {}> {
           rowCount={this.props.commitSHAs.length}
           rowHeight={RowHeight}
           selectedRows={this.props.selectedSHAs.map(sha => this.rowForSHA(sha))}
-          forceGridUpdate={this.props.shasNotInDiffHighlighted}
           rowRenderer={this.renderCommit}
           onDropDataInsertion={this.onDropDataInsertion}
           onSelectionChanged={this.onSelectionChanged}
@@ -390,6 +389,7 @@ export class CommitList extends React.Component<ICommitListProps, {}> {
             localCommitSHAs: this.props.localCommitSHAs,
             commitLookupHash: this.commitsHash(this.getVisibleCommits()),
             tagsToPush: this.props.tagsToPush,
+            shasNotInDiffHighlighted: this.props.shasNotInDiffHighlighted,
           }}
           setScrollTop={this.props.compareListScrollTop}
         />
diff --git a/app/src/ui/lib/list/list.tsx b/app/src/ui/lib/list/list.tsx
index b3a73348c4..2e688f9c94 100644
--- a/app/src/ui/lib/list/list.tsx
+++ b/app/src/ui/lib/list/list.tsx
@@ -225,8 +225,6 @@ interface IListProps {
    * where to scroll do on rendering of the list.
    */
   readonly setScrollTop?: number
-
-  readonly forceGridUpdate?: boolean
 }
 
 interface IListState {
@@ -754,19 +752,12 @@ export class List extends React.Component<IListProps, IListState> {
           this.props.invalidationProps
         )
 
-        const forceRowRerenderChanged =
-          prevProps.forceGridUpdate !== this.props.forceGridUpdate
-
         // Now we need to figure out whether anything changed in such a way that
         // the Grid has to update regardless of its props. Previously we passed
         // our selectedRow and invalidationProps down to Grid and figured that
         // it, being a pure component, would do the right thing but that's not
         // quite the case since invalidationProps is a complex object.
-        if (
-          selectedRowChanged ||
-          invalidationPropsChanged ||
-          forceRowRerenderChanged
-        ) {
+        if (selectedRowChanged || invalidationPropsChanged) {
           this.grid.forceUpdate()
         }
       }

From 5276d93c9a4ebdc59a6cffeec1ddae8118d4c7ba Mon Sep 17 00:00:00 2001
From: Sergio Padrino <sergio.padrino@gmail.com>
Date: Thu, 23 Jun 2022 15:22:42 +0200
Subject: [PATCH 37/88] Update docs/process/releasing-updates.md

Co-authored-by: tidy-dev <75402236+tidy-dev@users.noreply.github.com>
---
 docs/process/releasing-updates.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/process/releasing-updates.md b/docs/process/releasing-updates.md
index d770b7031c..429c2dc4a2 100644
--- a/docs/process/releasing-updates.md
+++ b/docs/process/releasing-updates.md
@@ -132,7 +132,7 @@ Add your new changelog entries to `changelog.json`, update the version in `app/p
 
 If a maintainer would like to backport a pull request to the next release, it is their responsibility to co-ordinate with the release owner and ensure they are fine with accepting this work.
 
-After pushing the branch, an action will create a release Pull Request for it. If that action fails for whatever reason, you can fall back to using the `yarn draft-release:pr` command, or create it manually.
+After pushing the branch, a [GitHub Action](https://github.com/desktop/desktop/blob/development/.github/workflows/release-pr.yml) will create a release Pull Request for it. If that action fails for whatever reason, you can fall back to using the `yarn draft-release:pr` command, or create it manually.
 
 Once your release branch is ready to review and ship, ask the other maintainers to review and approve the changes!
 

From 8b7172fb216e7b7ccb40be1440084995310fced3 Mon Sep 17 00:00:00 2001
From: tidy-dev <tidy-dev@github.com>
Date: Thu, 23 Jun 2022 10:41:09 -0400
Subject: [PATCH 38/88] Move opacity up to list item and add transition effect

---
 .../ui/drag-elements/commit-drag-element.tsx  |  1 -
 app/src/ui/history/commit-list-item.tsx       |  9 ++-----
 app/src/ui/history/commit-list.tsx            | 25 +++++++++++++-----
 app/src/ui/lib/configure-git-user.tsx         |  1 -
 app/src/ui/lib/list/list.tsx                  | 26 +++++++++++++++++++
 app/styles/ui/history/_commit-list.scss       | 12 ++++++---
 6 files changed, 55 insertions(+), 19 deletions(-)

diff --git a/app/src/ui/drag-elements/commit-drag-element.tsx b/app/src/ui/drag-elements/commit-drag-element.tsx
index 4d95ca9570..fc674e7d32 100644
--- a/app/src/ui/drag-elements/commit-drag-element.tsx
+++ b/app/src/ui/drag-elements/commit-drag-element.tsx
@@ -183,7 +183,6 @@ export class CommitDragElement extends React.Component<
             canBeResetTo={false}
             isLocal={false}
             showUnpushedIndicator={false}
-            isNotInDiff={false}
           />
         </div>
         {this.renderDragToolTip()}
diff --git a/app/src/ui/history/commit-list-item.tsx b/app/src/ui/history/commit-list-item.tsx
index d81d89e278..374a299173 100644
--- a/app/src/ui/history/commit-list-item.tsx
+++ b/app/src/ui/history/commit-list-item.tsx
@@ -57,7 +57,6 @@ interface ICommitProps {
   readonly unpushedTags?: ReadonlyArray<string>
   readonly isCherryPickInProgress?: boolean
   readonly disableSquashing?: boolean
-  readonly isNotInDiff: boolean
 }
 
 interface ICommitListItemState {
@@ -128,7 +127,7 @@ export class CommitListItem extends React.PureComponent<
   }
 
   public render() {
-    const { commit, isNotInDiff } = this.props
+    const { commit } = this.props
     const {
       author: { date },
     } = commit
@@ -143,10 +142,6 @@ export class CommitListItem extends React.PureComponent<
       'empty-summary': hasEmptySummary,
     })
 
-    const commitClassNames = classNames('commit', {
-      'not-in-diff': isNotInDiff,
-    })
-
     return (
       <Draggable
         isEnabled={isDraggable}
@@ -161,7 +156,7 @@ export class CommitListItem extends React.PureComponent<
         ]}
       >
         <div
-          className={commitClassNames}
+          className="commit"
           onContextMenu={this.onContextMenu}
           onMouseEnter={this.onMouseEnter}
           onMouseLeave={this.onMouseLeave}
diff --git a/app/src/ui/history/commit-list.tsx b/app/src/ui/history/commit-list.tsx
index cecc49eece..9e1443cc6f 100644
--- a/app/src/ui/history/commit-list.tsx
+++ b/app/src/ui/history/commit-list.tsx
@@ -186,11 +186,6 @@ export class CommitList extends React.Component<ICommitListProps, {}> {
     const isResettableCommit =
       row > 0 && row <= this.props.localCommitSHAs.length
 
-    const isNotInDiff =
-      this.props.selectedSHAs.includes(commit.sha) &&
-      !this.props.shasInDiff.includes(commit.sha) &&
-      this.props.shasNotInDiffHighlighted
-
     return (
       <CommitListItem
         key={commit.sha}
@@ -222,7 +217,6 @@ export class CommitList extends React.Component<ICommitListProps, {}> {
         onRenderCommitDragElement={this.onRenderCommitDragElement}
         onRemoveDragElement={this.props.onRemoveCommitDragElement}
         disableSquashing={this.props.disableSquashing}
-        isNotInDiff={isNotInDiff}
       />
     )
   }
@@ -362,6 +356,24 @@ export class CommitList extends React.Component<ICommitListProps, {}> {
     return this.props.commitSHAs.findIndex(s => s === sha)
   }
 
+  private getRowCustomClassMap = () => {
+    if (!this.props.shasNotInDiffHighlighted) {
+      return undefined
+    }
+
+    const rowsForShasNotInDiff = this.props.selectedSHAs
+      .filter(sha => !this.props.shasInDiff.includes(sha))
+      .map(sha => this.rowForSHA(sha))
+
+    if (rowsForShasNotInDiff.length === 0) {
+      return undefined
+    }
+
+    const rowClassMap = new Map<string, ReadonlyArray<number>>()
+    rowClassMap.set('not-in-diff', rowsForShasNotInDiff)
+    return rowClassMap
+  }
+
   public render() {
     if (this.props.commitSHAs.length === 0) {
       return (
@@ -392,6 +404,7 @@ export class CommitList extends React.Component<ICommitListProps, {}> {
             shasNotInDiffHighlighted: this.props.shasNotInDiffHighlighted,
           }}
           setScrollTop={this.props.compareListScrollTop}
+          rowCustomClassNameMap={this.getRowCustomClassMap()}
         />
       </div>
     )
diff --git a/app/src/ui/lib/configure-git-user.tsx b/app/src/ui/lib/configure-git-user.tsx
index 1c033c77a0..fa652d57cf 100644
--- a/app/src/ui/lib/configure-git-user.tsx
+++ b/app/src/ui/lib/configure-git-user.tsx
@@ -254,7 +254,6 @@ export class ConfigureGitUser extends React.Component<
           isLocal={false}
           showUnpushedIndicator={false}
           selectedCommits={[dummyCommit]}
-          isNotInDiff={false}
         />
       </div>
     )
diff --git a/app/src/ui/lib/list/list.tsx b/app/src/ui/lib/list/list.tsx
index 2e688f9c94..efcd273f3b 100644
--- a/app/src/ui/lib/list/list.tsx
+++ b/app/src/ui/lib/list/list.tsx
@@ -77,6 +77,11 @@ interface IListProps {
    */
   readonly selectedRows: ReadonlyArray<number>
 
+  /**
+   * Used to attach special classes to specific rows
+   */
+  readonly rowCustomClassNameMap?: Map<string, ReadonlyArray<number>>
+
   /**
    * This function will be called when a pointer device is pressed and then
    * released on a selectable row. Note that this follows the conventions
@@ -791,10 +796,30 @@ export class List extends React.Component<IListProps, IListState> {
     this.focusRow = -1
   }
 
+  private getCustomRowClassNames = (rowIndex: number) => {
+    const { rowCustomClassNameMap } = this.props
+    if (rowCustomClassNameMap === undefined) {
+      return undefined
+    }
+
+    const customClasses = new Array<string>()
+    rowCustomClassNameMap.forEach(
+      (rows: ReadonlyArray<number>, className: string) => {
+        if (rows.includes(rowIndex)) {
+          customClasses.push(className)
+        }
+      }
+    )
+
+    return customClasses.length === 0 ? undefined : customClasses.join(' ')
+  }
+
   private renderRow = (params: IRowRendererParams) => {
     const rowIndex = params.rowIndex
     const selectable = this.canSelectRow(rowIndex)
     const selected = this.props.selectedRows.indexOf(rowIndex) !== -1
+    const customClasses = this.getCustomRowClassNames(rowIndex)
+
     const focused = rowIndex === this.focusRow
 
     // An unselectable row shouldn't be focusable
@@ -843,6 +868,7 @@ export class List extends React.Component<IListProps, IListState> {
         tabIndex={tabIndex}
         children={element}
         selectable={selectable}
+        className={customClasses}
       />
     )
   }
diff --git a/app/styles/ui/history/_commit-list.scss b/app/styles/ui/history/_commit-list.scss
index a1de840765..fe07dac1ea 100644
--- a/app/styles/ui/history/_commit-list.scss
+++ b/app/styles/ui/history/_commit-list.scss
@@ -52,6 +52,14 @@
     }
   }
 
+  .list-item {
+    transition: opacity 0.75s;
+
+    &.not-in-diff {
+      opacity: 50%;
+    }
+  }
+
   .focus-within {
     .list-item.selected {
       .commit {
@@ -96,10 +104,6 @@
   padding-right: calc(var(--spacing) + var(--spacing-half));
   padding-left: var(--spacing);
 
-  &.not-in-diff {
-    opacity: 50%;
-  }
-
   .info {
     display: flex;
     flex: 1 1 auto;

From ecdb797077a5ab865aa29e069a61b1e066dc6a1f Mon Sep 17 00:00:00 2001
From: Billy Griffin <5091167+billygriffin@users.noreply.github.com>
Date: Sat, 25 Jun 2022 16:10:07 -0600
Subject: [PATCH 39/88] Update roadmap doc

---
 docs/process/roadmap.md | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/docs/process/roadmap.md b/docs/process/roadmap.md
index 9e1832931a..84e3ee6d27 100644
--- a/docs/process/roadmap.md
+++ b/docs/process/roadmap.md
@@ -1,14 +1,22 @@
 # Roadmap
 
-The following are the larger areas of upcoming work the GitHub Desktop team intends to explore. This is not inclusive of everything we're working on, and it's not written in stone. We'll continue to update it as our priorities evolve.
+The following are the larger areas of upcoming work the GitHub Desktop team intends to explore and has recently shipped. This is not inclusive of everything we're working on (see existing open pull requests for that), and it's not written in stone. We'll attempt to update this intermittently as priorities evolve, but can't guarantee that it stays up to date over time.
 
-#### Native arm64 support for macOS and Windows
+## Major features shipped in previous releases
 
-- Provide support for arm64 Windows machines: [#9691](https://github.com/desktop/desktop/pull/9691)
+#### High signal notifications (2.9.10 and 3.0.0)
 
-## Shipped in previous releases
+- Receive a notification when checks fail: [#13655](https://github.com/desktop/desktop/pull/14175)
+- Receive a notification when your pull request is reviewed: [#14175](https://github.com/desktop/desktop/pull/14175)
 
-#### Native support for Apple Silicon (M1)
+#### Improved commit history: reorder commits, squash commits, amend commits, and create a branch from previous commit (2.9.0)
+
+- Reorder commits via drag/drop: [#12384](https://github.com/desktop/desktop/pull/12384)
+- Squash commits via drag/drop: [#12235](https://github.com/desktop/desktop/pull/12235)
+- Amend last commit: [#12353](https://github.com/desktop/desktop/pull/12353)
+- Create a branch from a previous commit: [#12160](https://github.com/desktop/desktop/pull/12160)
+
+#### Native support for Apple Silicon (M1) machines (2.8.2)
 
 - Provide support for Apple Silicon (M1) machines: [#9691](https://github.com/desktop/desktop/pull/9691)
 

From c164c00346580edf6b0a2758ec0c543c64371c23 Mon Sep 17 00:00:00 2001
From: Kai <Schweinepriester@users.noreply.github.com>
Date: Sun, 26 Jun 2022 16:06:27 +0200
Subject: [PATCH 40/88] README.md: HTTP => HTTPS

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a5038a7fdb..d8909ee13e 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # [GitHub Desktop](https://desktop.github.com)
 
 [GitHub Desktop](https://desktop.github.com/) is an open source [Electron](https://www.electronjs.org/)-based
-GitHub app. It is written in [TypeScript](http://www.typescriptlang.org) and
+GitHub app. It is written in [TypeScript](https://www.typescriptlang.org) and
 uses [React](https://reactjs.org/).
 
 ![GitHub Desktop screenshot - Windows](https://cloud.githubusercontent.com/assets/359239/26094502/a1f56d02-3a5d-11e7-8799-23c7ba5e5106.png)

From 1bfcd1986df982bae94349c064833e33f8730254 Mon Sep 17 00:00:00 2001
From: Sergio Padrino <sergio.padrino@gmail.com>
Date: Thu, 23 Jun 2022 09:45:51 +0200
Subject: [PATCH 41/88] Revert "Merge pull request #14813 from
 desktop/upgrade-to-electron-v19"

This reverts commit 5cc82654ad84e6244ea2e5cac8bacc4631ed18bc, reversing
changes made to 5c6eb98e11ad01492cb88f98e096d3b3cb635bdb.
---
 app/.npmrc   |  2 +-
 package.json |  2 +-
 yarn.lock    | 28 ++++++++++++++--------------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/.npmrc b/app/.npmrc
index efea0b211b..504b4d19ba 100644
--- a/app/.npmrc
+++ b/app/.npmrc
@@ -1,3 +1,3 @@
 runtime = electron
 disturl = https://electronjs.org/headers
-target = 19.0.0
+target = 17.0.1
diff --git a/package.json b/package.json
index 920e8bbdb6..db4432a579 100644
--- a/package.json
+++ b/package.json
@@ -153,7 +153,7 @@
     "@types/webpack-hot-middleware": "^2.25.6",
     "@types/webpack-merge": "^5.0.0",
     "@types/xml2js": "^0.4.0",
-    "electron": "19.0.0",
+    "electron": "17.0.1",
     "electron-builder": "^22.7.0",
     "electron-packager": "^15.1.0",
     "electron-winstaller": "^5.0.0",
diff --git a/yarn.lock b/yarn.lock
index 6c949d2685..ed146d2026 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -506,10 +506,10 @@
     ajv "^6.12.0"
     ajv-keywords "^3.4.1"
 
-"@electron/get@^1.14.1":
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz#16ba75f02dffb74c23965e72d617adc721d27f40"
-  integrity sha512-BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw==
+"@electron/get@^1.13.0":
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.13.1.tgz#42a0aa62fd1189638bd966e23effaebb16108368"
+  integrity sha512-U5vkXDZ9DwXtkPqlB45tfYnnYBN8PePp1z/XDCupnSpdrxT8/ThCv9WCwPLf9oqiSGZTkH6dx2jDUPuoXpjkcA==
   dependencies:
     debug "^4.1.1"
     env-paths "^2.2.0"
@@ -1158,10 +1158,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.11.tgz#6ea7342dfb379ea1210835bada87b3c512120234"
   integrity sha512-KB0sixD67CeecHC33MYn+eYARkqTheIRNuu97y2XMjR7Wu3XibO1vaY6VBV6O/a89SPI81cEUIYT87UqUWlZNw==
 
-"@types/node@^16.11.26":
-  version "16.11.40"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.40.tgz#bcf85f3febe74436107aeb2d3fb5fd0d30818600"
-  integrity sha512-7bOWglXUO6f21NG3YDI7hIpeMX3M59GG+DzZuzX2EkFKYUnRoxq3EOg4R0KNv2hxryY9M3UUqG5akwwsifrukw==
+"@types/node@^14.6.2":
+  version "14.17.5"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.5.tgz#b59daf6a7ffa461b5648456ca59050ba8e40ed54"
+  integrity sha512-bjqH2cX/O33jXT/UmReo2pM7DIJREPMnarixbQ57DOOzzFaI6D2+IcwaJQaJpv0M1E9TIhPCYVxrkcityLjlqA==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
@@ -3419,13 +3419,13 @@ electron-winstaller@*, electron-winstaller@^5.0.0:
     lodash.template "^4.2.2"
     temp "^0.9.0"
 
-electron@19.0.0:
-  version "19.0.0"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-19.0.0.tgz#f6b742b708ec118676ba3b38d0f3712d8f0311cf"
-  integrity sha512-VXwqLQxuIUr0SI8vOYDj5OLPwtKa/trn5DVKd/BFGT/U/IerfVoSZuydGLOjSL5yJlckfmKQpiq+8PW4gI8hXA==
+electron@17.0.1:
+  version "17.0.1"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-17.0.1.tgz#e6c7ad2be26e7be8a5a9bac16b21920ad2671224"
+  integrity sha512-CBReR/QEOpgwMdt59lWCtj9wC8oHB6aAjMF1lhXcGew132xtp+C5N6EaXb/fmDceVYLouziYjbNcpeXsWrqdpA==
   dependencies:
-    "@electron/get" "^1.14.1"
-    "@types/node" "^16.11.26"
+    "@electron/get" "^1.13.0"
+    "@types/node" "^14.6.2"
     extract-zip "^1.0.3"
 
 element-closest@^2.0.2:

From 5d94058329a9485db41846c6de29dca51737f781 Mon Sep 17 00:00:00 2001
From: Sergio Padrino <sergio.padrino@gmail.com>
Date: Thu, 23 Jun 2022 09:47:57 +0200
Subject: [PATCH 42/88] Bump version and changelog to v3.0.3

---
 app/package.json |  2 +-
 changelog.json   | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/package.json b/app/package.json
index d9dcdad01a..171c613a4a 100644
--- a/app/package.json
+++ b/app/package.json
@@ -3,7 +3,7 @@
   "productName": "GitHub Desktop",
   "bundleID": "com.github.GitHubClient",
   "companyName": "GitHub, Inc.",
-  "version": "3.0.3-beta1",
+  "version": "3.0.3",
   "main": "./main.js",
   "repository": {
     "type": "git",
diff --git a/changelog.json b/changelog.json
index 82078a9780..5d2a1c04fb 100644
--- a/changelog.json
+++ b/changelog.json
@@ -1,5 +1,15 @@
 {
   "releases": {
+    "3.0.3": [
+      "[Added] Add Aptana Studio support - #14669. Thanks @tsvetilian-ty!",
+      "[Fixed] Fix crash when user's locale is unsupported by the spellchecker - #14817. Thanks @tsvetilian-ty!",
+      "[Fixed] On Windows, remember the app's zoom level on update - #5315",
+      "[Fixed] Fix Markdown syntax highlighting - #14710",
+      "[Improved] Add context menu option to copy repository paths - #14785. Thanks @novialriptide!",
+      "[Improved] Allow copying paths when multiple files are selected - #14638. Thanks @tsvetilian-ty!",
+      "[Improved] Add support for SSH password prompts when accessing repositories - #14676",
+      "[Improved] Add context menu to Current Branch and Current Repository toolbar items - #13664. Thanks @uttiya10!"
+    ],
     "3.0.3-beta1": [
       "[Added] Add Aptana Studio support - #14669. Thanks @tsvetilian-ty!",
       "[Fixed] Fix crash when user's locale is unsupported by the spellchecker - #14817. Thanks @tsvetilian-ty!",

From 2b610f4e4c32416d4480cfce058e108116b867eb Mon Sep 17 00:00:00 2001
From: Sergio Padrino <sergio.padrino@gmail.com>
Date: Thu, 23 Jun 2022 15:09:29 +0200
Subject: [PATCH 43/88] Update changelog.json

Co-authored-by: tidy-dev <75402236+tidy-dev@users.noreply.github.com>
---
 changelog.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.json b/changelog.json
index 5d2a1c04fb..bb26a16ad2 100644
--- a/changelog.json
+++ b/changelog.json
@@ -8,7 +8,7 @@
       "[Improved] Add context menu option to copy repository paths - #14785. Thanks @novialriptide!",
       "[Improved] Allow copying paths when multiple files are selected - #14638. Thanks @tsvetilian-ty!",
       "[Improved] Add support for SSH password prompts when accessing repositories - #14676",
-      "[Improved] Add context menu to Current Branch and Current Repository toolbar items - #13664. Thanks @uttiya10!"
+      "[Improved] Add context menu to the current branch and the current repository toolbar items - #13664. Thanks @uttiya10!"
     ],
     "3.0.3-beta1": [
       "[Added] Add Aptana Studio support - #14669. Thanks @tsvetilian-ty!",

From ecd0e10953dba5193595453ac727c4fcc679c366 Mon Sep 17 00:00:00 2001
From: Sergio Padrino <sergio.padrino@gmail.com>
Date: Mon, 27 Jun 2022 10:48:53 +0200
Subject: [PATCH 44/88] Remove entry from release notes

---
 changelog.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/changelog.json b/changelog.json
index bb26a16ad2..137e1eb07e 100644
--- a/changelog.json
+++ b/changelog.json
@@ -7,8 +7,7 @@
       "[Fixed] Fix Markdown syntax highlighting - #14710",
       "[Improved] Add context menu option to copy repository paths - #14785. Thanks @novialriptide!",
       "[Improved] Allow copying paths when multiple files are selected - #14638. Thanks @tsvetilian-ty!",
-      "[Improved] Add support for SSH password prompts when accessing repositories - #14676",
-      "[Improved] Add context menu to the current branch and the current repository toolbar items - #13664. Thanks @uttiya10!"
+      "[Improved] Add support for SSH password prompts when accessing repositories - #14676"
     ],
     "3.0.3-beta1": [
       "[Added] Add Aptana Studio support - #14669. Thanks @tsvetilian-ty!",

From 5470d8386d71c418ca45957a49408f7408505ed8 Mon Sep 17 00:00:00 2001
From: tidy-dev <tidy-dev@github.com>
Date: Mon, 27 Jun 2022 14:30:24 -0400
Subject: [PATCH 45/88] Remove Learn why and add links to commits mentions

---
 app/src/ui/history/commit-summary.tsx      | 78 +++++++++++++---------
 app/styles/ui/history/_commit-summary.scss |  2 +-
 2 files changed, 49 insertions(+), 31 deletions(-)

diff --git a/app/src/ui/history/commit-summary.tsx b/app/src/ui/history/commit-summary.tsx
index 72e5806bf2..f19fbfdd61 100644
--- a/app/src/ui/history/commit-summary.tsx
+++ b/app/src/ui/history/commit-summary.tsx
@@ -109,11 +109,11 @@ function createState(
   isOverflowed: boolean,
   props: ICommitSummaryProps
 ): ICommitSummaryState {
-  const { emoji, repository, selectedCommits, shasInDiff } = props
+  const { emoji, repository, selectedCommits } = props
   const tokenizer = new Tokenizer(emoji, repository)
 
   const { summary, body } = wrapRichTextCommitMessage(
-    getCommitSummary(selectedCommits, shasInDiff),
+    getCommitSummary(selectedCommits),
     selectedCommits[0].body,
     tokenizer
   )
@@ -133,21 +133,10 @@ function createState(
   return { isOverflowed, summary, body, avatarUsers, hasEmptySummary }
 }
 
-function getCommitSummary(
-  selectedCommits: ReadonlyArray<Commit>,
-  shasInDiff: ReadonlyArray<string>
-) {
-  if (selectedCommits.length === 1) {
-    return selectedCommits[0].summary.length === 0
-      ? 'Empty commit message'
-      : selectedCommits[0].summary
-  }
-
-  const numInDiff =
-    selectedCommits.length -
-    getCountCommitsNotInDiff(selectedCommits, shasInDiff)
-
-  return `Showing changes from ${numInDiff} commits`
+function getCommitSummary(selectedCommits: ReadonlyArray<Commit>) {
+  return selectedCommits[0].summary.length === 0
+    ? 'Empty commit message'
+    : selectedCommits[0].summary
 }
 
 function getCountCommitsNotInDiff(
@@ -362,6 +351,10 @@ export class CommitSummary extends React.Component<
     this.props.onHighlightShasNotInDiff(false)
   }
 
+  private showUnreachableCommits() {
+    // TODO: open to dialog with commits list of unreachable commits
+  }
+
   private renderCommitsNotReachable = () => {
     const { selectedCommits, shasInDiff } = this.props
     if (selectedCommits.length === 1) {
@@ -383,8 +376,11 @@ export class CommitSummary extends React.Component<
         onMouseOver={this.onHighlightShasInDiff}
         onMouseOut={this.onRemoveHighlightShasInDiff}
       >
-        <Octicon symbol={OcticonSymbol.info} /> {excludedCommitsCount}{' '}
-        unreachable commits not included. <LinkButton>Learn why</LinkButton>
+        <Octicon symbol={OcticonSymbol.info} />
+        <LinkButton onClick={this.showUnreachableCommits}>
+          {excludedCommitsCount} unreachable commits
+        </LinkButton>{' '}
+        not included.
       </div>
     )
   }
@@ -435,6 +431,38 @@ export class CommitSummary extends React.Component<
     )
   }
 
+  private renderSummary = () => {
+    const { selectedCommits, shasInDiff } = this.props
+    const { summary, hasEmptySummary } = this.state
+    const summaryClassNames = classNames('commit-summary-title', {
+      'empty-summary': hasEmptySummary,
+    })
+
+    if (selectedCommits.length === 1) {
+      return (
+        <RichText
+          className={summaryClassNames}
+          emoji={this.props.emoji}
+          repository={this.props.repository}
+          text={summary}
+        />
+      )
+    }
+
+    const numInDiff =
+      selectedCommits.length -
+      getCountCommitsNotInDiff(selectedCommits, shasInDiff)
+
+    return (
+      <div className={summaryClassNames}>
+        Showing changes from{' '}
+        <LinkButton onClick={this.showUnreachableCommits}>
+          {numInDiff} commits
+        </LinkButton>
+      </div>
+    )
+  }
+
   public render() {
     const className = classNames({
       expanded: this.props.isExpanded,
@@ -443,20 +471,10 @@ export class CommitSummary extends React.Component<
       'hide-description-border': this.props.hideDescriptionBorder,
     })
 
-    const { summary, hasEmptySummary } = this.state
-    const summaryClassNames = classNames('commit-summary-title', {
-      'empty-summary': hasEmptySummary,
-    })
-
     return (
       <div id="commit-summary" className={className}>
         <div className="commit-summary-header">
-          <RichText
-            className={summaryClassNames}
-            emoji={this.props.emoji}
-            repository={this.props.repository}
-            text={summary}
-          />
+          {this.renderSummary()}
           <ul className="commit-summary-meta">
             {this.renderAuthors()}
             {this.renderCommitRef()}
diff --git a/app/styles/ui/history/_commit-summary.scss b/app/styles/ui/history/_commit-summary.scss
index c0268b5b0f..bc18a6af0b 100644
--- a/app/styles/ui/history/_commit-summary.scss
+++ b/app/styles/ui/history/_commit-summary.scss
@@ -72,7 +72,7 @@
     }
 
     .link-button-component {
-      margin-left: var(--spacing-half);
+      margin-right: var(--spacing-half);
     }
   }
 }

From 1c1356c9fd297e810be5e5c7edc4bfecb64cb5bd Mon Sep 17 00:00:00 2001
From: tidy-dev <tidy-dev@github.com>
Date: Mon, 27 Jun 2022 15:45:07 -0400
Subject: [PATCH 46/88] Highlight commits in and not in the diff on hover

---
 app/src/lib/app-state.ts                     |  7 ++--
 app/src/lib/stores/app-store.ts              |  8 ++---
 app/src/lib/stores/repository-state-cache.ts |  2 +-
 app/src/ui/dispatcher/dispatcher.ts          | 11 +++---
 app/src/ui/history/commit-list.tsx           | 37 +++++++++++---------
 app/src/ui/history/commit-summary.tsx        | 27 +++++++++-----
 app/src/ui/history/compare.tsx               |  6 ++--
 app/src/ui/history/selected-commits.tsx      |  8 ++---
 app/src/ui/lib/link-button.tsx               |  8 +++++
 app/src/ui/repository.tsx                    |  5 ++-
 app/styles/ui/history/_commit-list.scss      | 10 +++---
 11 files changed, 73 insertions(+), 56 deletions(-)

diff --git a/app/src/lib/app-state.ts b/app/src/lib/app-state.ts
index 57b2814eb5..92e068ce9b 100644
--- a/app/src/lib/app-state.ts
+++ b/app/src/lib/app-state.ts
@@ -572,10 +572,6 @@ export interface ICommitSelection {
    * */
   readonly shasInDiff: ReadonlyArray<string>
 
-  /** Whether or not the shas not in the diff should be differentiated from the
-   * shas in the diff in the commit list */
-  readonly shasNotInDiffHighlighted: boolean
-
   /**
    * Whether the a selection of commits are group of adjacent to each other.
    * Example: Given these are indexes of sha's in history, 3, 4, 5, 6 is contiguous as
@@ -740,6 +736,9 @@ export interface ICompareState {
   /** The SHAs of commits to render in the compare list */
   readonly commitSHAs: ReadonlyArray<string>
 
+  /** The SHAs of commits to highlight in the compare list */
+  readonly shasToHighlight: ReadonlyArray<string>
+
   /**
    * A list of branches (remote and local) except the current branch, and
    * Desktop fork remote branches (see `Branch.isDesktopForkRemoteBranch`)
diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts
index b98245df3a..8303cecb96 100644
--- a/app/src/lib/stores/app-store.ts
+++ b/app/src/lib/stores/app-store.ts
@@ -1139,12 +1139,12 @@ export class AppStore extends TypedBaseStore<IAppState> {
   }
 
   /** This shouldn't be called directly. See `Dispatcher`. */
-  public async _updateShasNotInDiffHighlighted(
+  public async _updateShasToHighlight(
     repository: Repository,
-    shasNotInDiffHighlighted: boolean
+    shasToHighlight: ReadonlyArray<string>
   ) {
-    this.repositoryStateCache.updateCommitSelection(repository, () => ({
-      shasNotInDiffHighlighted,
+    this.repositoryStateCache.updateCompareState(repository, () => ({
+      shasToHighlight,
     }))
     this.emitUpdate()
   }
diff --git a/app/src/lib/stores/repository-state-cache.ts b/app/src/lib/stores/repository-state-cache.ts
index eae435244a..fcba3c82c3 100644
--- a/app/src/lib/stores/repository-state-cache.ts
+++ b/app/src/lib/stores/repository-state-cache.ts
@@ -179,7 +179,6 @@ function getInitialRepositoryState(): IRepositoryState {
     commitSelection: {
       shas: [],
       shasInDiff: [],
-      shasNotInDiffHighlighted: false,
       isContiguous: true,
       file: null,
       changesetData: { files: [], linesAdded: 0, linesDeleted: 0 },
@@ -221,6 +220,7 @@ function getInitialRepositoryState(): IRepositoryState {
       showBranchList: false,
       filterText: '',
       commitSHAs: [],
+      shasToHighlight: [],
       branches: new Array<Branch>(),
       recentBranches: new Array<Branch>(),
       defaultBranch: null,
diff --git a/app/src/ui/dispatcher/dispatcher.ts b/app/src/ui/dispatcher/dispatcher.ts
index 1e09eb5a63..9a959eb498 100644
--- a/app/src/ui/dispatcher/dispatcher.ts
+++ b/app/src/ui/dispatcher/dispatcher.ts
@@ -241,15 +241,12 @@ export class Dispatcher {
     return this.appStore._changeCommitSelection(repository, shas, isContiguous)
   }
 
-  /** Update whether shas not in the diff should be highlighted (or opposite of highlighted..) */
-  public updateShasNotInDiffHighlighted(
+  /** Update the shas that should be highlighted */
+  public updateShasToHighlight(
     repository: Repository,
-    shasNotInDiffHighlighted: boolean
+    shasToHighlight: ReadonlyArray<string>
   ) {
-    this.appStore._updateShasNotInDiffHighlighted(
-      repository,
-      shasNotInDiffHighlighted
-    )
+    this.appStore._updateShasToHighlight(repository, shasToHighlight)
   }
 
   /**
diff --git a/app/src/ui/history/commit-list.tsx b/app/src/ui/history/commit-list.tsx
index 9e1443cc6f..058d5e9978 100644
--- a/app/src/ui/history/commit-list.tsx
+++ b/app/src/ui/history/commit-list.tsx
@@ -6,6 +6,7 @@ import { CommitListItem } from './commit-list-item'
 import { List } from '../lib/list'
 import { arrayEquals } from '../../lib/equality'
 import { DragData, DragType } from '../../models/drag-drop'
+import classNames from 'classnames'
 
 const RowHeight = 50
 
@@ -133,11 +134,8 @@ interface ICommitListProps {
   /** Whether squashing should be enabled on the commit list */
   readonly disableSquashing?: boolean
 
-  /** Which shas are shown in the diff */
-  readonly shasInDiff: ReadonlyArray<string>
-
-  /** Whether the shas not in the diff should be highlighted */
-  readonly shasNotInDiffHighlighted: boolean
+  /** Shas that should be highlighted */
+  readonly shasToHighlight: ReadonlyArray<string>
 }
 
 /** A component which displays the list of commits. */
@@ -357,12 +355,13 @@ export class CommitList extends React.Component<ICommitListProps, {}> {
   }
 
   private getRowCustomClassMap = () => {
-    if (!this.props.shasNotInDiffHighlighted) {
+    const { commitSHAs, shasToHighlight } = this.props
+    if (shasToHighlight.length === 0) {
       return undefined
     }
 
-    const rowsForShasNotInDiff = this.props.selectedSHAs
-      .filter(sha => !this.props.shasInDiff.includes(sha))
+    const rowsForShasNotInDiff = commitSHAs
+      .filter(sha => shasToHighlight.includes(sha))
       .map(sha => this.rowForSHA(sha))
 
     if (rowsForShasNotInDiff.length === 0) {
@@ -370,23 +369,27 @@ export class CommitList extends React.Component<ICommitListProps, {}> {
     }
 
     const rowClassMap = new Map<string, ReadonlyArray<number>>()
-    rowClassMap.set('not-in-diff', rowsForShasNotInDiff)
+    rowClassMap.set('highlighted', rowsForShasNotInDiff)
     return rowClassMap
   }
 
   public render() {
-    if (this.props.commitSHAs.length === 0) {
-      return (
-        <div className="panel blankslate">{this.props.emptyListMessage}</div>
-      )
+    const { commitSHAs, selectedSHAs, shasToHighlight, emptyListMessage } =
+      this.props
+    if (commitSHAs.length === 0) {
+      return <div className="panel blankslate">{emptyListMessage}</div>
     }
 
+    const classes = classNames({
+      'has-highlighted-commits': shasToHighlight.length > 1,
+    })
+
     return (
-      <div id="commit-list">
+      <div id="commit-list" className={classes}>
         <List
-          rowCount={this.props.commitSHAs.length}
+          rowCount={commitSHAs.length}
           rowHeight={RowHeight}
-          selectedRows={this.props.selectedSHAs.map(sha => this.rowForSHA(sha))}
+          selectedRows={selectedSHAs.map(sha => this.rowForSHA(sha))}
           rowRenderer={this.renderCommit}
           onDropDataInsertion={this.onDropDataInsertion}
           onSelectionChanged={this.onSelectionChanged}
@@ -401,7 +404,7 @@ export class CommitList extends React.Component<ICommitListProps, {}> {
             localCommitSHAs: this.props.localCommitSHAs,
             commitLookupHash: this.commitsHash(this.getVisibleCommits()),
             tagsToPush: this.props.tagsToPush,
-            shasNotInDiffHighlighted: this.props.shasNotInDiffHighlighted,
+            shasToHighlight: this.props.shasToHighlight,
           }}
           setScrollTop={this.props.compareListScrollTop}
           rowCustomClassNameMap={this.getRowCustomClassMap()}
diff --git a/app/src/ui/history/commit-summary.tsx b/app/src/ui/history/commit-summary.tsx
index f19fbfdd61..2a80c344b4 100644
--- a/app/src/ui/history/commit-summary.tsx
+++ b/app/src/ui/history/commit-summary.tsx
@@ -55,8 +55,8 @@ interface ICommitSummaryProps {
   /** Called when the user opens the diff options popover */
   readonly onDiffOptionsOpened: () => void
 
-  /** called when user hovers over count of commits excluded from the diff */
-  readonly onHighlightShasNotInDiff: (shasNotInDiffHighlighted: boolean) => void
+  /** Called to highlight certain shas in the history */
+  readonly onHighlightShas: (shasToHighlight: ReadonlyArray<string>) => void
 }
 
 interface ICommitSummaryState {
@@ -344,11 +344,18 @@ export class CommitSummary extends React.Component<
   }
 
   private onHighlightShasInDiff = () => {
-    this.props.onHighlightShasNotInDiff(true)
+    this.props.onHighlightShas(this.props.shasInDiff)
   }
 
-  private onRemoveHighlightShasInDiff = () => {
-    this.props.onHighlightShasNotInDiff(false)
+  private onHighlightShasNotInDiff = () => {
+    const { onHighlightShas, selectedCommits, shasInDiff } = this.props
+    onHighlightShas(
+      selectedCommits.filter(c => !shasInDiff.includes(c.sha)).map(c => c.sha)
+    )
+  }
+
+  private onRemoveHighlightOfShas = () => {
+    this.props.onHighlightShas([])
   }
 
   private showUnreachableCommits() {
@@ -373,8 +380,8 @@ export class CommitSummary extends React.Component<
     return (
       <div
         className="commit-unreachable-info"
-        onMouseOver={this.onHighlightShasInDiff}
-        onMouseOut={this.onRemoveHighlightShasInDiff}
+        onMouseOver={this.onHighlightShasNotInDiff}
+        onMouseOut={this.onRemoveHighlightOfShas}
       >
         <Octicon symbol={OcticonSymbol.info} />
         <LinkButton onClick={this.showUnreachableCommits}>
@@ -456,7 +463,11 @@ export class CommitSummary extends React.Component<
     return (
       <div className={summaryClassNames}>
         Showing changes from{' '}
-        <LinkButton onClick={this.showUnreachableCommits}>
+        <LinkButton
+          onMouseOver={this.onHighlightShasInDiff}
+          onMouseOut={this.onRemoveHighlightOfShas}
+          onClick={this.showUnreachableCommits}
+        >
           {numInDiff} commits
         </LinkButton>
       </div>
diff --git a/app/src/ui/history/compare.tsx b/app/src/ui/history/compare.tsx
index d7fa51f0fe..013cd7ecfe 100644
--- a/app/src/ui/history/compare.tsx
+++ b/app/src/ui/history/compare.tsx
@@ -55,8 +55,7 @@ interface ICompareSidebarProps {
   readonly tagsToPush: ReadonlyArray<string> | null
   readonly aheadBehindStore: AheadBehindStore
   readonly isCherryPickInProgress: boolean
-  readonly shasInDiff: ReadonlyArray<string>
-  readonly shasNotInDiffHighlighted: boolean
+  readonly shasToHighlight: ReadonlyArray<string>
 }
 
 interface ICompareSidebarState {
@@ -232,8 +231,7 @@ export class CompareSidebar extends React.Component<
         commitLookup={this.props.commitLookup}
         commitSHAs={commitSHAs}
         selectedSHAs={this.props.selectedCommitShas}
-        shasInDiff={this.props.shasInDiff}
-        shasNotInDiffHighlighted={this.props.shasNotInDiffHighlighted}
+        shasToHighlight={this.props.shasToHighlight}
         localCommitSHAs={this.props.localCommitSHAs}
         canResetToCommits={formState.kind === HistoryTabMode.History}
         canUndoCommits={formState.kind === HistoryTabMode.History}
diff --git a/app/src/ui/history/selected-commits.tsx b/app/src/ui/history/selected-commits.tsx
index 0d92a7b075..ffed357e7d 100644
--- a/app/src/ui/history/selected-commits.tsx
+++ b/app/src/ui/history/selected-commits.tsx
@@ -181,15 +181,15 @@ export class SelectedCommits extends React.Component<
         onHideWhitespaceInDiffChanged={this.onHideWhitespaceInDiffChanged}
         onShowSideBySideDiffChanged={this.onShowSideBySideDiffChanged}
         onDiffOptionsOpened={this.props.onDiffOptionsOpened}
-        onHighlightShasNotInDiff={this.onHighlightShasNotInDiff}
+        onHighlightShas={this.onHighlightShas}
       />
     )
   }
 
-  private onHighlightShasNotInDiff = (shasNotInDiffHighlighted: boolean) => {
-    this.props.dispatcher.updateShasNotInDiffHighlighted(
+  private onHighlightShas = (shasToHighlight: ReadonlyArray<string>) => {
+    this.props.dispatcher.updateShasToHighlight(
       this.props.repository,
-      shasNotInDiffHighlighted
+      shasToHighlight
     )
   }
 
diff --git a/app/src/ui/lib/link-button.tsx b/app/src/ui/lib/link-button.tsx
index 1835a1fa33..f45482978a 100644
--- a/app/src/ui/lib/link-button.tsx
+++ b/app/src/ui/lib/link-button.tsx
@@ -11,6 +11,12 @@ interface ILinkButtonProps {
   /** A function to call on click. */
   readonly onClick?: () => void
 
+  /** A function to call when mouse is hovered over */
+  readonly onMouseOver?: () => void
+
+  /** A function to call when mouse is moved off */
+  readonly onMouseOut?: () => void
+
   /** CSS classes attached to the component */
   readonly className?: string
 
@@ -42,6 +48,8 @@ export class LinkButton extends React.Component<ILinkButtonProps, {}> {
         ref={this.anchorRef}
         className={className}
         href={href}
+        onMouseOver={this.props.onMouseOver}
+        onMouseOut={this.props.onMouseOut}
         onClick={this.onClick}
         tabIndex={this.props.tabIndex}
       >
diff --git a/app/src/ui/repository.tsx b/app/src/ui/repository.tsx
index 932d1109bb..4bc6cbbf71 100644
--- a/app/src/ui/repository.tsx
+++ b/app/src/ui/repository.tsx
@@ -238,7 +238,7 @@ export class RepositoryView extends React.Component<
       remote,
       compareState,
       branchesState,
-      commitSelection: { shas, shasInDiff, shasNotInDiffHighlighted },
+      commitSelection: { shas },
       commitLookup,
       localCommitSHAs,
       localTags,
@@ -265,8 +265,7 @@ export class RepositoryView extends React.Component<
         isLocalRepository={remote === null}
         compareState={compareState}
         selectedCommitShas={shas}
-        shasInDiff={shasInDiff}
-        shasNotInDiffHighlighted={shasNotInDiffHighlighted}
+        shasToHighlight={compareState.shasToHighlight}
         currentBranch={currentBranch}
         emoji={emoji}
         commitLookup={commitLookup}
diff --git a/app/styles/ui/history/_commit-list.scss b/app/styles/ui/history/_commit-list.scss
index fe07dac1ea..dab6d7a894 100644
--- a/app/styles/ui/history/_commit-list.scss
+++ b/app/styles/ui/history/_commit-list.scss
@@ -52,11 +52,13 @@
     }
   }
 
-  .list-item {
-    transition: opacity 0.75s;
+  &.has-highlighted-commits {
+    .list-item {
+      transition: opacity 0.6s;
 
-    &.not-in-diff {
-      opacity: 50%;
+      &:not(.highlighted) {
+        opacity: 30%;
+      }
     }
   }
 

From 4d08203074d3c3cb520a8b95a8745ffd5235ac41 Mon Sep 17 00:00:00 2001
From: tidy-dev <tidy-dev@github.com>
Date: Mon, 27 Jun 2022 15:52:34 -0400
Subject: [PATCH 47/88] Remove unused method

---
 app/src/lib/git/log.ts | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/app/src/lib/git/log.ts b/app/src/lib/git/log.ts
index 2c8213e198..b415705f49 100644
--- a/app/src/lib/git/log.ts
+++ b/app/src/lib/git/log.ts
@@ -302,10 +302,3 @@ export async function doMergeCommitsExistAfterCommit(
 
   return mergeCommits.length > 0
 }
-
-export async function getParentSha(repository: Repository, sha: string) {
-  const args = ['log', '-1', '--format=%P', sha, '--']
-
-  const result = await git(args, repository.path, 'getParentSha')
-  return result.stdout.trim()
-}

From 20a096131557b95e22ddd94e9fb3bd8379c04ddd Mon Sep 17 00:00:00 2001
From: tidy-dev <tidy-dev@github.com>
Date: Mon, 27 Jun 2022 15:55:14 -0400
Subject: [PATCH 48/88] Tidying

---
 app/src/lib/stores/app-store.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts
index 8303cecb96..c0ae1b4030 100644
--- a/app/src/lib/stores/app-store.ts
+++ b/app/src/lib/stores/app-store.ts
@@ -1195,10 +1195,9 @@ export class AppStore extends TypedBaseStore<IAppState> {
 
       for (const parentSha of commit.parentSHAs) {
         const parent = shas.find(sha => sha === parentSha)
-        if (parent === undefined) {
-          continue
+        if (parent !== undefined) {
+          shasToTraverse.push(parent)
         }
-        shasToTraverse.push(parent)
       }
     }
 

From a2e96424b6c36d1e66626d8155d53dc3cba3637f Mon Sep 17 00:00:00 2001
From: tidy-dev <tidy-dev@github.com>
Date: Mon, 27 Jun 2022 16:12:43 -0400
Subject: [PATCH 49/88] Tidying

---
 app/src/lib/stores/app-store.ts | 35 +++++++++++++--------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts
index c0ae1b4030..546108134d 100644
--- a/app/src/lib/stores/app-store.ts
+++ b/app/src/lib/stores/app-store.ts
@@ -1165,41 +1165,34 @@ export class AppStore extends TypedBaseStore<IAppState> {
    * diff. This is equivalent to doing `git rev-list firstSha^..lastSha`.
    */
   private getShasInDiff(
-    shas: ReadonlyArray<string>,
+    selectedShas: ReadonlyArray<string>,
     isContiguous: boolean,
     commitLookup: Map<string, Commit>
   ) {
     const shasInDiff = new Array<string>()
 
-    if (shas.length <= 1 || !isContiguous) {
-      return shas
+    if (selectedShas.length <= 1 || !isContiguous) {
+      return selectedShas
     }
 
-    const shasToTraverse = [shas.at(-1)]
-    let traversing = true
-    while (traversing) {
+    const shasToTraverse = [selectedShas.at(-1)]
+    do {
       const currentSha = shasToTraverse.pop()
       if (currentSha === undefined) {
-        // no more to traverse
-        traversing = false
         continue
       }
 
       shasInDiff.push(currentSha)
-      const commit = commitLookup.get(currentSha)
-      if (commit === undefined) {
-        // shouldn't happen - shas are selection of history which should be in lookup
-        traversing = false
-        continue
-      }
 
-      for (const parentSha of commit.parentSHAs) {
-        const parent = shas.find(sha => sha === parentSha)
-        if (parent !== undefined) {
-          shasToTraverse.push(parent)
-        }
-      }
-    }
+      // shas are selection of history -> should be in lookup ->  `|| []` is for typing sake
+      const parentSHAs = commitLookup.get(currentSha)?.parentSHAs || []
+
+      const parentsInSelection = parentSHAs.filter(parentSha =>
+        selectedShas.includes(parentSha)
+      )
+
+      shasToTraverse.push(...parentsInSelection)
+    } while (shasToTraverse.length > 0)
 
     return shasInDiff
   }

From 95827f3eed968fe5a7ee500257ca74a95547e7fe Mon Sep 17 00:00:00 2001
From: Markus Olsson <j.markus.olsson@gmail.com>
Date: Wed, 29 Jun 2022 12:04:48 +0200
Subject: [PATCH 50/88] Remove label link prop from TextBox

This was introduced in https://github.com/desktop/desktop/pull/981 and is only used in one location, 2FA input. As 2FA input in app is exceedingly rare these days with mandatory web flow login we can remove it and at the same time solve a layout issue with very long labels which would previously overflow.
---
 app/src/ui/lib/text-box.tsx    | 66 +++-------------------------------
 app/src/ui/sign-in/sign-in.tsx |  2 --
 app/styles/ui/_text-box.scss   | 18 ++--------
 3 files changed, 6 insertions(+), 80 deletions(-)

diff --git a/app/src/ui/lib/text-box.tsx b/app/src/ui/lib/text-box.tsx
index df4f5a1280..ddbe22de4f 100644
--- a/app/src/ui/lib/text-box.tsx
+++ b/app/src/ui/lib/text-box.tsx
@@ -1,7 +1,6 @@
 import * as React from 'react'
 import classNames from 'classnames'
 import { createUniqueId, releaseUniqueId } from './id-pool'
-import { LinkButton } from './link-button'
 import { showContextualMenu } from '../../lib/menu-item'
 
 export interface ITextBoxProps {
@@ -47,34 +46,6 @@ export interface ITextBoxProps {
   /** The type of the input. Defaults to `text`. */
   readonly type?: 'text' | 'search' | 'password' | 'email'
 
-  /**
-   * An optional text for a link label element. A link label is, for the purposes
-   * of this control an anchor element that's rendered alongside (ie on the same)
-   * row as the the label element.
-   *
-   * Note that the link label will only be rendered if the textbox has a
-   * label text (specified through the label prop). A link label is used for
-   * presenting the user with a contextual link related to a specific text
-   * input such as a password recovery link for a password text box.
-   */
-  readonly labelLinkText?: string
-
-  /**
-   * An optional URL to be opened when the label link (if present, see the
-   * labelLinkText prop for more details) is clicked. The link will be opened using the
-   * standard semantics of a LinkButton, i.e. in the configured system browser.
-   *
-   * If not specified consumers need to subscribe to the onLabelLinkClick event.
-   */
-  readonly labelLinkUri?: string
-
-  /**
-   * An optional event handler which is invoked when the label link (if present,
-   * see the labelLinkText prop for more details) is clicked. See the onClick
-   * event on the LinkButton component for more details.
-   */
-  readonly onLabelLinkClick?: () => void
-
   /** The tab index of the input element. */
   readonly tabIndex?: number
 
@@ -213,35 +184,6 @@ export class TextBox extends React.Component<ITextBoxProps, ITextBoxState> {
     }
   }
 
-  private renderLabelLink() {
-    if (!this.props.labelLinkText) {
-      return null
-    }
-
-    return (
-      <LinkButton
-        uri={this.props.labelLinkUri}
-        onClick={this.props.onLabelLinkClick}
-        className="link-label"
-      >
-        {this.props.labelLinkText}
-      </LinkButton>
-    )
-  }
-
-  private renderLabel() {
-    if (!this.props.label) {
-      return null
-    }
-
-    return (
-      <div className="label-container">
-        <label htmlFor={this.state.inputId}>{this.props.label}</label>
-        {this.renderLabelLink()}
-      </div>
-    )
-  }
-
   private onContextMenu = (event: React.MouseEvent<any>) => {
     event.preventDefault()
     showContextualMenu([{ role: 'editMenu' }])
@@ -290,12 +232,12 @@ export class TextBox extends React.Component<ITextBoxProps, ITextBoxState> {
   }
 
   public render() {
-    const className = classNames('text-box-component', this.props.className)
-    const inputId = this.props.label ? this.state.inputId : undefined
+    const { label, className } = this.props
+    const inputId = label ? this.state.inputId : undefined
 
     return (
-      <div className={className}>
-        {this.renderLabel()}
+      <div className={classNames('text-box-component', className)}>
+        {label && <label htmlFor={inputId}>{label}</label>}
 
         <input
           id={inputId}
diff --git a/app/src/ui/sign-in/sign-in.tsx b/app/src/ui/sign-in/sign-in.tsx
index ea7bfdbdae..ec19fa40e4 100644
--- a/app/src/ui/sign-in/sign-in.tsx
+++ b/app/src/ui/sign-in/sign-in.tsx
@@ -265,8 +265,6 @@ export class SignIn extends React.Component<ISignInProps, ISignInState> {
             label="Authentication code"
             value={this.state.otpToken}
             onValueChanged={this.onOTPTokenChanged}
-            labelLinkText={`What's this?`}
-            labelLinkUri="https://help.github.com/articles/providing-your-2fa-authentication-code/"
             autoFocus={true}
           />
         </Row>
diff --git a/app/styles/ui/_text-box.scss b/app/styles/ui/_text-box.scss
index 6b29323341..87a5cf82f1 100644
--- a/app/styles/ui/_text-box.scss
+++ b/app/styles/ui/_text-box.scss
@@ -5,22 +5,8 @@
   flex-direction: column;
   flex: 1;
 
-  .label-container {
-    display: flex;
-
-    label {
-      @include ellipsis;
-      flex-grow: 1;
-    }
-
-    .link-label {
-      @include ellipsis;
-
-      justify-content: flex-end;
-      flex-shrink: 0;
-      flex-grow: 0;
-    }
-
+  & > label {
+    overflow-wrap: anywhere;
     margin-bottom: var(--spacing-third);
   }
 

From acbc19b4b3ae3343de6d896353cd0ae3ff0fcf3a Mon Sep 17 00:00:00 2001
From: Sergio Padrino <sergio.padrino@gmail.com>
Date: Wed, 29 Jun 2022 16:10:20 +0200
Subject: [PATCH 51/88] Revert "Revert "Merge pull request #14813 from
 desktop/upgrade-to-electron-v19""

This reverts commit 1bfcd1986df982bae94349c064833e33f8730254.
---
 app/.npmrc   |  2 +-
 package.json |  2 +-
 yarn.lock    | 28 ++++++++++++++--------------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/.npmrc b/app/.npmrc
index 504b4d19ba..efea0b211b 100644
--- a/app/.npmrc
+++ b/app/.npmrc
@@ -1,3 +1,3 @@
 runtime = electron
 disturl = https://electronjs.org/headers
-target = 17.0.1
+target = 19.0.0
diff --git a/package.json b/package.json
index db4432a579..920e8bbdb6 100644
--- a/package.json
+++ b/package.json
@@ -153,7 +153,7 @@
     "@types/webpack-hot-middleware": "^2.25.6",
     "@types/webpack-merge": "^5.0.0",
     "@types/xml2js": "^0.4.0",
-    "electron": "17.0.1",
+    "electron": "19.0.0",
     "electron-builder": "^22.7.0",
     "electron-packager": "^15.1.0",
     "electron-winstaller": "^5.0.0",
diff --git a/yarn.lock b/yarn.lock
index 36b084af22..599ec75aeb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -506,10 +506,10 @@
     ajv "^6.12.0"
     ajv-keywords "^3.4.1"
 
-"@electron/get@^1.13.0":
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.13.1.tgz#42a0aa62fd1189638bd966e23effaebb16108368"
-  integrity sha512-U5vkXDZ9DwXtkPqlB45tfYnnYBN8PePp1z/XDCupnSpdrxT8/ThCv9WCwPLf9oqiSGZTkH6dx2jDUPuoXpjkcA==
+"@electron/get@^1.14.1":
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz#16ba75f02dffb74c23965e72d617adc721d27f40"
+  integrity sha512-BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw==
   dependencies:
     debug "^4.1.1"
     env-paths "^2.2.0"
@@ -1163,10 +1163,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.11.tgz#6ea7342dfb379ea1210835bada87b3c512120234"
   integrity sha512-KB0sixD67CeecHC33MYn+eYARkqTheIRNuu97y2XMjR7Wu3XibO1vaY6VBV6O/a89SPI81cEUIYT87UqUWlZNw==
 
-"@types/node@^14.6.2":
-  version "14.17.5"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.5.tgz#b59daf6a7ffa461b5648456ca59050ba8e40ed54"
-  integrity sha512-bjqH2cX/O33jXT/UmReo2pM7DIJREPMnarixbQ57DOOzzFaI6D2+IcwaJQaJpv0M1E9TIhPCYVxrkcityLjlqA==
+"@types/node@^16.11.26":
+  version "16.11.40"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.40.tgz#bcf85f3febe74436107aeb2d3fb5fd0d30818600"
+  integrity sha512-7bOWglXUO6f21NG3YDI7hIpeMX3M59GG+DzZuzX2EkFKYUnRoxq3EOg4R0KNv2hxryY9M3UUqG5akwwsifrukw==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
@@ -3402,13 +3402,13 @@ electron-winstaller@*, electron-winstaller@^5.0.0:
     lodash.template "^4.2.2"
     temp "^0.9.0"
 
-electron@17.0.1:
-  version "17.0.1"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-17.0.1.tgz#e6c7ad2be26e7be8a5a9bac16b21920ad2671224"
-  integrity sha512-CBReR/QEOpgwMdt59lWCtj9wC8oHB6aAjMF1lhXcGew132xtp+C5N6EaXb/fmDceVYLouziYjbNcpeXsWrqdpA==
+electron@19.0.0:
+  version "19.0.0"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-19.0.0.tgz#f6b742b708ec118676ba3b38d0f3712d8f0311cf"
+  integrity sha512-VXwqLQxuIUr0SI8vOYDj5OLPwtKa/trn5DVKd/BFGT/U/IerfVoSZuydGLOjSL5yJlckfmKQpiq+8PW4gI8hXA==
   dependencies:
-    "@electron/get" "^1.13.0"
-    "@types/node" "^14.6.2"
+    "@electron/get" "^1.14.1"
+    "@types/node" "^16.11.26"
     extract-zip "^1.0.3"
 
 element-closest@^2.0.2:

From 0c25285238e894762fcd0747e2d469b9a5309add Mon Sep 17 00:00:00 2001
From: Sergio Padrino <sergio.padrino@gmail.com>
Date: Wed, 29 Jun 2022 16:19:43 +0200
Subject: [PATCH 52/88] Add workaround for an Electron 19 crash

This crash happens when attempting to write anything in the Dev Tools console.
See https://github.com/electron/electron/issues/34350
---
 app/src/ui/index.tsx | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/ui/index.tsx b/app/src/ui/index.tsx
index 997818a83f..693154216c 100644
--- a/app/src/ui/index.tsx
+++ b/app/src/ui/index.tsx
@@ -202,6 +202,13 @@ process.on(
   }
 )
 
+// HACK: this is a workaround for a known crash in the Dev Tools on Electron 19
+// See https://github.com/electron/electron/issues/34350
+if (__DEV__) {
+  window.onerror = e =>
+    e === 'Uncaught EvalError: Possible side-effect in debug-evaluate'
+}
+
 /**
  * Chromium won't crash on an unhandled rejection (similar to how it won't crash
  * on an unhandled error). We've taken the approach that unhandled errors should

From a7f27a36e677dadfe2842c68667a36de7a85fbd4 Mon Sep 17 00:00:00 2001
From: Sergio Padrino <sergio.padrino@gmail.com>
Date: Wed, 29 Jun 2022 17:26:34 +0200
Subject: [PATCH 53/88] Bump desktop-notifications to 0.2.4

This will disable desktop-notifications for Windows versions prior to the Creators Update (see https://github.com/desktop/desktop-notifications/pull/22)
---
 app/package.json | 2 +-
 app/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/package.json b/app/package.json
index 171c613a4a..ac8eddbe0d 100644
--- a/app/package.json
+++ b/app/package.json
@@ -26,7 +26,7 @@
     "codemirror-mode-elixir": "^1.1.2",
     "compare-versions": "^3.6.0",
     "deep-equal": "^1.0.1",
-    "desktop-notifications": "^0.2.2",
+    "desktop-notifications": "^0.2.4",
     "desktop-trampoline": "desktop/desktop-trampoline#v0.9.8",
     "dexie": "^3.2.2",
     "dompurify": "^2.3.3",
diff --git a/app/yarn.lock b/app/yarn.lock
index 7c80ee90e7..2963810416 100644
--- a/app/yarn.lock
+++ b/app/yarn.lock
@@ -363,10 +363,10 @@ delegates@^1.0.0:
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
   integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
 
-desktop-notifications@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/desktop-notifications/-/desktop-notifications-0.2.2.tgz#197a32ee504a894ad074793dab285681c533e5ac"
-  integrity sha512-XMnxdWV6ZfiCzLZNC00n6h30Jt3z8yv21FAPBt/kK6hANI0PaoYWsRKEYya0zMUAX/9lrh429R5OtRGOKWZQSw==
+desktop-notifications@^0.2.4:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/desktop-notifications/-/desktop-notifications-0.2.4.tgz#d51db18be583784a296748efd361fe3a5aefea70"
+  integrity sha512-Au0CbBE4TQ09vsC4/L15FhDsCr/daIyYUY3vkx4S3Y0Sp9EPpbXxBdmz0ry1cOnQ8A47K45zTYsuKP7a+xHm7Q==
   dependencies:
     node-addon-api "^5.0.0"
     prebuild-install "^7.0.1"

From 5511355fcad9a2bdf986fbf99665ae81f960e37b Mon Sep 17 00:00:00 2001
From: tidy-dev <tidy-dev@github.com>
Date: Wed, 29 Jun 2022 10:39:39 -0400
Subject: [PATCH 54/88] Create unreachable-commits-dialog component skeleton

---
 .../ui/history/unreachable-commits-dialog.tsx | 89 +++++++++++++++++++
 1 file changed, 89 insertions(+)
 create mode 100644 app/src/ui/history/unreachable-commits-dialog.tsx

diff --git a/app/src/ui/history/unreachable-commits-dialog.tsx b/app/src/ui/history/unreachable-commits-dialog.tsx
new file mode 100644
index 0000000000..1e4be51b46
--- /dev/null
+++ b/app/src/ui/history/unreachable-commits-dialog.tsx
@@ -0,0 +1,89 @@
+import * as React from 'react'
+import { Dialog, DialogFooter } from '../dialog'
+import { TabBar } from '../tab-bar'
+import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group'
+import { Commit } from '../../models/commit'
+
+export enum UnreachableCommitsTab {
+  Unreachable,
+  Reachable,
+}
+
+interface IUnreachableCommitsDialogProps {
+  /** The shas of the currently selected commits */
+  readonly selectedShas: ReadonlyArray<string>
+
+  /** The shas of the shas showed in the diff */
+  readonly shasInDiff: ReadonlyArray<string>
+
+  /** The commits loaded, keyed by their full SHA. */
+  readonly commitLookup: Map<string, Commit>
+
+  /** Used to set the selected tab. */
+  readonly selectedTab: UnreachableCommitsTab
+
+  /** Called to dismiss the  */
+  readonly onDismissed: () => void
+}
+
+interface IUnreachableCommitsDialogState {
+  /** The currently select tab. */
+  readonly selectedTab: UnreachableCommitsTab
+}
+
+/** The component for for viewing the unreachable commits in the current diff a repository. */
+export class UnreachableCommitsDialog extends React.Component<
+  IUnreachableCommitsDialogProps,
+  IUnreachableCommitsDialogState
+> {
+  public constructor(props: IUnreachableCommitsDialogProps) {
+    super(props)
+
+    this.state = {
+      selectedTab: props.selectedTab,
+    }
+  }
+
+  private onTabClicked = (selectedTab: UnreachableCommitsTab) => {
+    this.setState({ selectedTab })
+  }
+
+  private renderTabs() {
+    return (
+      <TabBar
+        onTabClicked={this.onTabClicked}
+        selectedIndex={this.state.selectedTab}
+      >
+        <span>Unreachable</span>
+        <span>Reachable</span>
+      </TabBar>
+    )
+  }
+
+  private renderActiveTab() {
+    return 'A list of the commits for this tab!'
+  }
+
+  private renderFooter() {
+    return (
+      <DialogFooter>
+        <OkCancelButtonGroup />
+      </DialogFooter>
+    )
+  }
+
+  public render() {
+    return (
+      <Dialog
+        className="unreachable-commits"
+        title={__DARWIN__ ? 'Unreachable Commits' : 'Unreachable commits'}
+        onSubmit={this.props.onDismissed}
+        onDismissed={this.props.onDismissed}
+      >
+        {this.renderTabs()}
+        {this.renderActiveTab()}
+        {this.renderFooter()}
+      </Dialog>
+    )
+  }
+}

From d464e3bae2c1d1431dada7ecc731336487870d6d Mon Sep 17 00:00:00 2001
From: tidy-dev <tidy-dev@github.com>
Date: Wed, 29 Jun 2022 11:38:33 -0400
Subject: [PATCH 55/88] Add popup type for unreachable commits

---
 app/src/models/popup.ts |  6 ++++++
 app/src/ui/app.tsx      | 25 +++++++++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/app/src/models/popup.ts b/app/src/models/popup.ts
index fdf1058b3a..ed3e613e3a 100644
--- a/app/src/models/popup.ts
+++ b/app/src/models/popup.ts
@@ -21,6 +21,7 @@ import { IAuthor } from './author'
 import { IRefCheck } from '../lib/ci-checks/ci-checks'
 import { GitHubRepository } from './github-repository'
 import { ValidNotificationPullRequestReview } from '../lib/valid-notification-pull-request-review'
+import { UnreachableCommitsTab } from '../ui/history/unreachable-commits-dialog'
 
 export enum PopupType {
   RenameBranch = 1,
@@ -84,6 +85,7 @@ export enum PopupType {
   WarnForcePush,
   DiscardChangesRetry,
   PullRequestReview,
+  UnreachableCommits,
 }
 
 export type Popup =
@@ -353,3 +355,7 @@ export type Popup =
       shouldCheckoutBranch: boolean
       shouldChangeRepository: boolean
     }
+  | {
+      type: PopupType.UnreachableCommits
+      selectedTab: UnreachableCommitsTab
+    }
diff --git a/app/src/ui/app.tsx b/app/src/ui/app.tsx
index c98cd55844..dead3600a5 100644
--- a/app/src/ui/app.tsx
+++ b/app/src/ui/app.tsx
@@ -160,6 +160,7 @@ import { getPullRequestCommitRef } from '../models/pull-request'
 import { getRepositoryType } from '../lib/git'
 import { SSHUserPassword } from './ssh/ssh-user-password'
 import { showContextualMenu } from '../lib/menu-item'
+import { UnreachableCommitsDialog } from './history/unreachable-commits-dialog'
 
 const MinuteInMilliseconds = 1000 * 60
 const HourInMilliseconds = MinuteInMilliseconds * 60
@@ -2214,6 +2215,30 @@ export class App extends React.Component<IAppProps, IAppState> {
           />
         )
       }
+      case PopupType.UnreachableCommits: {
+        const { selectedState } = this.state
+        if (
+          selectedState == null ||
+          selectedState.type !== SelectionType.Repository
+        ) {
+          return null
+        }
+
+        const {
+          commitLookup,
+          commitSelection: { shas, shasInDiff },
+        } = selectedState.state
+
+        return (
+          <UnreachableCommitsDialog
+            selectedShas={shas}
+            shasInDiff={shasInDiff}
+            commitLookup={commitLookup}
+            selectedTab={popup.selectedTab}
+            onDismissed={onPopupDismissedFn}
+          />
+        )
+      }
       default:
         return assertNever(popup, `Unknown popup type: ${popup}`)
     }

From 999c3f6b3a2f1e975bac8d24502b744bf957fa4a Mon Sep 17 00:00:00 2001
From: tidy-dev <tidy-dev@github.com>
Date: Wed, 29 Jun 2022 12:13:28 -0400
Subject: [PATCH 56/88] Only show link when there are commits not in diff

---
 app/src/ui/history/commit-summary.tsx | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/app/src/ui/history/commit-summary.tsx b/app/src/ui/history/commit-summary.tsx
index 2a80c344b4..139c6b943c 100644
--- a/app/src/ui/history/commit-summary.tsx
+++ b/app/src/ui/history/commit-summary.tsx
@@ -456,20 +456,26 @@ export class CommitSummary extends React.Component<
       )
     }
 
-    const numInDiff =
-      selectedCommits.length -
-      getCountCommitsNotInDiff(selectedCommits, shasInDiff)
+    const commitsNotInDiff = getCountCommitsNotInDiff(
+      selectedCommits,
+      shasInDiff
+    )
+    const numInDiff = selectedCommits.length - commitsNotInDiff
 
     return (
       <div className={summaryClassNames}>
         Showing changes from{' '}
-        <LinkButton
-          onMouseOver={this.onHighlightShasInDiff}
-          onMouseOut={this.onRemoveHighlightOfShas}
-          onClick={this.showUnreachableCommits}
-        >
-          {numInDiff} commits
-        </LinkButton>
+        {commitsNotInDiff > 0 ? (
+          <LinkButton
+            onMouseOver={this.onHighlightShasInDiff}
+            onMouseOut={this.onRemoveHighlightOfShas}
+            onClick={this.showUnreachableCommits}
+          >
+            {numInDiff} commits
+          </LinkButton>
+        ) : (
+          <> {numInDiff} commits</>
+        )}
       </div>
     )
   }

From c3b60b798626b97beed9815cc1134ea4f6e6b06b Mon Sep 17 00:00:00 2001
From: tidy-dev <tidy-dev@github.com>
Date: Wed, 29 Jun 2022 12:14:09 -0400
Subject: [PATCH 57/88] Hookup unreachable commits dialog to commit summary
 links

---
 app/src/ui/history/commit-summary.tsx   | 14 +++++++++++---
 app/src/ui/history/selected-commits.tsx | 10 ++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/app/src/ui/history/commit-summary.tsx b/app/src/ui/history/commit-summary.tsx
index 139c6b943c..4da6d23ea2 100644
--- a/app/src/ui/history/commit-summary.tsx
+++ b/app/src/ui/history/commit-summary.tsx
@@ -20,6 +20,7 @@ import { TooltipDirection } from '../lib/tooltip'
 import { AppFileStatusKind } from '../../models/status'
 import _ from 'lodash'
 import { LinkButton } from '../lib/link-button'
+import { UnreachableCommitsTab } from './unreachable-commits-dialog'
 
 interface ICommitSummaryProps {
   readonly repository: Repository
@@ -57,6 +58,9 @@ interface ICommitSummaryProps {
 
   /** Called to highlight certain shas in the history */
   readonly onHighlightShas: (shasToHighlight: ReadonlyArray<string>) => void
+
+  /** Called to show unreachable commits dialog */
+  readonly showUnreachableCommits: (tab: UnreachableCommitsTab) => void
 }
 
 interface ICommitSummaryState {
@@ -358,8 +362,12 @@ export class CommitSummary extends React.Component<
     this.props.onHighlightShas([])
   }
 
-  private showUnreachableCommits() {
-    // TODO: open to dialog with commits list of unreachable commits
+  private showUnreachableCommits = () => {
+    this.props.showUnreachableCommits(UnreachableCommitsTab.Unreachable)
+  }
+
+  private showReachableCommits = () => {
+    this.props.showUnreachableCommits(UnreachableCommitsTab.Reachable)
   }
 
   private renderCommitsNotReachable = () => {
@@ -469,7 +477,7 @@ export class CommitSummary extends React.Component<
           <LinkButton
             onMouseOver={this.onHighlightShasInDiff}
             onMouseOut={this.onRemoveHighlightOfShas}
-            onClick={this.showUnreachableCommits}
+            onClick={this.showReachableCommits}
           >
             {numInDiff} commits
           </LinkButton>
diff --git a/app/src/ui/history/selected-commits.tsx b/app/src/ui/history/selected-commits.tsx
index ffed357e7d..150f7ff9b2 100644
--- a/app/src/ui/history/selected-commits.tsx
+++ b/app/src/ui/history/selected-commits.tsx
@@ -35,6 +35,8 @@ import { IConstrainedValue } from '../../lib/app-state'
 import { clamp } from '../../lib/clamp'
 import { pathExists } from '../lib/path-exists'
 import { enableMultiCommitDiffs } from '../../lib/feature-flag'
+import { PopupType } from '../../models/popup'
+import { UnreachableCommitsTab } from './unreachable-commits-dialog'
 
 interface ISelectedCommitsProps {
   readonly repository: Repository
@@ -182,10 +184,18 @@ export class SelectedCommits extends React.Component<
         onShowSideBySideDiffChanged={this.onShowSideBySideDiffChanged}
         onDiffOptionsOpened={this.props.onDiffOptionsOpened}
         onHighlightShas={this.onHighlightShas}
+        showUnreachableCommits={this.showUnreachableCommits}
       />
     )
   }
 
+  private showUnreachableCommits = (selectedTab: UnreachableCommitsTab) => {
+    this.props.dispatcher.showPopup({
+      type: PopupType.UnreachableCommits,
+      selectedTab,
+    })
+  }
+
   private onHighlightShas = (shasToHighlight: ReadonlyArray<string>) => {
     this.props.dispatcher.updateShasToHighlight(
       this.props.repository,

From 4fb3df9f0999732146c961aa78cd8b38ac2c765b Mon Sep 17 00:00:00 2001
From: tidy-dev <tidy-dev@github.com>
Date: Wed, 29 Jun 2022 13:06:04 -0400
Subject: [PATCH 58/88] Show commits list for unreachable/reachable commits
 tabs

---
 app/src/ui/app.tsx                            |  3 +-
 app/src/ui/history/commit-list.tsx            | 81 ++++++++++---------
 app/src/ui/history/compare.tsx                |  2 +-
 .../ui/history/unreachable-commits-dialog.tsx | 38 ++++++++-
 app/styles/ui/_dialog.scss                    |  1 +
 .../ui/dialogs/_unreachable-commits.scss      |  8 ++
 6 files changed, 93 insertions(+), 40 deletions(-)
 create mode 100644 app/styles/ui/dialogs/_unreachable-commits.scss

diff --git a/app/src/ui/app.tsx b/app/src/ui/app.tsx
index dead3600a5..f253d33a04 100644
--- a/app/src/ui/app.tsx
+++ b/app/src/ui/app.tsx
@@ -2216,7 +2216,7 @@ export class App extends React.Component<IAppProps, IAppState> {
         )
       }
       case PopupType.UnreachableCommits: {
-        const { selectedState } = this.state
+        const { selectedState, emoji } = this.state
         if (
           selectedState == null ||
           selectedState.type !== SelectionType.Repository
@@ -2235,6 +2235,7 @@ export class App extends React.Component<IAppProps, IAppState> {
             shasInDiff={shasInDiff}
             commitLookup={commitLookup}
             selectedTab={popup.selectedTab}
+            emoji={emoji}
             onDismissed={onPopupDismissedFn}
           />
         )
diff --git a/app/src/ui/history/commit-list.tsx b/app/src/ui/history/commit-list.tsx
index 058d5e9978..5eaad06ccf 100644
--- a/app/src/ui/history/commit-list.tsx
+++ b/app/src/ui/history/commit-list.tsx
@@ -24,13 +24,13 @@ interface ICommitListProps {
   readonly selectedSHAs: ReadonlyArray<string>
 
   /** Whether or not commits in this list can be undone. */
-  readonly canUndoCommits: boolean
+  readonly canUndoCommits?: boolean
 
   /** Whether or not commits in this list can be amended. */
-  readonly canAmendCommits: boolean
+  readonly canAmendCommits?: boolean
 
   /** Whether or the user can reset to commits in this list. */
-  readonly canResetToCommits: boolean
+  readonly canResetToCommits?: boolean
 
   /** The emoji lookup to render images inline */
   readonly emoji: Map<string, string>
@@ -39,42 +39,42 @@ interface ICommitListProps {
   readonly localCommitSHAs: ReadonlyArray<string>
 
   /** The message to display inside the list when no results are displayed */
-  readonly emptyListMessage: JSX.Element | string
+  readonly emptyListMessage?: JSX.Element | string
 
   /** Callback which fires when a commit has been selected in the list */
-  readonly onCommitsSelected: (
+  readonly onCommitsSelected?: (
     commits: ReadonlyArray<Commit>,
     isContiguous: boolean
   ) => void
 
   /** Callback that fires when a scroll event has occurred */
-  readonly onScroll: (start: number, end: number) => void
+  readonly onScroll?: (start: number, end: number) => void
 
   /** Callback to fire to undo a given commit in the current repository */
-  readonly onUndoCommit: ((commit: Commit) => void) | undefined
+  readonly onUndoCommit?: ((commit: Commit) => void) | undefined
 
   /** Callback to fire to reset to a given commit in the current repository */
-  readonly onResetToCommit: (commit: Commit) => void
+  readonly onResetToCommit?: (commit: Commit) => void
 
   /** Callback to fire to revert a given commit in the current repository */
-  readonly onRevertCommit: ((commit: Commit) => void) | undefined
+  readonly onRevertCommit?: ((commit: Commit) => void) | undefined
 
   readonly onAmendCommit?: (commit: Commit, isLocalCommit: boolean) => void
 
   /** Callback to fire to open a given commit on GitHub */
-  readonly onViewCommitOnGitHub: (sha: string) => void
+  readonly onViewCommitOnGitHub?: (sha: string) => void
 
   /**
    * Callback to fire to create a branch from a given commit in the current
    * repository
    */
-  readonly onCreateBranch: (commit: CommitOneLine) => void
+  readonly onCreateBranch?: (commit: CommitOneLine) => void
 
   /** Callback to fire to open the dialog to create a new tag on the given commit */
-  readonly onCreateTag: (targetCommitSha: string) => void
+  readonly onCreateTag?: (targetCommitSha: string) => void
 
   /** Callback to fire to delete an unpushed tag */
-  readonly onDeleteTag: (tagName: string) => void
+  readonly onDeleteTag?: (tagName: string) => void
 
   /**
    * A handler called whenever the user drops commits on the list to be inserted.
@@ -91,10 +91,10 @@ interface ICommitListProps {
   ) => void
 
   /** Callback to fire to cherry picking the commit  */
-  readonly onCherryPick: (commits: ReadonlyArray<CommitOneLine>) => void
+  readonly onCherryPick?: (commits: ReadonlyArray<CommitOneLine>) => void
 
   /** Callback to fire to squashing commits  */
-  readonly onSquash: (
+  readonly onSquash?: (
     toSquash: ReadonlyArray<Commit>,
     squashOnto: Commit,
     lastRetainedCommitRef: string | null,
@@ -114,28 +114,28 @@ interface ICommitListProps {
   readonly isLocalRepository: boolean
 
   /* Tags that haven't been pushed yet. This is used to show the unpushed indicator */
-  readonly tagsToPush: ReadonlyArray<string> | null
+  readonly tagsToPush?: ReadonlyArray<string>
 
   /** Whether or not commits in this list can be reordered. */
-  readonly reorderingEnabled: boolean
+  readonly reorderingEnabled?: boolean
 
   /** Whether a cherry pick is progress */
-  readonly isCherryPickInProgress: boolean
+  readonly isCherryPickInProgress?: boolean
 
   /** Callback to render commit drag element */
-  readonly onRenderCommitDragElement: (
+  readonly onRenderCommitDragElement?: (
     commit: Commit,
     selectedCommits: ReadonlyArray<Commit>
   ) => void
 
   /** Callback to remove commit drag element */
-  readonly onRemoveCommitDragElement: () => void
+  readonly onRemoveCommitDragElement?: () => void
 
   /** Whether squashing should be enabled on the commit list */
   readonly disableSquashing?: boolean
 
   /** Shas that should be highlighted */
-  readonly shasToHighlight: ReadonlyArray<string>
+  readonly shasToHighlight?: ReadonlyArray<string>
 }
 
 /** A component which displays the list of commits. */
@@ -167,7 +167,7 @@ export class CommitList extends React.Component<ICommitListProps, {}> {
       return null
     }
 
-    const tagsToPushSet = new Set(this.props.tagsToPush || [])
+    const tagsToPushSet = new Set(this.props.tagsToPush ?? [])
 
     const isLocal = this.props.localCommitSHAs.includes(commit.sha)
     const unpushedTags = commit.tags.filter(tagName =>
@@ -189,9 +189,11 @@ export class CommitList extends React.Component<ICommitListProps, {}> {
         key={commit.sha}
         gitHubRepository={this.props.gitHubRepository}
         isLocal={isLocal}
-        canBeUndone={this.props.canUndoCommits && isLocal && row === 0}
-        canBeAmended={this.props.canAmendCommits && row === 0}
-        canBeResetTo={this.props.canResetToCommits && isResettableCommit}
+        canBeUndone={this.props.canUndoCommits === true && isLocal && row === 0}
+        canBeAmended={this.props.canAmendCommits === true && row === 0}
+        canBeResetTo={
+          this.props.canResetToCommits === true && isResettableCommit
+        }
         showUnpushedIndicator={showUnpushedIndicator}
         unpushedIndicatorTitle={this.getUnpushedIndicatorTitle(
           isLocal,
@@ -237,7 +239,7 @@ export class CommitList extends React.Component<ICommitListProps, {}> {
     const indexes = [...toSquash, squashOnto].map(v =>
       this.props.commitSHAs.findIndex(sha => sha === v.sha)
     )
-    this.props.onSquash(
+    this.props.onSquash?.(
       toSquash,
       squashOnto,
       this.getLastRetainedCommitRef(indexes),
@@ -246,7 +248,7 @@ export class CommitList extends React.Component<ICommitListProps, {}> {
   }
 
   private onRenderCommitDragElement = (commit: Commit) => {
-    this.props.onRenderCommitDragElement(
+    this.props.onRenderCommitDragElement?.(
       commit,
       this.lookupCommits(this.props.selectedSHAs)
     )
@@ -278,7 +280,7 @@ export class CommitList extends React.Component<ICommitListProps, {}> {
     const sorted = [...rows].sort((a, b) => b - a)
     const selectedShas = sorted.map(r => this.props.commitSHAs[r])
     const selectedCommits = this.lookupCommits(selectedShas)
-    this.props.onCommitsSelected(selectedCommits, this.isContiguous(sorted))
+    this.props.onCommitsSelected?.(selectedCommits, this.isContiguous(sorted))
   }
 
   /**
@@ -312,7 +314,7 @@ export class CommitList extends React.Component<ICommitListProps, {}> {
     const sha = this.props.commitSHAs[row]
     const commit = this.props.commitLookup.get(sha)
     if (commit) {
-      this.props.onCommitsSelected([commit], true)
+      this.props.onCommitsSelected?.([commit], true)
     }
   }
 
@@ -337,12 +339,10 @@ export class CommitList extends React.Component<ICommitListProps, {}> {
     const numberOfRows = Math.ceil(clientHeight / RowHeight)
     const top = Math.floor(scrollTop / RowHeight)
     const bottom = top + numberOfRows
-    this.props.onScroll(top, bottom)
+    this.props.onScroll?.(top, bottom)
 
     // Pass new scroll value so the scroll position will be remembered (if the callback has been supplied).
-    if (this.props.onCompareListScrolled != null) {
-      this.props.onCompareListScrolled(scrollTop)
-    }
+    this.props.onCompareListScrolled?.(scrollTop)
   }
 
   private rowForSHA(sha_: string | null): number {
@@ -356,7 +356,7 @@ export class CommitList extends React.Component<ICommitListProps, {}> {
 
   private getRowCustomClassMap = () => {
     const { commitSHAs, shasToHighlight } = this.props
-    if (shasToHighlight.length === 0) {
+    if (shasToHighlight === undefined || shasToHighlight.length === 0) {
       return undefined
     }
 
@@ -377,11 +377,18 @@ export class CommitList extends React.Component<ICommitListProps, {}> {
     const { commitSHAs, selectedSHAs, shasToHighlight, emptyListMessage } =
       this.props
     if (commitSHAs.length === 0) {
-      return <div className="panel blankslate">{emptyListMessage}</div>
+      return (
+        <div className="panel blankslate">
+          {emptyListMessage === undefined
+            ? 'No commits to list'
+            : emptyListMessage}
+        </div>
+      )
     }
 
     const classes = classNames({
-      'has-highlighted-commits': shasToHighlight.length > 1,
+      'has-highlighted-commits':
+        shasToHighlight !== undefined && shasToHighlight.length > 1,
     })
 
     return (
@@ -397,7 +404,7 @@ export class CommitList extends React.Component<ICommitListProps, {}> {
           selectionMode="multi"
           onScroll={this.onScroll}
           insertionDragType={
-            this.props.reorderingEnabled ? DragType.Commit : undefined
+            this.props.reorderingEnabled === true ? DragType.Commit : undefined
           }
           invalidationProps={{
             commits: this.props.commitSHAs,
diff --git a/app/src/ui/history/compare.tsx b/app/src/ui/history/compare.tsx
index 013cd7ecfe..4a036d9af3 100644
--- a/app/src/ui/history/compare.tsx
+++ b/app/src/ui/history/compare.tsx
@@ -260,7 +260,7 @@ export class CompareSidebar extends React.Component<
         emptyListMessage={emptyListMessage}
         onCompareListScrolled={this.props.onCompareListScrolled}
         compareListScrollTop={this.props.compareListScrollTop}
-        tagsToPush={this.props.tagsToPush}
+        tagsToPush={this.props.tagsToPush ?? []}
         isCherryPickInProgress={this.props.isCherryPickInProgress}
         onRenderCommitDragElement={this.onRenderCommitDragElement}
         onRemoveCommitDragElement={this.onRemoveCommitDragElement}
diff --git a/app/src/ui/history/unreachable-commits-dialog.tsx b/app/src/ui/history/unreachable-commits-dialog.tsx
index 1e4be51b46..28d5ea95aa 100644
--- a/app/src/ui/history/unreachable-commits-dialog.tsx
+++ b/app/src/ui/history/unreachable-commits-dialog.tsx
@@ -3,6 +3,7 @@ import { Dialog, DialogFooter } from '../dialog'
 import { TabBar } from '../tab-bar'
 import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group'
 import { Commit } from '../../models/commit'
+import { CommitList } from './commit-list'
 
 export enum UnreachableCommitsTab {
   Unreachable,
@@ -22,6 +23,9 @@ interface IUnreachableCommitsDialogProps {
   /** Used to set the selected tab. */
   readonly selectedTab: UnreachableCommitsTab
 
+  /** The emoji lookup to render images inline */
+  readonly emoji: Map<string, string>
+
   /** Called to dismiss the  */
   readonly onDismissed: () => void
 }
@@ -44,6 +48,15 @@ export class UnreachableCommitsDialog extends React.Component<
     }
   }
 
+  public componentWillUpdate(nextProps: IUnreachableCommitsDialogProps) {
+    const currentSelectedTab = this.props.selectedTab
+    const selectedTab = nextProps.selectedTab
+
+    if (currentSelectedTab !== selectedTab) {
+      this.setState({ selectedTab })
+    }
+  }
+
   private onTabClicked = (selectedTab: UnreachableCommitsTab) => {
     this.setState({ selectedTab })
   }
@@ -60,8 +73,31 @@ export class UnreachableCommitsDialog extends React.Component<
     )
   }
 
+  private getShasToDisplay = () => {
+    const { selectedTab } = this.state
+    const { shasInDiff, selectedShas } = this.props
+    if (selectedTab === UnreachableCommitsTab.Reachable) {
+      return shasInDiff
+    }
+
+    return selectedShas.filter(sha => !shasInDiff.includes(sha))
+  }
+
   private renderActiveTab() {
-    return 'A list of the commits for this tab!'
+    const { commitLookup, emoji } = this.props
+    return (
+      <div className="unreachable-commit-list">
+        <CommitList
+          gitHubRepository={null}
+          isLocalRepository={true}
+          commitLookup={commitLookup}
+          commitSHAs={this.getShasToDisplay()}
+          selectedSHAs={[]}
+          localCommitSHAs={[]}
+          emoji={emoji}
+        />
+      </div>
+    )
   }
 
   private renderFooter() {
diff --git a/app/styles/ui/_dialog.scss b/app/styles/ui/_dialog.scss
index ff6ead9c4a..a7b79dd972 100644
--- a/app/styles/ui/_dialog.scss
+++ b/app/styles/ui/_dialog.scss
@@ -19,6 +19,7 @@
 @import 'dialogs/commit-message';
 @import 'dialogs/choose-branch';
 @import 'dialogs/ci-check-run-rerun';
+@import 'dialogs/unreachable-commits';
 
 // The styles herein attempt to follow a flow where margins are only applied
 // to the bottom of elements (with the exception of the last child). This to
diff --git a/app/styles/ui/dialogs/_unreachable-commits.scss b/app/styles/ui/dialogs/_unreachable-commits.scss
new file mode 100644
index 0000000000..764d79c329
--- /dev/null
+++ b/app/styles/ui/dialogs/_unreachable-commits.scss
@@ -0,0 +1,8 @@
+.unreachable-commits {
+  .unreachable-commit-list {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    min-height: 200px;
+  }
+}

From dfc04e982ee5e5a9b3a61b480d303df9db1eb06e Mon Sep 17 00:00:00 2001
From: tidy-dev <tidy-dev@github.com>
Date: Wed, 29 Jun 2022 13:09:12 -0400
Subject: [PATCH 59/88] Don't need a cancel button

---
 app/src/ui/history/unreachable-commits-dialog.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/ui/history/unreachable-commits-dialog.tsx b/app/src/ui/history/unreachable-commits-dialog.tsx
index 28d5ea95aa..84771073e7 100644
--- a/app/src/ui/history/unreachable-commits-dialog.tsx
+++ b/app/src/ui/history/unreachable-commits-dialog.tsx
@@ -103,7 +103,7 @@ export class UnreachableCommitsDialog extends React.Component<
   private renderFooter() {
     return (
       <DialogFooter>
-        <OkCancelButtonGroup />
+        <OkCancelButtonGroup cancelButtonVisible={false} />
       </DialogFooter>
     )
   }

From 16bcdfba53abb79a9225876570c6e7005824a7ce Mon Sep 17 00:00:00 2001
From: tidy-dev <tidy-dev@github.com>
Date: Wed, 29 Jun 2022 13:17:02 -0400
Subject: [PATCH 60/88] List peeks at next item

---
 app/styles/ui/dialogs/_unreachable-commits.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/styles/ui/dialogs/_unreachable-commits.scss b/app/styles/ui/dialogs/_unreachable-commits.scss
index 764d79c329..367c0c28c3 100644
--- a/app/styles/ui/dialogs/_unreachable-commits.scss
+++ b/app/styles/ui/dialogs/_unreachable-commits.scss
@@ -3,6 +3,6 @@
     flex: 1;
     display: flex;
     flex-direction: column;
-    min-height: 200px;
+    min-height: 160px;
   }
 }

From 9222e9c70d3d69f57980e5a323378256093f5a7e Mon Sep 17 00:00:00 2001
From: tidy-dev <tidy-dev@github.com>
Date: Wed, 29 Jun 2022 13:17:08 -0400
Subject: [PATCH 61/88] tidying

---
 .../ui/history/unreachable-commits-dialog.tsx | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/src/ui/history/unreachable-commits-dialog.tsx b/app/src/ui/history/unreachable-commits-dialog.tsx
index 84771073e7..933eef5026 100644
--- a/app/src/ui/history/unreachable-commits-dialog.tsx
+++ b/app/src/ui/history/unreachable-commits-dialog.tsx
@@ -61,6 +61,16 @@ export class UnreachableCommitsDialog extends React.Component<
     this.setState({ selectedTab })
   }
 
+  private getShasToDisplay = () => {
+    const { selectedTab } = this.state
+    const { shasInDiff, selectedShas } = this.props
+    if (selectedTab === UnreachableCommitsTab.Reachable) {
+      return shasInDiff
+    }
+
+    return selectedShas.filter(sha => !shasInDiff.includes(sha))
+  }
+
   private renderTabs() {
     return (
       <TabBar
@@ -73,16 +83,6 @@ export class UnreachableCommitsDialog extends React.Component<
     )
   }
 
-  private getShasToDisplay = () => {
-    const { selectedTab } = this.state
-    const { shasInDiff, selectedShas } = this.props
-    if (selectedTab === UnreachableCommitsTab.Reachable) {
-      return shasInDiff
-    }
-
-    return selectedShas.filter(sha => !shasInDiff.includes(sha))
-  }
-
   private renderActiveTab() {
     const { commitLookup, emoji } = this.props
     return (

From b1b9025d9c498970e7c85bcf880bb06b24bcff21 Mon Sep 17 00:00:00 2001
From: tidy-dev <tidy-dev@github.com>
Date: Wed, 29 Jun 2022 13:43:53 -0400
Subject: [PATCH 62/88] Messaging first draft

---
 .../ui/history/unreachable-commits-dialog.tsx | 44 ++++++++++++++-----
 .../ui/dialogs/_unreachable-commits.scss      |  7 +++
 2 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/app/src/ui/history/unreachable-commits-dialog.tsx b/app/src/ui/history/unreachable-commits-dialog.tsx
index 933eef5026..6114f0e8dc 100644
--- a/app/src/ui/history/unreachable-commits-dialog.tsx
+++ b/app/src/ui/history/unreachable-commits-dialog.tsx
@@ -85,18 +85,22 @@ export class UnreachableCommitsDialog extends React.Component<
 
   private renderActiveTab() {
     const { commitLookup, emoji } = this.props
+
     return (
-      <div className="unreachable-commit-list">
-        <CommitList
-          gitHubRepository={null}
-          isLocalRepository={true}
-          commitLookup={commitLookup}
-          commitSHAs={this.getShasToDisplay()}
-          selectedSHAs={[]}
-          localCommitSHAs={[]}
-          emoji={emoji}
-        />
-      </div>
+      <>
+        {this.renderUnreachableCommitsMessage()}
+        <div className="unreachable-commit-list">
+          <CommitList
+            gitHubRepository={null}
+            isLocalRepository={true}
+            commitLookup={commitLookup}
+            commitSHAs={this.getShasToDisplay()}
+            selectedSHAs={[]}
+            localCommitSHAs={[]}
+            emoji={emoji}
+          />
+        </div>
+      </>
     )
   }
 
@@ -108,6 +112,24 @@ export class UnreachableCommitsDialog extends React.Component<
     )
   }
 
+  private renderUnreachableCommitsMessage = () => {
+    const count = this.getShasToDisplay().length
+    const commitS = count > 1 ? 'commits' : 'commit'
+    return (
+      <div className="message">
+        Your changes represent commits reachable by following the ancestral path
+        starting at latest commit in your selection. You will{' '}
+        {this.state.selectedTab === UnreachableCommitsTab.Unreachable
+          ? 'NOT'
+          : ''}{' '}
+        see changes from the following {commitS}.{' '}
+        {this.state.selectedTab === UnreachableCommitsTab.Unreachable
+          ? `These ${commitS} likely originated from a different branch than what your latest commit originates from.`
+          : ''}
+      </div>
+    )
+  }
+
   public render() {
     return (
       <Dialog
diff --git a/app/styles/ui/dialogs/_unreachable-commits.scss b/app/styles/ui/dialogs/_unreachable-commits.scss
index 367c0c28c3..e824c9dc99 100644
--- a/app/styles/ui/dialogs/_unreachable-commits.scss
+++ b/app/styles/ui/dialogs/_unreachable-commits.scss
@@ -1,8 +1,15 @@
 .unreachable-commits {
+  max-width: 400px;
+
   .unreachable-commit-list {
     flex: 1;
     display: flex;
     flex-direction: column;
     min-height: 160px;
   }
+
+  .message {
+    padding: var(--spacing);
+    border-bottom: var(--base-border);
+  }
 }

From 1e384423e39542da78d2a577c2f69da3fe7cbb22 Mon Sep 17 00:00:00 2001
From: tidy-dev <tidy-dev@github.com>
Date: Wed, 29 Jun 2022 11:49:53 -0400
Subject: [PATCH 63/88] Only show link if there are unreachable commits

---
 app/src/ui/history/commit-summary.tsx | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/app/src/ui/history/commit-summary.tsx b/app/src/ui/history/commit-summary.tsx
index 2a80c344b4..139c6b943c 100644
--- a/app/src/ui/history/commit-summary.tsx
+++ b/app/src/ui/history/commit-summary.tsx
@@ -456,20 +456,26 @@ export class CommitSummary extends React.Component<
       )
     }
 
-    const numInDiff =
-      selectedCommits.length -
-      getCountCommitsNotInDiff(selectedCommits, shasInDiff)
+    const commitsNotInDiff = getCountCommitsNotInDiff(
+      selectedCommits,
+      shasInDiff
+    )
+    const numInDiff = selectedCommits.length - commitsNotInDiff
 
     return (
       <div className={summaryClassNames}>
         Showing changes from{' '}
-        <LinkButton
-          onMouseOver={this.onHighlightShasInDiff}
-          onMouseOut={this.onRemoveHighlightOfShas}
-          onClick={this.showUnreachableCommits}
-        >
-          {numInDiff} commits
-        </LinkButton>
+        {commitsNotInDiff > 0 ? (
+          <LinkButton
+            onMouseOver={this.onHighlightShasInDiff}
+            onMouseOut={this.onRemoveHighlightOfShas}
+            onClick={this.showUnreachableCommits}
+          >
+            {numInDiff} commits
+          </LinkButton>
+        ) : (
+          <> {numInDiff} commits</>
+        )}
       </div>
     )
   }

From 665b441c2270d858bda37df002e4dcc503a9acb5 Mon Sep 17 00:00:00 2001
From: tidy-dev <75402236+tidy-dev@users.noreply.github.com>
Date: Thu, 30 Jun 2022 09:22:51 -0400
Subject: [PATCH 64/88] Doy.. need check on 0 not 1

Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
---
 app/src/ui/history/commit-list.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/ui/history/commit-list.tsx b/app/src/ui/history/commit-list.tsx
index 058d5e9978..21c87f6d49 100644
--- a/app/src/ui/history/commit-list.tsx
+++ b/app/src/ui/history/commit-list.tsx
@@ -381,7 +381,7 @@ export class CommitList extends React.Component<ICommitListProps, {}> {
     }
 
     const classes = classNames({
-      'has-highlighted-commits': shasToHighlight.length > 1,
+      'has-highlighted-commits': shasToHighlight.length > 0,
     })
 
     return (

From e37c7f66a441f1c099f706048e8f53ce2c2c79ac Mon Sep 17 00:00:00 2001
From: tidy-dev <75402236+tidy-dev@users.noreply.github.com>
Date: Thu, 30 Jun 2022 09:23:20 -0400
Subject: [PATCH 65/88] Quicker removal of highlighting

Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
---
 app/styles/ui/history/_commit-list.scss | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/styles/ui/history/_commit-list.scss b/app/styles/ui/history/_commit-list.scss
index dab6d7a894..cb97efcc04 100644
--- a/app/styles/ui/history/_commit-list.scss
+++ b/app/styles/ui/history/_commit-list.scss
@@ -54,7 +54,7 @@
 
   &.has-highlighted-commits {
     .list-item {
-      transition: opacity 0.6s;
+      transition: opacity 0.5s;
 
       &:not(.highlighted) {
         opacity: 30%;
@@ -62,6 +62,12 @@
     }
   }
 
+  &:not(.has-highlighted-commits) {
+    .list-item {
+      transition: opacity 0.25s;
+    }
+  }
+
   .focus-within {
     .list-item.selected {
       .commit {

From b76d76e0512037cf17d9cecb92fed5e9fcb8ad5d Mon Sep 17 00:00:00 2001
From: tidy-dev <tidy-dev@github.com>
Date: Thu, 30 Jun 2022 09:26:05 -0400
Subject: [PATCH 66/88] Pluralize

---
 app/src/ui/history/commit-summary.tsx | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/src/ui/history/commit-summary.tsx b/app/src/ui/history/commit-summary.tsx
index 139c6b943c..04c0cad452 100644
--- a/app/src/ui/history/commit-summary.tsx
+++ b/app/src/ui/history/commit-summary.tsx
@@ -377,6 +377,8 @@ export class CommitSummary extends React.Component<
       return
     }
 
+    const commitsPluralized = excludedCommitsCount > 1 ? 'commits' : 'commit'
+
     return (
       <div
         className="commit-unreachable-info"
@@ -385,7 +387,7 @@ export class CommitSummary extends React.Component<
       >
         <Octicon symbol={OcticonSymbol.info} />
         <LinkButton onClick={this.showUnreachableCommits}>
-          {excludedCommitsCount} unreachable commits
+          {excludedCommitsCount} unreachable {commitsPluralized}
         </LinkButton>{' '}
         not included.
       </div>
@@ -461,7 +463,7 @@ export class CommitSummary extends React.Component<
       shasInDiff
     )
     const numInDiff = selectedCommits.length - commitsNotInDiff
-
+    const commitsPluralized = numInDiff > 1 ? 'commits' : 'commit'
     return (
       <div className={summaryClassNames}>
         Showing changes from{' '}
@@ -471,10 +473,13 @@ export class CommitSummary extends React.Component<
             onMouseOut={this.onRemoveHighlightOfShas}
             onClick={this.showUnreachableCommits}
           >
-            {numInDiff} commits
+            {numInDiff} {commitsPluralized}
           </LinkButton>
         ) : (
-          <> {numInDiff} commits</>
+          <>
+            {' '}
+            {numInDiff} {commitsPluralized}
+          </>
         )}
       </div>
     )

From 15aee6d037d7c1108c636ef33a643cd82e44bea2 Mon Sep 17 00:00:00 2001
From: Sergio Padrino <sergio.padrino@gmail.com>
Date: Thu, 30 Jun 2022 17:53:42 +0200
Subject: [PATCH 67/88] Use a cleaner approach for verifying IPC message
 senders

Co-Authored-By: Markus Olsson <634063+niik@users.noreply.github.com>
---
 app/src/main-process/app-window.ts              |  7 +++++--
 app/src/main-process/crash-window.ts            |  8 +++++---
 app/src/main-process/ipc-main.ts                | 11 ++---------
 app/src/main-process/main.ts                    |  2 +-
 app/src/main-process/show-uncaught-exception.ts |  3 ---
 app/src/main-process/trusted-ipc-sender.ts      | 16 ++++++++++++++++
 6 files changed, 29 insertions(+), 18 deletions(-)
 create mode 100644 app/src/main-process/trusted-ipc-sender.ts

diff --git a/app/src/main-process/app-window.ts b/app/src/main-process/app-window.ts
index 82a14f95e3..b8f0ca9887 100644
--- a/app/src/main-process/app-window.ts
+++ b/app/src/main-process/app-window.ts
@@ -5,6 +5,7 @@ import {
   BrowserWindow,
   autoUpdater,
   nativeTheme,
+  WebContents,
 } from 'electron'
 import { Emitter, Disposable } from 'event-kit'
 import { encodePathAsUrl } from '../lib/path'
@@ -25,6 +26,7 @@ import {
   installNotificationCallback,
   terminateDesktopNotifications,
 } from './notifications'
+import { addTrustedIPCSender } from './trusted-ipc-sender'
 
 export class AppWindow {
   private window: Electron.BrowserWindow
@@ -77,6 +79,7 @@ export class AppWindow {
     }
 
     this.window = new BrowserWindow(windowOptions)
+    addTrustedIPCSender(this.window.webContents)
 
     installNotificationCallback(this.window)
 
@@ -211,8 +214,8 @@ export class AppWindow {
     return !!this.loadTime && !!this.rendererReadyTime
   }
 
-  public get webContentsId(): number {
-    return this.window.webContents.id
+  public get webContents(): WebContents {
+    return this.window.webContents
   }
 
   public onClose(fn: () => void) {
diff --git a/app/src/main-process/crash-window.ts b/app/src/main-process/crash-window.ts
index 250f372cd3..8fdfdb3ced 100644
--- a/app/src/main-process/crash-window.ts
+++ b/app/src/main-process/crash-window.ts
@@ -1,9 +1,10 @@
-import { BrowserWindow } from 'electron'
+import { BrowserWindow, WebContents } from 'electron'
 import { Emitter, Disposable } from 'event-kit'
 import { ICrashDetails, ErrorType } from '../crash/shared'
 import { registerWindowStateChangedEvents } from '../lib/window-state'
 import * as ipcMain from './ipc-main'
 import * as ipcWebContents from './ipc-webcontents'
+import { addTrustedIPCSender } from './trusted-ipc-sender'
 
 const minWidth = 600
 const minHeight = 500
@@ -51,13 +52,14 @@ export class CrashWindow {
     }
 
     this.window = new BrowserWindow(windowOptions)
+    addTrustedIPCSender(this.window.webContents)
 
     this.error = error
     this.errorType = errorType
   }
 
-  public get webContentsId(): number {
-    return this.window.webContents.id
+  public get webContents(): WebContents {
+    return this.window.webContents
   }
 
   public load() {
diff --git a/app/src/main-process/ipc-main.ts b/app/src/main-process/ipc-main.ts
index 92e3f16561..a68f4c99f5 100644
--- a/app/src/main-process/ipc-main.ts
+++ b/app/src/main-process/ipc-main.ts
@@ -2,8 +2,7 @@ import { RequestChannels, RequestResponseChannels } from '../lib/ipc-shared'
 // eslint-disable-next-line no-restricted-imports
 import { ipcMain } from 'electron'
 import { IpcMainEvent, IpcMainInvokeEvent } from 'electron/main'
-import { mainWindow } from './main'
-import { crashWindow } from './show-uncaught-exception'
+import { isTrustedIPCSender } from './trusted-ipc-sender'
 
 type RequestChannelListener<T extends keyof RequestChannels> = (
   event: IpcMainEvent,
@@ -55,13 +54,7 @@ function safeListener<E extends IpcMainEvent | IpcMainInvokeEvent, R>(
   listener: (event: E, ...a: any) => R
 ) {
   return (event: E, ...args: any) => {
-    const senderId = event.sender.id
-    // TODO: replace these ternary checks with optional chaining. We couldn't
-    // do that at the time of writing this because of a bug in Webpack <5.71.0:
-    // https://github.com/webpack/webpack/issues/12960
-    const rendererId = mainWindow ? mainWindow.webContentsId : null
-    const crashId = crashWindow ? crashWindow.webContentsId : null
-    if (![rendererId, crashId].includes(senderId)) {
+    if (!isTrustedIPCSender(event.sender)) {
       log.error(
         `IPC message received from invalid sender: ${event.senderFrame.url}`
       )
diff --git a/app/src/main-process/main.ts b/app/src/main-process/main.ts
index 64c1581465..114480145f 100644
--- a/app/src/main-process/main.ts
+++ b/app/src/main-process/main.ts
@@ -50,7 +50,7 @@ import { initializeDesktopNotifications } from './notifications'
 app.setAppLogsPath()
 enableSourceMaps()
 
-export let mainWindow: AppWindow | null = null
+let mainWindow: AppWindow | null = null
 
 const launchTime = now()
 
diff --git a/app/src/main-process/show-uncaught-exception.ts b/app/src/main-process/show-uncaught-exception.ts
index c2f041a265..5f04ee66ff 100644
--- a/app/src/main-process/show-uncaught-exception.ts
+++ b/app/src/main-process/show-uncaught-exception.ts
@@ -3,7 +3,6 @@ import { setCrashMenu } from './menu'
 import { formatError } from '../lib/logging/format-error'
 import { CrashWindow } from './crash-window'
 
-export let crashWindow: CrashWindow | null = null
 let hasReportedUncaughtException = false
 
 /** Show the uncaught exception UI. */
@@ -50,6 +49,4 @@ export function showUncaughtException(isLaunchError: boolean, error: Error) {
   })
 
   window.load()
-
-  crashWindow = window
 }
diff --git a/app/src/main-process/trusted-ipc-sender.ts b/app/src/main-process/trusted-ipc-sender.ts
new file mode 100644
index 0000000000..ae36a90e78
--- /dev/null
+++ b/app/src/main-process/trusted-ipc-sender.ts
@@ -0,0 +1,16 @@
+import { WebContents } from 'electron'
+
+// WebContents id of trusted senders of IPC messages. This is used to verify
+// that only IPC messages sent from trusted senders are handled, as recommended
+// by the Electron security documentation:
+// https://github.com/electron/electron/blob/main/docs/tutorial/security.md#17-validate-the-sender-of-all-ipc-messages
+const trustedSenders = new Set<number>()
+
+/** Adds a WebContents instance to the set of trusted IPC senders. */
+export const addTrustedIPCSender = (wc: WebContents) => {
+  trustedSenders.add(wc.id)
+  wc.on('destroyed', () => trustedSenders.delete(wc.id))
+}
+
+/** Returns true if the given WebContents is a trusted sender of IPC messages. */
+export const isTrustedIPCSender = (wc: WebContents) => trustedSenders.has(wc.id)

From 96db4700c389b30941f40155f0736c7369c4b120 Mon Sep 17 00:00:00 2001
From: tidy-dev <tidy-dev@github.com>
Date: Fri, 1 Jul 2022 05:56:35 -0400
Subject: [PATCH 68/88] Be concise

---
 .../ui/history/unreachable-commits-dialog.tsx    | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/src/ui/history/unreachable-commits-dialog.tsx b/app/src/ui/history/unreachable-commits-dialog.tsx
index 6114f0e8dc..66dca180ad 100644
--- a/app/src/ui/history/unreachable-commits-dialog.tsx
+++ b/app/src/ui/history/unreachable-commits-dialog.tsx
@@ -114,18 +114,20 @@ export class UnreachableCommitsDialog extends React.Component<
 
   private renderUnreachableCommitsMessage = () => {
     const count = this.getShasToDisplay().length
-    const commitS = count > 1 ? 'commits' : 'commit'
+    const commitsPluralized = count > 1 ? 'commits' : 'commit'
+    const pronounPluralized = count > 1 ? `they're` : `it's`
     return (
       <div className="message">
-        Your changes represent commits reachable by following the ancestral path
-        starting at latest commit in your selection. You will{' '}
+        You will{' '}
         {this.state.selectedTab === UnreachableCommitsTab.Unreachable
-          ? 'NOT'
+          ? 'not'
           : ''}{' '}
-        see changes from the following {commitS}.{' '}
+        see changes from the following {commitsPluralized} because{' '}
+        {pronounPluralized}{' '}
         {this.state.selectedTab === UnreachableCommitsTab.Unreachable
-          ? `These ${commitS} likely originated from a different branch than what your latest commit originates from.`
-          : ''}
+          ? 'not'
+          : ''}{' '}
+        in the ancestry path of the most recent commit in your selection.
       </div>
     )
   }

From 9185a3f697c1cceca0d1cee73e73a984ffed3af3 Mon Sep 17 00:00:00 2001
From: tidy-dev <tidy-dev@github.com>
Date: Fri, 1 Jul 2022 10:31:34 -0400
Subject: [PATCH 69/88] Better title

---
 app/src/ui/history/unreachable-commits-dialog.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/ui/history/unreachable-commits-dialog.tsx b/app/src/ui/history/unreachable-commits-dialog.tsx
index 66dca180ad..d5503e7791 100644
--- a/app/src/ui/history/unreachable-commits-dialog.tsx
+++ b/app/src/ui/history/unreachable-commits-dialog.tsx
@@ -136,7 +136,7 @@ export class UnreachableCommitsDialog extends React.Component<
     return (
       <Dialog
         className="unreachable-commits"
-        title={__DARWIN__ ? 'Unreachable Commits' : 'Unreachable commits'}
+        title={__DARWIN__ ? 'Commit Reachability' : 'Commit reachability'}
         onSubmit={this.props.onDismissed}
         onDismissed={this.props.onDismissed}
       >

From 38f49dbac421ee127774ae1f7deedd29cb0eeb92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrique=20Corr=C3=AAa?=
 <75134774+HeCorr@users.noreply.github.com>
Date: Sat, 2 Jul 2022 21:15:06 -0300
Subject: [PATCH 70/88] fix commit description overflowing incorrectly with 3
 lines

it should be a permanent fix and it's now easy to change the amount of lines shown.
thanks to @sergiou87 for the CSS code.
---
 app/styles/ui/history/_commit-summary.scss | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/styles/ui/history/_commit-summary.scss b/app/styles/ui/history/_commit-summary.scss
index 9aa4495527..0a025c2af2 100644
--- a/app/styles/ui/history/_commit-summary.scss
+++ b/app/styles/ui/history/_commit-summary.scss
@@ -27,6 +27,7 @@
     .commit-summary-description-scroll-view {
       max-height: 400px;
       overflow: auto;
+      display: revert;
 
       &:before {
         content: none;
@@ -118,9 +119,11 @@
 
   &-description-scroll-view {
     overflow: hidden;
-    // The extra pixel makes the space align up with the commit list.
-    max-height: 70px;
     flex: 1;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    // Maximum amount of commit description lines to show before collapsing
+    -webkit-line-clamp: 3;
   }
 
   // Enable text selection inside the title and description elements.

From 999c63ea99b429e26a1564edf7fc5745d6e25019 Mon Sep 17 00:00:00 2001
From: Brendan Forster <github@brendanforster.com>
Date: Sat, 11 Jun 2022 09:24:20 -0300
Subject: [PATCH 71/88] skip platform-specific setup of notifications on Linux

---
 app/src/main-process/notifications.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main-process/notifications.ts b/app/src/main-process/notifications.ts
index 98717e04d0..27eed49c74 100644
--- a/app/src/main-process/notifications.ts
+++ b/app/src/main-process/notifications.ts
@@ -11,6 +11,11 @@ import * as ipcWebContents from './ipc-webcontents'
 let windowsToastActivatorClsid: string | undefined = undefined
 
 export function initializeDesktopNotifications() {
+  if (__LINUX__) {
+    // notifications not currently supported
+    return
+  }
+
   if (__DARWIN__) {
     initializeNotifications({})
     return

From 73d8c26e4dfc23374b8b591d4f74d3dfb275ff9e Mon Sep 17 00:00:00 2001
From: Brendan Forster <github@brendanforster.com>
Date: Sat, 25 Jun 2022 13:38:56 -0300
Subject: [PATCH 72/88] fix typo in error message

---
 app/src/main-process/notifications.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main-process/notifications.ts b/app/src/main-process/notifications.ts
index 27eed49c74..0ae209ca46 100644
--- a/app/src/main-process/notifications.ts
+++ b/app/src/main-process/notifications.ts
@@ -29,7 +29,7 @@ export function initializeDesktopNotifications() {
 
   if (windowsToastActivatorClsid === undefined) {
     log.error(
-      'Toast activator CLSID not found in any of the shortucts. Falling back to known CLSIDs.'
+      'Toast activator CLSID not found in any of the shortcuts. Falling back to known CLSIDs.'
     )
 
     // This is generated by Squirrel.Windows here:

From ade6ad6076fdf37e0d1b9d6c26c40985fedcb2cb Mon Sep 17 00:00:00 2001
From: Naveen <172697+naveensrinivasan@users.noreply.github.com>
Date: Sat, 9 Jul 2022 14:04:58 -0500
Subject: [PATCH 73/88] Update dependabot.yml

---
 .github/dependabot.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 5ace4600a1..ca79ca5b4d 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,6 +1,6 @@
 version: 2
 updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
+  - package-ecosystem: github-actions
+    directory: /
     schedule:
-      interval: "weekly"
+      interval: weekly

From ab8b801ba03cf05012d9e96bf87da5b083ecfdb9 Mon Sep 17 00:00:00 2001
From: Tsvetilian Yankov <tsvetilian.ty@gmail.com>
Date: Sat, 9 Jul 2022 23:16:52 +0300
Subject: [PATCH 74/88] Fix Open in Desktop when clone modal is open

---
 app/src/ui/clone-repository/clone-repository.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/ui/clone-repository/clone-repository.tsx b/app/src/ui/clone-repository/clone-repository.tsx
index a8896f9295..d89646a093 100644
--- a/app/src/ui/clone-repository/clone-repository.tsx
+++ b/app/src/ui/clone-repository/clone-repository.tsx
@@ -187,6 +187,10 @@ export class CloneRepository extends React.Component<
     if (prevProps.selectedTab !== this.props.selectedTab) {
       this.validatePath()
     }
+
+    if (prevProps.initialURL !== this.props.initialURL) {
+      this.updateUrl(this.props.initialURL || '')
+    }
   }
 
   public componentDidMount() {

From 0276dcfa55b1c6d13acf45f704f62e7bb8baf4a9 Mon Sep 17 00:00:00 2001
From: Sergio Padrino <sergio.padrino@gmail.com>
Date: Mon, 11 Jul 2022 09:22:00 +0200
Subject: [PATCH 75/88] Remove unused properties

Co-Authored-By: Markus Olsson <634063+niik@users.noreply.github.com>
---
 app/src/main-process/app-window.ts   | 5 -----
 app/src/main-process/crash-window.ts | 6 +-----
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/app/src/main-process/app-window.ts b/app/src/main-process/app-window.ts
index b8f0ca9887..073509acac 100644
--- a/app/src/main-process/app-window.ts
+++ b/app/src/main-process/app-window.ts
@@ -5,7 +5,6 @@ import {
   BrowserWindow,
   autoUpdater,
   nativeTheme,
-  WebContents,
 } from 'electron'
 import { Emitter, Disposable } from 'event-kit'
 import { encodePathAsUrl } from '../lib/path'
@@ -214,10 +213,6 @@ export class AppWindow {
     return !!this.loadTime && !!this.rendererReadyTime
   }
 
-  public get webContents(): WebContents {
-    return this.window.webContents
-  }
-
   public onClose(fn: () => void) {
     this.window.on('closed', fn)
   }
diff --git a/app/src/main-process/crash-window.ts b/app/src/main-process/crash-window.ts
index 8fdfdb3ced..d91fee11ef 100644
--- a/app/src/main-process/crash-window.ts
+++ b/app/src/main-process/crash-window.ts
@@ -1,4 +1,4 @@
-import { BrowserWindow, WebContents } from 'electron'
+import { BrowserWindow } from 'electron'
 import { Emitter, Disposable } from 'event-kit'
 import { ICrashDetails, ErrorType } from '../crash/shared'
 import { registerWindowStateChangedEvents } from '../lib/window-state'
@@ -58,10 +58,6 @@ export class CrashWindow {
     this.errorType = errorType
   }
 
-  public get webContents(): WebContents {
-    return this.window.webContents
-  }
-
   public load() {
     log.debug('Starting crash process')
 

From 423d080df2ec8f2709bba8fe54980426de392044 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Jul 2022 08:06:32 +0000
Subject: [PATCH 76/88] Bump actions/checkout from 2 to 3

Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci.yml         | 2 +-
 .github/workflows/codeql.yml     | 2 +-
 .github/workflows/release-pr.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 40e7a8537d..edf1236592 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,7 +28,7 @@ jobs:
       # Needed for macOS arm64 until hosted macos-11.0 runners become available
       SDKROOT: /Library/Developer/CommandLineTools/SDKs/MacOSX11.1.sdk
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
       - name: Use Node.js ${{ matrix.node }}
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 4d8d7d8f23..87d8220873 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
diff --git a/.github/workflows/release-pr.yml b/.github/workflows/release-pr.yml
index 3388c687dd..0619858d7b 100644
--- a/.github/workflows/release-pr.yml
+++ b/.github/workflows/release-pr.yml
@@ -9,7 +9,7 @@ jobs:
     permissions:
       pull-requests: write
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         if: |
           startsWith(github.ref, 'refs/heads/releases/') && !contains(github.ref, 'test')
 

From b9e12e4d2b58161e36831b2dc8747b76d901aafc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Jul 2022 08:06:34 +0000
Subject: [PATCH 77/88] Bump github/codeql-action from 1 to 2

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 1 to 2.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/v1...v2)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 4d8d7d8f23..4d996e1cf2 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -22,7 +22,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
+        uses: github/codeql-action/init@v2
         with:
           config-file: ./.github/codeql/codeql-config.yml
 
@@ -32,7 +32,7 @@ jobs:
       # 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
+        uses: github/codeql-action/autobuild@v2
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -46,4 +46,4 @@ jobs:
       #     make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
+        uses: github/codeql-action/analyze@v2

From e1579059c072dbfec72c5d79212efdd825bb0a54 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Jul 2022 08:06:37 +0000
Subject: [PATCH 78/88] Bump actions/setup-node from 1 to 3

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 1 to 3.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v1...v3)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 40e7a8537d..c4b30847f8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,7 +32,7 @@ jobs:
         with:
           submodules: recursive
       - name: Use Node.js ${{ matrix.node }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
 

From abbcafb2c7d8e0634961678c16a3340720d3fd6d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Jul 2022 08:06:40 +0000
Subject: [PATCH 79/88] Bump actions/cache from 2 to 3

Bumps [actions/cache](https://github.com/actions/cache) from 2 to 3.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 40e7a8537d..516401c02c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,7 +40,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}

From 814f6ffc04f11fc603819054d568b4b21f991740 Mon Sep 17 00:00:00 2001
From: tidy-dev <tidy-dev@github.com>
Date: Tue, 12 Jul 2022 14:37:07 -0400
Subject: [PATCH 80/88] Bump to Dugite 1.110.0

---
 app/package.json             | 2 +-
 app/src/lib/git/core.ts      | 1 +
 app/src/lib/git/rev-parse.ts | 2 +-
 app/yarn.lock                | 8 ++++----
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/package.json b/app/package.json
index 171c613a4a..f3b76f6587 100644
--- a/app/package.json
+++ b/app/package.json
@@ -30,7 +30,7 @@
     "desktop-trampoline": "desktop/desktop-trampoline#v0.9.8",
     "dexie": "^3.2.2",
     "dompurify": "^2.3.3",
-    "dugite": "^1.109.0",
+    "dugite": "^1.110.0",
     "electron-window-state": "^5.0.3",
     "event-kit": "^2.0.0",
     "focus-trap-react": "^8.1.0",
diff --git a/app/src/lib/git/core.ts b/app/src/lib/git/core.ts
index a3756b44d3..e915ce93d6 100644
--- a/app/src/lib/git/core.ts
+++ b/app/src/lib/git/core.ts
@@ -429,6 +429,7 @@ function getDescriptionForError(error: DugiteError): string | null {
     case DugiteError.ConflictModifyDeletedInBranch:
     case DugiteError.MergeCommitNoMainlineOption:
     case DugiteError.UnsafeDirectory:
+    case DugiteError.PathExistsButNotInRef:
       return null
     default:
       return assertNever(error, `Unknown error: ${error}`)
diff --git a/app/src/lib/git/rev-parse.ts b/app/src/lib/git/rev-parse.ts
index fb59ece94a..aa3fa68f44 100644
--- a/app/src/lib/git/rev-parse.ts
+++ b/app/src/lib/git/rev-parse.ts
@@ -37,7 +37,7 @@ export async function getRepositoryType(path: string): Promise<RepositoryType> {
     }
 
     const unsafeMatch =
-      /fatal: unsafe repository \('(.+)\' is owned by someone else\)/.exec(
+      /fatal: detected dubious ownership in repository at '(.+)\' /.exec(
         result.stderr
       )
     if (unsafeMatch) {
diff --git a/app/yarn.lock b/app/yarn.lock
index 7c80ee90e7..cec17ef8c2 100644
--- a/app/yarn.lock
+++ b/app/yarn.lock
@@ -433,10 +433,10 @@ dompurify@^2.3.3:
   resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.3.tgz#c1af3eb88be47324432964d8abc75cf4b98d634c"
   integrity sha512-dqnqRkPMAjOZE0FogZ+ceJNM2dZ3V/yNOuFB7+39qpO93hHhfRpHw3heYQC7DPK9FqbQTfBKUJhiSfz4MvXYwg==
 
-dugite@^1.109.0:
-  version "1.109.0"
-  resolved "https://registry.yarnpkg.com/dugite/-/dugite-1.109.0.tgz#662f726befeefb47b697d6e08f940be865699b74"
-  integrity sha512-pPAs67j/sF6Y84pfI94VOtjMtCxX17OaNOggP+pJAZ4sA53OvcQj2zPgk87EnZaZoOmQYa0EdlH/tsEQhc+wVA==
+dugite@^1.110.0:
+  version "1.110.0"
+  resolved "https://registry.yarnpkg.com/dugite/-/dugite-1.110.0.tgz#3db86bf66d3690fdbcf83c59575563909b79d27f"
+  integrity sha512-JPHd07QYajpUWJmZdeQSuuRL+OZ92tAWZvDqI+EJdETuwgNmMh+OyyXOaBcuGnlPznWEppQaHaEAEEqLdF9W/Q==
   dependencies:
     checksum "^0.1.1"
     got "^9.6.0"

From 06c9bb7f75b5e8af7b73195a33890b09e3739119 Mon Sep 17 00:00:00 2001
From: tidy-dev <tidy-dev@github.com>
Date: Tue, 12 Jul 2022 14:47:37 -0400
Subject: [PATCH 81/88] Release 3.0.4

---
 app/package.json | 2 +-
 changelog.json   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/package.json b/app/package.json
index f3b76f6587..1de408242e 100644
--- a/app/package.json
+++ b/app/package.json
@@ -3,7 +3,7 @@
   "productName": "GitHub Desktop",
   "bundleID": "com.github.GitHubClient",
   "companyName": "GitHub, Inc.",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "main": "./main.js",
   "repository": {
     "type": "git",
diff --git a/changelog.json b/changelog.json
index 137e1eb07e..c08e7ac049 100644
--- a/changelog.json
+++ b/changelog.json
@@ -1,5 +1,6 @@
 {
   "releases": {
+    "3.0.4": ["[Improved] Upgrade embedded Git to 2.35.4"],
     "3.0.3": [
       "[Added] Add Aptana Studio support - #14669. Thanks @tsvetilian-ty!",
       "[Fixed] Fix crash when user's locale is unsupported by the spellchecker - #14817. Thanks @tsvetilian-ty!",

From a2a47545320b080f87b43ea59b09fe29794c3f33 Mon Sep 17 00:00:00 2001
From: tidy-dev <75402236+tidy-dev@users.noreply.github.com>
Date: Wed, 13 Jul 2022 11:18:07 -0400
Subject: [PATCH 82/88] conciser empty list message evaluator

Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
---
 app/src/ui/history/commit-list.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/src/ui/history/commit-list.tsx b/app/src/ui/history/commit-list.tsx
index d301ea0bd2..4465503a1d 100644
--- a/app/src/ui/history/commit-list.tsx
+++ b/app/src/ui/history/commit-list.tsx
@@ -379,9 +379,7 @@ export class CommitList extends React.Component<ICommitListProps, {}> {
     if (commitSHAs.length === 0) {
       return (
         <div className="panel blankslate">
-          {emptyListMessage === undefined
-            ? 'No commits to list'
-            : emptyListMessage}
+          {emptyListMessage ?? 'No commits to list'}
         </div>
       )
     }

From 65b140a598755d2519ab51362a4b933f5a8a7b24 Mon Sep 17 00:00:00 2001
From: tidy-dev <75402236+tidy-dev@users.noreply.github.com>
Date: Wed, 13 Jul 2022 11:19:54 -0400
Subject: [PATCH 83/88] no need for undefined

Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
---
 app/src/ui/history/commit-list.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/ui/history/commit-list.tsx b/app/src/ui/history/commit-list.tsx
index 4465503a1d..2b1f3febda 100644
--- a/app/src/ui/history/commit-list.tsx
+++ b/app/src/ui/history/commit-list.tsx
@@ -51,7 +51,7 @@ interface ICommitListProps {
   readonly onScroll?: (start: number, end: number) => void
 
   /** Callback to fire to undo a given commit in the current repository */
-  readonly onUndoCommit?: ((commit: Commit) => void) | undefined
+  readonly onUndoCommit?: (commit: Commit) => void
 
   /** Callback to fire to reset to a given commit in the current repository */
   readonly onResetToCommit?: (commit: Commit) => void

From 44ed1d3289beaf78c25baebe50e1c08e9d19daed Mon Sep 17 00:00:00 2001
From: tidy-dev <75402236+tidy-dev@users.noreply.github.com>
Date: Wed, 13 Jul 2022 11:20:06 -0400
Subject: [PATCH 84/88] No need for undefined

Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
---
 app/src/ui/history/commit-list.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/ui/history/commit-list.tsx b/app/src/ui/history/commit-list.tsx
index 2b1f3febda..d176775bac 100644
--- a/app/src/ui/history/commit-list.tsx
+++ b/app/src/ui/history/commit-list.tsx
@@ -57,7 +57,7 @@ interface ICommitListProps {
   readonly onResetToCommit?: (commit: Commit) => void
 
   /** Callback to fire to revert a given commit in the current repository */
-  readonly onRevertCommit?: ((commit: Commit) => void) | undefined
+  readonly onRevertCommit?: (commit: Commit) => void
 
   readonly onAmendCommit?: (commit: Commit, isLocalCommit: boolean) => void
 

From 0d8b00f49a1ec20120987e0a77494114ec6a01ba Mon Sep 17 00:00:00 2001
From: tidy-dev <75402236+tidy-dev@users.noreply.github.com>
Date: Wed, 13 Jul 2022 11:20:47 -0400
Subject: [PATCH 85/88] shas of shas...

Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
---
 app/src/ui/history/unreachable-commits-dialog.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/ui/history/unreachable-commits-dialog.tsx b/app/src/ui/history/unreachable-commits-dialog.tsx
index d5503e7791..7919e09f11 100644
--- a/app/src/ui/history/unreachable-commits-dialog.tsx
+++ b/app/src/ui/history/unreachable-commits-dialog.tsx
@@ -14,7 +14,7 @@ interface IUnreachableCommitsDialogProps {
   /** The shas of the currently selected commits */
   readonly selectedShas: ReadonlyArray<string>
 
-  /** The shas of the shas showed in the diff */
+  /** The shas of the commits showed in the diff */
   readonly shasInDiff: ReadonlyArray<string>
 
   /** The commits loaded, keyed by their full SHA. */

From c11c9232bbf3689404c5784b3415ab9c19080f33 Mon Sep 17 00:00:00 2001
From: Sergio Padrino <sergio.padrino@gmail.com>
Date: Thu, 14 Jul 2022 09:26:07 +0200
Subject: [PATCH 86/88] Fix regex to detect unsafe repositories

---
 app/src/lib/git/rev-parse.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/lib/git/rev-parse.ts b/app/src/lib/git/rev-parse.ts
index aa3fa68f44..171c27fa0c 100644
--- a/app/src/lib/git/rev-parse.ts
+++ b/app/src/lib/git/rev-parse.ts
@@ -37,7 +37,7 @@ export async function getRepositoryType(path: string): Promise<RepositoryType> {
     }
 
     const unsafeMatch =
-      /fatal: detected dubious ownership in repository at '(.+)\' /.exec(
+      /fatal: detected dubious ownership in repository at '(.+)'/.exec(
         result.stderr
       )
     if (unsafeMatch) {

From 073eef5a1a4c74f76b96de94bc7de37edbf27e68 Mon Sep 17 00:00:00 2001
From: Sergio Padrino <sergio.padrino@gmail.com>
Date: Thu, 14 Jul 2022 09:26:20 +0200
Subject: [PATCH 87/88] Add test for unsafe repo detection

---
 app/test/unit/git/rev-parse-test.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/test/unit/git/rev-parse-test.ts b/app/test/unit/git/rev-parse-test.ts
index 6e99e01e7c..aef3d33743 100644
--- a/app/test/unit/git/rev-parse-test.ts
+++ b/app/test/unit/git/rev-parse-test.ts
@@ -101,5 +101,13 @@ describe('git/rev-parse', () => {
         kind: 'missing',
       })
     })
+
+    it('returns unsafe for unsafe repository', async () => {
+      process.env['GIT_TEST_ASSUME_DIFFERENT_OWNER'] = '1'
+      expect(await getRepositoryType(repository.path)).toMatchObject({
+        kind: 'unsafe',
+      })
+      process.env['GIT_TEST_ASSUME_DIFFERENT_OWNER'] = undefined
+    })
   })
 })

From c9a66c6b8654b0111e41ee01735a45a6bf0bd26c Mon Sep 17 00:00:00 2001
From: Lucas <me@lhvy.dev>
Date: Tue, 19 Apr 2022 13:10:13 +1000
Subject: [PATCH 88/88] Add Warp terminal integration for macOS

---
 app/src/lib/shells/darwin.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/src/lib/shells/darwin.ts b/app/src/lib/shells/darwin.ts
index f9f482d3db..4140cd45d9 100644
--- a/app/src/lib/shells/darwin.ts
+++ b/app/src/lib/shells/darwin.ts
@@ -12,6 +12,7 @@ export enum Shell {
   Kitty = 'Kitty',
   Alacritty = 'Alacritty',
   WezTerm = 'WezTerm',
+  Warp = 'Warp',
 }
 
 export const Default = Shell.Terminal
@@ -36,6 +37,8 @@ function getBundleID(shell: Shell): string {
       return 'io.alacritty'
     case Shell.WezTerm:
       return 'com.github.wez.wezterm'
+    case Shell.Warp:
+      return 'dev.warp.Warp-Stable'
     default:
       return assertNever(shell, `Unknown shell: ${shell}`)
   }
@@ -62,6 +65,7 @@ export async function getAvailableShells(): Promise<
     kittyPath,
     alacrittyPath,
     wezTermPath,
+    warpPath,
   ] = await Promise.all([
     getShellPath(Shell.Terminal),
     getShellPath(Shell.Hyper),
@@ -70,6 +74,7 @@ export async function getAvailableShells(): Promise<
     getShellPath(Shell.Kitty),
     getShellPath(Shell.Alacritty),
     getShellPath(Shell.WezTerm),
+    getShellPath(Shell.Warp),
   ])
 
   const shells: Array<IFoundShell<Shell>> = []
@@ -104,6 +109,11 @@ export async function getAvailableShells(): Promise<
     shells.push({ shell: Shell.WezTerm, path: wezTermExecutable })
   }
 
+  if (warpPath) {
+    const warpExecutable = `${warpPath}/Contents/MacOS/stable`
+    shells.push({ shell: Shell.Warp, path: warpExecutable })
+  }
+
   return shells
 }