Merge pull request #20 from software-mansion-labs/@kosmydel/ideal-nav…

…-small-fixes fix back button
Expensify · Jan 4, 2024 · bf89a11 · bf89a11
2 parents f81f7f2 + b3fd73e
commit bf89a11
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/src/components/HeaderWithBackButton/types.ts b/src/components/HeaderWithBackButton/types.ts
@@ -108,9 +108,6 @@ type HeaderWithBackButtonProps = Partial<ChildrenProps> & {
 
     /** Whether we should enable detail page navigation */
     shouldEnableDetailPageNavigation?: boolean;
-
-    /** TEMP: Will be removed in my other PR */
-    shouldUseCentralPaneView: boolean;
 };
 
 export default HeaderWithBackButtonProps;
diff --git a/src/components/MenuItem.tsx b/src/components/MenuItem.tsx
@@ -234,7 +234,7 @@ type MenuItemProps = (ResponsiveProps | UnresponsiveProps) &
         contentFit?: ImageContentFit;
 
         /** Is this in the Pane */
-        isPaneMenu: false;
+        isPaneMenu?: false;
     };
 
 function MenuItem(

diff --git a/src/pages/workspace/WorkspacesListPage.js b/src/pages/workspace/WorkspacesListPage.js
@@ -298,7 +298,7 @@ function WorkspacesListPage({policies, allPolicyMembers, reimbursementAccount, c
                 onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS.ROOT)}
                 title={translate('common.workspaces')}
                 style={!isSmallScreenWidth && styles.alignItemsCenter}
-                shouldUseCentralPaneView
+                shouldShowBackButton={isSmallScreenWidth}
                 footer={
                     isSmallScreenWidth && (
                         <Button
@@ -336,8 +336,7 @@ function WorkspacesListPage({policies, allPolicyMembers, reimbursementAccount, c
             <View style={{flex: 1}}>
                 <HeaderWithBackButton
                     title={translate('common.workspaces')}
-                    shouldShowBorderBottom
-                    shouldUseCentralPaneView
+                    shouldShowBackButton={isSmallScreenWidth}
                 >
                     <Button
                         accessibilityLabel={translate('workspace.new.newWorkspace')}