Merge branch 'ideal-nav-merge' into @kosmydel/ideal-nav-small-fixes

Expensify · Jan 4, 2024 · b3fd73e · b3fd73e
2 parents ebde63f + f81f7f2
commit b3fd73e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/assets/images/wrench.svg b/assets/images/wrench.svg
diff --git a/src/pages/home/sidebar/AllSettingsScreen.js b/src/pages/home/sidebar/AllSettingsScreen.js
@@ -89,7 +89,7 @@ function AllSettingsScreen() {
  }
  })}
  shouldBlockSelection={Boolean(item.link)}
- focused={activeRoute && activeRoute.startsWith(item.routeName)}
+ focused={activeRoute && item.routeName && activeRoute.toLowerCase().replaceAll('_', '') === item.routeName.replaceAll('/', '')}
  isPaneMenu
  />
  );