Pass branch sort order explicitly

Author: kurtextrem

app/src/ui/app.tsx

@@ -2281,6 +2281,7 @@ export class App extends React.Component<IAppProps, IAppState> {
             askForConfirmationOnForcePush={
               this.state.askForConfirmationOnForcePush
             }
+            branchSortOrder={this.state.branchSortOrder}
             accounts={this.state.accounts}
             cachedRepoRulesets={this.state.cachedRepoRulesets}
             openFileInExternalEditor={this.getOpenFileInExternalEditorHandler(
@@ -2523,6 +2524,7 @@ export class App extends React.Component<IAppProps, IAppState> {
             externalEditorLabel={externalEditorLabel}
             showSideBySideDiff={showSideBySideDiff}
             currentBranchHasPullRequest={currentBranchHasPullRequest}
+            branchSortOrder={this.state.branchSortOrder}
             onDismissed={onPopupDismissedFn}
             onOpenInExternalEditor={this.onOpenInExternalEditor}
           />

app/src/ui/branches/branch-list.tsx

@@ -61,7 +61,7 @@ interface IBranchListProps {
   /**
    * The sort order for branch lists in the current user preferences.
    */
-  readonly branchSortOrder?: BranchSortOrder
+  readonly branchSortOrder: BranchSortOrder
 
   /**
    * The currently selected branch in the list, see the onSelectionChanged prop.
@@ -184,7 +184,7 @@ export class BranchList extends React.Component<IBranchListProps> {
       this.props.allBranches,
       this.props.recentBranches,
       this.props.allWorktrees,
-      this.props.branchSortOrder ?? BranchSortOrder.LastModified
+      this.props.branchSortOrder
     )
   }
 

app/src/ui/branches/branch-select.tsx

@@ -4,6 +4,7 @@ import { Branch } from '../../models/branch'
 import { ClickSource } from '../lib/list'
 import { PopoverDropdown } from '../lib/popover-dropdown'
 import { BranchList } from './branch-list'
+import { BranchSortOrder } from '../../models/branch-sort-order'
 import {
   getDefaultAriaLabelForBranch,
   renderDefaultBranch,
@@ -37,6 +38,11 @@ interface IBranchSelectProps {
    */
   readonly recentBranches: ReadonlyArray<Branch>
 
+  /**
+   * The sort order for branch lists in the current user preferences.
+   */
+  readonly branchSortOrder: BranchSortOrder
+
   /** Called when the user changes the selected branch. */
   readonly onChange?: (branch: Branch) => void
 
@@ -115,6 +121,7 @@ export class BranchSelect extends React.Component<
           allBranches={allBranches}
           currentBranch={currentBranch}
           defaultBranch={defaultBranch}
+          branchSortOrder={this.props.branchSortOrder}
           recentBranches={recentBranches}
           allWorktrees={[]}
           filterText={filterText}

app/src/ui/multi-commit-operation/base-multi-commit-operation.tsx

@@ -15,11 +15,14 @@ import { PopupType } from '../../models/popup'
 import { Account } from '../../models/account'
 import { IAPIRepoRuleset } from '../../lib/api'
 import { Emoji } from '../../lib/emoji'
+import { BranchSortOrder } from '../../models/branch-sort-order'
 
 export interface IMultiCommitOperationProps {
   readonly repository: Repository
   readonly dispatcher: Dispatcher
 
+  readonly branchSortOrder: BranchSortOrder
+
   /** The current state of the multi commit operation */
   readonly state: IMultiCommitOperationState
 

app/src/ui/multi-commit-operation/cherry-pick.tsx

@@ -80,6 +80,7 @@ export abstract class CherryPick extends BaseMultiCommitOperation {
       <ChooseTargetBranchDialog
         key="choose-target-branch"
         repository={this.props.repository}
+        branchSortOrder={this.props.branchSortOrder}
         allBranches={allBranches}
         defaultBranch={defaultBranch}
         recentBranches={recentBranches}

app/src/ui/multi-commit-operation/choose-branch/base-choose-branch-dialog.tsx

@@ -3,6 +3,7 @@ import { Branch } from '../../../models/branch'
 import { Repository } from '../../../models/repository'
 import { IMatches } from '../../../lib/fuzzy-find'
 import { Dialog, DialogContent, DialogFooter } from '../../dialog'
+import { BranchSortOrder } from '../../../models/branch-sort-order'
 import {
   BranchList,
   IBranchListItem,
@@ -88,6 +89,9 @@ export interface IBaseChooseBranchDialogProps {
    */
   readonly operation: MultiCommitOperationKind
 
+  /** The sort order for branch lists in the current user preferences. */
+  readonly branchSortOrder: BranchSortOrder
+
   /**
    * A function that's called when the dialog is dismissed by the user in the
    * ways described in the Dialog component's dismissable prop.
@@ -237,6 +241,7 @@ export class ChooseBranchDialog extends React.Component<
             defaultBranch={this.props.defaultBranch}
             recentBranches={this.props.recentBranches}
             allWorktrees={[]}
+            branchSortOrder={this.props.branchSortOrder}
             filterText={this.state.filterText}
             onFilterTextChanged={this.onFilterTextChanged}
             selectedBranch={selectedBranch}

app/src/ui/multi-commit-operation/choose-branch/choose-target-branch.tsx

@@ -15,6 +15,7 @@ import {
 import { ClickSource } from '../../lib/list'
 import { getDefaultAriaLabelForBranch } from '../../branches/branch-renderer'
 import { Repository } from '../../../models/repository'
+import { BranchSortOrder } from '../../../models/branch-sort-order'
 
 interface IChooseTargetBranchDialogProps {
   readonly repository: Repository
@@ -59,6 +60,9 @@ interface IChooseTargetBranchDialogProps {
    * Call back to invoke create new branch dialog
    */
   readonly onCreateNewBranch: (targetBranchName: string) => void
+
+  /** The sort order for branch lists in the current user preferences. */
+  readonly branchSortOrder: BranchSortOrder
 }
 
 interface IChooseTargetBranchDialogState {
@@ -191,6 +195,7 @@ export class ChooseTargetBranchDialog extends React.Component<
             defaultBranch={this.props.defaultBranch}
             recentBranches={this.props.recentBranches}
             allWorktrees={[]}
+            branchSortOrder={this.props.branchSortOrder}
             filterText={this.state.filterText}
             onFilterTextChanged={this.onFilterTextChanged}
             onFilterListResultsChanged={this.onFilterListResultsChanged}

app/src/ui/multi-commit-operation/merge.tsx

@@ -123,6 +123,7 @@ export abstract class Merge extends BaseMultiCommitOperation {
             ? MultiCommitOperationKind.Squash
             : MultiCommitOperationKind.Merge
         }
+        branchSortOrder={this.props.branchSortOrder}
         onDismissed={this.onFlowEnded}
       />
     )

app/src/ui/multi-commit-operation/multi-commit-operation.tsx

@@ -29,6 +29,7 @@ export class MultiCommitOperation extends React.Component<IMultiCommitOperationP
             askForConfirmationOnForcePush={
               this.props.askForConfirmationOnForcePush
             }
+            branchSortOrder={this.props.branchSortOrder}
             accounts={this.props.accounts}
             cachedRepoRulesets={this.props.cachedRepoRulesets}
             openFileInExternalEditor={this.props.openFileInExternalEditor}
@@ -48,6 +49,7 @@ export class MultiCommitOperation extends React.Component<IMultiCommitOperationP
             askForConfirmationOnForcePush={
               this.props.askForConfirmationOnForcePush
             }
+            branchSortOrder={this.props.branchSortOrder}
             accounts={this.props.accounts}
             cachedRepoRulesets={this.props.cachedRepoRulesets}
             openFileInExternalEditor={this.props.openFileInExternalEditor}
@@ -67,6 +69,7 @@ export class MultiCommitOperation extends React.Component<IMultiCommitOperationP
             askForConfirmationOnForcePush={
               this.props.askForConfirmationOnForcePush
             }
+            branchSortOrder={this.props.branchSortOrder}
             accounts={this.props.accounts}
             cachedRepoRulesets={this.props.cachedRepoRulesets}
             openFileInExternalEditor={this.props.openFileInExternalEditor}

app/src/ui/multi-commit-operation/rebase.tsx

@@ -63,6 +63,7 @@ export abstract class Rebase extends BaseRebase {
         currentBranch={currentBranch}
         initialBranch={initialBranch}
         operation={MultiCommitOperationKind.Rebase}
+        branchSortOrder={this.props.branchSortOrder}
         onDismissed={this.onFlowEnded}
       />
     )