fixup! chore(core/eckhart): make paginate buttons equally sized

Author: bieleluk

core/embed/rust/src/ui/layout_eckhart/firmware/action_bar.rs

@@ -137,22 +137,7 @@ impl ActionBar {
     /// mode can only return `ActionBarMsg::Prev` and `ActionBarMsg::Next`
     /// messages.
     pub fn new_paginate_only() -> Self {
-        Self::new(
-            Mode::PaginateOnly,
-            Some(
-                Button::with_icon(theme::ICON_CHEVRON_UP)
-                    .with_expanded_touch_area(Self::BUTTON_EXPAND_TOUCH)
-                    .with_content_offset(Self::BUTTON_CONTENT_OFFSET)
-                    .initially_enabled(false),
-            ),
-            Some(
-                Button::with_icon(theme::ICON_CHEVRON_DOWN)
-                    .with_expanded_touch_area(Self::BUTTON_EXPAND_TOUCH)
-                    .with_content_offset(Self::BUTTON_CONTENT_OFFSET.neg())
-                    .initially_enabled(false),
-            ),
-            None,
-        )
+        Self::new(Mode::PaginateOnly, None, None, None)
     }
 
     pub fn new_text_only(text: TString<'static>) -> Self {
@@ -196,9 +181,33 @@ impl ActionBar {
         let new_is_last = new_pager.is_last();
         let old_is_first = self.pager.is_first();
         let new_is_first = new_pager.is_first();
+        let old_is_single = self.pager.is_single();
+        let new_is_single = new_pager.is_single();
 
         self.pager = new_pager;
-        if (old_is_last != new_is_last) || (new_is_first != old_is_first) {
+        if self.mode == Mode::PaginateOnly {
+            if new_is_single && !old_is_single {
+                // On single page, disable first/last buttons
+                self.left_button = None;
+                self.right_button = None;
+                self.place_buttons(self.area);
+            } else if !new_is_single && old_is_single {
+                // On multiple pages, enable grayed-out first/last buttons
+                self.left_button = Some(
+                    Button::with_icon(theme::ICON_CHEVRON_UP)
+                        .with_expanded_touch_area(Self::BUTTON_EXPAND_TOUCH)
+                        .with_content_offset(Self::BUTTON_CONTENT_OFFSET)
+                        .initially_enabled(false),
+                );
+                self.right_button = Some(
+                    Button::with_icon(theme::ICON_CHEVRON_DOWN)
+                        .with_expanded_touch_area(Self::BUTTON_EXPAND_TOUCH)
+                        .with_content_offset(Self::BUTTON_CONTENT_OFFSET.neg())
+                        .initially_enabled(false),
+                );
+                self.place_buttons(self.area);
+            }
+        } else if (old_is_last != new_is_last) || (new_is_first != old_is_first) {
             self.place_buttons(self.area);
         }
     }
@@ -351,10 +360,10 @@ impl ActionBar {
             Mode::PaginateOnly => {
                 // Equal-sized `next_button` and `prev_button`
                 let (left_area, _, right_area) = bounds.split_center(Self::SPACER_WIDTH);
-                self.left_button.place(left_area);
-                self.right_button.place(right_area);
                 self.prev_button.place(left_area);
                 self.next_button.place(right_area);
+                self.left_button.place(left_area);
+                self.right_button.place(right_area);
             }
         }
     }
@@ -469,7 +478,7 @@ impl Component for ActionBar {
             Mode::Single => !self.pager.is_first(),
             Mode::Double { .. } => true,
             Mode::Timeout => false,
-            Mode::PaginateOnly => true,
+            Mode::PaginateOnly => !self.pager.is_single(),
         };
         if show_divider {
             let pos_divider = self.prev_button.area().right_center();

core/embed/rust/src/ui/layout_eckhart/theme/firmware.rs

@@ -193,7 +193,7 @@ pub const fn button_default() -> ButtonStyleSheet {
         },
         disabled: &ButtonStyle {
             font: fonts::FONT_SATOSHI_MEDIUM_26,
-            text_color: GREY_EXTRA_DARK,
+            text_color: GREY,
             button_color: BG,
             icon_color: GREY_EXTRA_DARK,
         },