From 936f24b0776f2ead097b245462dfdd981daaab4b Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Tue, 2 Jul 2024 12:35:15 +0800
Subject: [PATCH 1/2] fix ws list item name doesn't show

---
 src/pages/workspace/WorkspacesListRow.tsx | 2 +-
 src/styles/index.ts                       | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/pages/workspace/WorkspacesListRow.tsx b/src/pages/workspace/WorkspacesListRow.tsx
index 5a2462a45cf9..52216ceb01fe 100644
--- a/src/pages/workspace/WorkspacesListRow.tsx
+++ b/src/pages/workspace/WorkspacesListRow.tsx
@@ -144,7 +144,7 @@ function WorkspacesListRow({
     const ThreeDotMenuOrPendingIcon = (
         <View style={[styles.flexRow]}>
             {isJoinRequestPending && (
-                <View style={[styles.flexRow, styles.gap2, styles.alignItemsCenter, styles.flex1, styles.justifyContentEnd, isNarrow && styles.workspaceListBadge]}>
+                <View style={[styles.flexRow, styles.gap2, styles.alignItemsCenter, styles.justifyContentEnd]}>
                     <Badge
                         text={translate('workspace.common.requested')}
                         textStyles={styles.textStrong}
diff --git a/src/styles/index.ts b/src/styles/index.ts
index f021a11c4ccc..f59f49770824 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -3362,12 +3362,6 @@ const styles = (theme: ThemeColors) =>
             marginLeft: 84,
         },
 
-        workspaceListBadge: {
-            flexDirection: 'column',
-            justifyContent: 'flex-start',
-            marginTop: 6,
-        },
-
         workspaceListRBR: {
             flexDirection: 'column',
             justifyContent: 'flex-start',

From 94167e56ce1eae6cac812436c5cd6802d1d366aa Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Tue, 2 Jul 2024 12:35:39 +0800
Subject: [PATCH 2/2] fix alignment

---
 src/pages/workspace/WorkspacesListRow.tsx | 4 ++--
 src/styles/index.ts                       | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pages/workspace/WorkspacesListRow.tsx b/src/pages/workspace/WorkspacesListRow.tsx
index 52216ceb01fe..98276fbff4b3 100644
--- a/src/pages/workspace/WorkspacesListRow.tsx
+++ b/src/pages/workspace/WorkspacesListRow.tsx
@@ -142,7 +142,7 @@ function WorkspacesListRow({
     const isDeleted = style && Array.isArray(style) ? style.includes(styles.offlineFeedback.deleted) : false;
 
     const ThreeDotMenuOrPendingIcon = (
-        <View style={[styles.flexRow]}>
+        <View style={[styles.flexRow, !isSmallScreenWidth && styles.workspaceThreeDotMenu]}>
             {isJoinRequestPending && (
                 <View style={[styles.flexRow, styles.gap2, styles.alignItemsCenter, styles.justifyContentEnd]}>
                     <Badge
@@ -154,7 +154,7 @@ function WorkspacesListRow({
                 </View>
             )}
             {!isJoinRequestPending && (
-                <View style={[styles.flexRow, styles.ml2, styles.gap1, !isSmallScreenWidth && styles.workspaceThreeDotMenu]}>
+                <View style={[styles.flexRow, styles.ml2, styles.gap1]}>
                     <View style={[styles.flexRow, styles.gap2, styles.alignItemsCenter, isNarrow && styles.workspaceListRBR]}>
                         <BrickRoadIndicatorIcon brickRoadIndicator={brickRoadIndicator} />
                     </View>
diff --git a/src/styles/index.ts b/src/styles/index.ts
index f59f49770824..6e2f95780941 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -3359,7 +3359,8 @@ const styles = (theme: ThemeColors) =>
         },
 
         workspaceThreeDotMenu: {
-            marginLeft: 84,
+            justifyContent: 'flex-end',
+            width: 124,
         },
 
         workspaceListRBR: {