@@ -686,8 +686,7 @@ impl Status {
686
686
strings:: commands:: select_staging ( & self . key_config ) ,
687
687
!focus_on_diff,
688
688
( self . visible
689
- && !focus_on_diff
690
- && self . focus == Focus :: WorkDir )
689
+ && !focus_on_diff && self . focus == Focus :: WorkDir )
691
690
|| force_all,
692
691
)
693
692
. order ( strings:: order:: NAV ) ,
@@ -697,8 +696,7 @@ impl Status {
697
696
strings:: commands:: select_unstaged ( & self . key_config ) ,
698
697
!focus_on_diff,
699
698
( self . visible
700
- && !focus_on_diff
701
- && self . focus == Focus :: Stage )
699
+ && !focus_on_diff && self . focus == Focus :: Stage )
702
700
|| force_all,
703
701
)
704
702
. order ( strings:: order:: NAV ) ,
@@ -736,17 +734,6 @@ impl Component for Status {
736
734
. order ( -1 ) ,
737
735
) ;
738
736
739
- out. push (
740
- CommandInfo :: new (
741
- strings:: commands:: conventional_commit_open (
742
- & self . key_config ,
743
- ) ,
744
- true ,
745
- self . can_commit ( ) || force_all,
746
- )
747
- . order ( -1 ) ,
748
- ) ;
749
-
750
737
out. push ( CommandInfo :: new (
751
738
strings:: commands:: open_branch_select_popup (
752
739
& self . key_config ,
@@ -815,6 +802,14 @@ impl Component for Status {
815
802
true ,
816
803
true ,
817
804
) ) ;
805
+
806
+ out. push ( CommandInfo :: new (
807
+ strings:: commands:: conventional_commit_open (
808
+ & self . key_config ,
809
+ ) ,
810
+ true ,
811
+ self . can_commit ( ) || force_all,
812
+ ) ) ;
818
813
}
819
814
820
815
self . commands_nav ( out, force_all) ;
0 commit comments