From 3016a6c2b6a7d8883519e12073ad0eeed6b22ac4 Mon Sep 17 00:00:00 2001
From: Krishna Gupta <belivethatkg@gmail.com>
Date: Sat, 22 Jun 2024 23:05:27 +0530
Subject: [PATCH 1/2] fix: Workspaces - Workspaces title is shown in two lines.

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>
---
 src/pages/workspace/WorkspacesListPage.tsx | 29 +++++++++++-----------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/pages/workspace/WorkspacesListPage.tsx b/src/pages/workspace/WorkspacesListPage.tsx
index 6c7f23595ca9..7624fe7e0aae 100755
--- a/src/pages/workspace/WorkspacesListPage.tsx
+++ b/src/pages/workspace/WorkspacesListPage.tsx
@@ -354,6 +354,17 @@ function WorkspacesListPage({policies, reimbursementAccount, reports, session}:
             .sort((a, b) => localeCompare(a.title, b.title));
     }, [reimbursementAccount?.errors, policies, isOffline, theme.textLight, policyRooms]);
 
+    const getHeaderButton = () => (
+        <Button
+            accessibilityLabel={translate('workspace.new.newWorkspace')}
+            success
+            medium
+            text={translate('workspace.new.newWorkspace')}
+            onPress={() => interceptAnonymousUser(() => App.createWorkspaceWithPolicyDraftAndNavigateToIt())}
+            style={[isSmallScreenWidth && styles.flexGrow1, isSmallScreenWidth && styles.mb3]}
+        />
+    );
+
     if (isEmptyObject(workspaces)) {
         return (
             <ScreenWrapper
@@ -369,14 +380,9 @@ function WorkspacesListPage({policies, reimbursementAccount, reports, session}:
                     onBackButtonPress={() => Navigation.goBack()}
                     icon={Illustrations.BigRocket}
                 >
-                    <Button
-                        accessibilityLabel={translate('workspace.new.newWorkspace')}
-                        success
-                        medium
-                        text={translate('workspace.new.newWorkspace')}
-                        onPress={() => interceptAnonymousUser(() => App.createWorkspaceWithPolicyDraftAndNavigateToIt())}
-                    />
+                    {!isSmallScreenWidth && getHeaderButton()}
                 </HeaderWithBackButton>
+                {isSmallScreenWidth && <View style={[styles.pl5, styles.pr5]}>{getHeaderButton()}</View>}
                 <ScrollView contentContainerStyle={styles.pt3}>
                     <View style={[styles.flex1, isLessThanMediumScreen ? styles.workspaceSectionMobile : styles.workspaceSection]}>
                         <FeatureList
@@ -410,14 +416,9 @@ function WorkspacesListPage({policies, reimbursementAccount, reports, session}:
                     onBackButtonPress={() => Navigation.goBack()}
                     icon={Illustrations.BigRocket}
                 >
-                    <Button
-                        accessibilityLabel={translate('workspace.new.newWorkspace')}
-                        success
-                        medium
-                        text={translate('workspace.new.newWorkspace')}
-                        onPress={() => interceptAnonymousUser(() => App.createWorkspaceWithPolicyDraftAndNavigateToIt())}
-                    />
+                    {!isSmallScreenWidth && getHeaderButton()}
                 </HeaderWithBackButton>
+                {isSmallScreenWidth && <View style={[styles.pl5, styles.pr5]}>{getHeaderButton()}</View>}
                 <FlatList
                     data={workspaces}
                     renderItem={getMenuItem}

From 95ee7de17daf6047519706efc343baed3723777f Mon Sep 17 00:00:00 2001
From: Krishna Gupta <belivethatkg@gmail.com>
Date: Tue, 25 Jun 2024 15:54:08 +0530
Subject: [PATCH 2/2] add + icon for new workspace button.

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>
---
 src/pages/workspace/WorkspacesListPage.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/workspace/WorkspacesListPage.tsx b/src/pages/workspace/WorkspacesListPage.tsx
index 7624fe7e0aae..53db6c4a347a 100755
--- a/src/pages/workspace/WorkspacesListPage.tsx
+++ b/src/pages/workspace/WorkspacesListPage.tsx
@@ -361,6 +361,7 @@ function WorkspacesListPage({policies, reimbursementAccount, reports, session}:
             medium
             text={translate('workspace.new.newWorkspace')}
             onPress={() => interceptAnonymousUser(() => App.createWorkspaceWithPolicyDraftAndNavigateToIt())}
+            icon={Expensicons.Plus}
             style={[isSmallScreenWidth && styles.flexGrow1, isSmallScreenWidth && styles.mb3]}
         />
     );