From 1faac23ee894ef59fa4f089eca81c7a7dd1681b2 Mon Sep 17 00:00:00 2001
From: Yaya-Cout <67095734+Yaya-Cout@users.noreply.github.com>
Date: Tue, 25 Jan 2022 20:17:07 +0100
Subject: [PATCH] [apps/settings] Fix assert in about submenu when username
 enabled (#134)

---
 apps/settings/sub_menu/about_controller.cpp | 1 -
 apps/settings/sub_menu/about_controller.h   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/settings/sub_menu/about_controller.cpp b/apps/settings/sub_menu/about_controller.cpp
index 73316f2b6..901034a51 100644
--- a/apps/settings/sub_menu/about_controller.cpp
+++ b/apps/settings/sub_menu/about_controller.cpp
@@ -168,7 +168,6 @@ bool AboutController::hasUsernameCell() const {
 void AboutController::willDisplayCellForIndex(HighlightCell * cell, int index) {
   int i = index + (!hasUsernameCell());
   GenericSubController::willDisplayCellForIndex(cell, i);
-  assert(index >= 0 && index < k_totalNumberOfCell);
   if (m_messageTreeModel->childAtIndex(i)->label() == I18n::Message::Contributors) {
     MessageTableCellWithChevronAndMessage * myTextCell = (MessageTableCellWithChevronAndMessage *)cell;
     myTextCell->setSubtitle(I18n::Message::Default);
diff --git a/apps/settings/sub_menu/about_controller.h b/apps/settings/sub_menu/about_controller.h
index 9a92b70f9..f72017af0 100644
--- a/apps/settings/sub_menu/about_controller.h
+++ b/apps/settings/sub_menu/about_controller.h
@@ -22,7 +22,7 @@ public:
   int typeAtLocation(int i, int j) override;
   int numberOfRows() const override;
 private:
-  constexpr static int k_totalNumberOfCell = 9;
+  constexpr static int k_totalNumberOfCell = 8;
   bool hasUsernameCell() const;
   ContributorsController m_contributorsController;
   MessageTableCellWithChevronAndMessage m_contributorsCell;