From 5617aa3fe7b93db44e788e7ff7b79ae40ef6228b Mon Sep 17 00:00:00 2001
From: Jakub Kosmydel <104823336+kosmydel@users.noreply.github.com>
Date: Thu, 4 Jan 2024 12:53:29 +0100
Subject: [PATCH 1/3] fix back button

---
 src/components/HeaderWithBackButton/types.ts | 3 ---
 src/pages/workspace/WorkspacesListPage.js    | 5 ++---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/components/HeaderWithBackButton/types.ts b/src/components/HeaderWithBackButton/types.ts
index 092b4df14082..9ffb0b5ef2f3 100644
--- 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/pages/workspace/WorkspacesListPage.js b/src/pages/workspace/WorkspacesListPage.js
index 519cd741623c..9b9f7680e68f 100755
--- 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')}

From acba1233306ed09217c15a309029190e0ff83902 Mon Sep 17 00:00:00 2001
From: Jakub Kosmydel <104823336+kosmydel@users.noreply.github.com>
Date: Thu, 4 Jan 2024 13:06:13 +0100
Subject: [PATCH 2/3] fix wrench icon on native

---
 assets/images/wrench.svg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/images/wrench.svg b/assets/images/wrench.svg
index 7bfc3eaed0a7..afa826ab10ba 100644
--- a/assets/images/wrench.svg
+++ b/assets/images/wrench.svg
@@ -1,4 +1,4 @@
-<svg width="26" height="26" viewBox="0 0 26 26" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="26" height="26" viewBox="0 0 26 26" xmlns="http://www.w3.org/2000/svg">
 <g id="Wrench" clip-path="url(#clip0_931_152974)">
 <path id="Shape" fill-rule="evenodd" clip-rule="evenodd" d="M25.1669 8C25.1669 12.1421 21.809 15.5 17.6669 15.5C17.1701 15.5 16.6846 15.4517 16.2148 15.3595C15.7623 15.2708 15.2846 15.3822 14.9586 15.7083L7.04188 23.625C5.66117 25.0057 3.4226 25.0057 2.04188 23.625C0.661171 22.2443 0.661169 20.0057 2.04188 18.625L9.95858 10.7083C10.2846 10.3822 10.3961 9.90462 10.3074 9.45212C10.2152 8.98233 10.1669 8.4968 10.1669 8C10.1669 3.85786 13.5247 0.5 17.6669 0.5C18.4483 0.5 19.2018 0.619501 19.9101 0.841225C20.327 0.97174 20.424 1.49292 20.115 1.80185L15.7919 6.125L16.4169 9.25L19.5419 9.875L23.865 5.55185C24.174 5.24292 24.6951 5.33985 24.8257 5.75678C25.0474 6.46509 25.1669 7.21859 25.1669 8ZM5.79188 21.125C5.79188 21.8154 5.23224 22.375 4.54188 22.375C3.85153 22.375 3.29188 21.8154 3.29188 21.125C3.29188 20.4346 3.85153 19.875 4.54188 19.875C5.23224 19.875 5.79188 20.4346 5.79188 21.125Z"/>
 </g>

From ebde63f2e550834dbb3cb70580b4f17d312bb624 Mon Sep 17 00:00:00 2001
From: Jakub Kosmydel <104823336+kosmydel@users.noreply.github.com>
Date: Thu, 4 Jan 2024 13:11:45 +0100
Subject: [PATCH 3/3] fix types

---
 src/components/MenuItem.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/MenuItem.tsx b/src/components/MenuItem.tsx
index 2db1b8d6bb3b..473ee94bd9a0 100644
--- 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(