Merge branch 'main' into release

package.json

@@ -88,7 +88,7 @@
     "react-native-swipe-list-view": "^3.2.9",
     "react-native-tab-view": "^3.5.1",
     "rn-placeholder": "^3.0.3",
-    "zeego": "^1.6.0"
+    "zeego": "^1.6.1"
   },
   "devDependencies": {
     "@babel/core": "^7.21.8",

src/components/Timeline/Shared/Actioned.tsx

@@ -35,7 +35,7 @@ const TimelineActioned: React.FC<Props> = ({ action, isNotification, ...rest })
       content={content}
       emojis={account.emojis}
       size='S'
-      style={{ color: action === 'admin.report' ? colors.red : colors.primaryDefault }}
+      style={{ flex: 1, color: action === 'admin.report' ? colors.red : colors.primaryDefault }}
     />
   )
 

src/i18n/vi/components/contextMenu.json

@@ -4,7 +4,7 @@
     "title": "Hành động người dùng",
     "following": {
       "action_false": "Theo dõi người này",
-      "action_true": "Ngưng theo dõi người này"
+      "action_true": "Bỏ theo dõi người này"
     },
     "inLists": "Danh sách người ...",
     "showBoosts": {
@@ -57,7 +57,7 @@
   "hashtag": {
     "follow": {
       "action_false": "Theo dõi",
-      "action_true": "Ngưng theo dõi"
+      "action_true": "Bỏ theo dõi"
     },
     "filter": {
       "action": "Lọc hashtag..."

src/i18n/vi/components/relationship.json

@@ -9,7 +9,7 @@
     "error": "Xảy ra lỗi khi tải",
     "blocked_by": "Đã chặn",
     "blocking": "Bỏ chặn",
-    "following": "Ngưng theo dõi",
+    "following": "Bỏ theo dõi",
     "requested": "Yêu cầu theo dõi",
     "default": "Theo dõi"
   }

src/screens/Tabs/index.tsx

@@ -59,7 +59,7 @@ const ScreenTabs = () => {
             case 'Tab-Me':
               return (
                 <>
-                  <ContextMenu.Root onOpenChange={() => haptics('Light')}>
+                  <ContextMenu.Root>
                     <ContextMenu.Trigger>
                       <View
                         key={avatarStatic}
@@ -112,7 +112,6 @@ const ScreenTabs = () => {
                           onValueChange={async () => {
                             if (!account.active) {
                               await setAccount(account.key)
-                              haptics('Light')
                             }
                           }}
                         >
@@ -144,17 +143,7 @@ const ScreenTabs = () => {
         {() => null}
       </Tab.Screen>
       <Tab.Screen name='Tab-Notifications' component={TabNotifications} />
-      <Tab.Screen
-        name='Tab-Me'
-        component={TabMe}
-        // listeners={({ navigation }) => ({
-        //   tabLongPress: () => {
-        //     haptics('Light')
-        //     navigation.navigate('Tab-Me', { screen: 'Tab-Me-Root' })
-        //     navigation.navigate('Tab-Me', { screen: 'Tab-Me-Switch' })
-        //   }
-        // })}
-      />
+      <Tab.Screen name='Tab-Me' component={TabMe} />
     </Tab.Navigator>
   )
 }

yarn.lock

@@ -11327,7 +11327,7 @@ __metadata:
     react-native-tab-view: ^3.5.1
     rn-placeholder: ^3.0.3
     typescript: ^5.0.4
-    zeego: ^1.6.0
+    zeego: ^1.6.1
   languageName: unknown
   linkType: soft
 
@@ -12145,9 +12145,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"zeego@npm:^1.6.0":
-  version: 1.6.0
-  resolution: "zeego@npm:1.6.0"
+"zeego@npm:^1.6.1":
+  version: 1.6.1
+  resolution: "zeego@npm:1.6.1"
   dependencies:
     "@radix-ui/react-context-menu": ^2.0.1
     "@radix-ui/react-dropdown-menu": ^2.0.1
@@ -12157,6 +12157,6 @@ __metadata:
     react: "*"
     react-native: "*"
     react-native-ios-context-menu: ^1.15.1
-  checksum: c943a97135ba1eba7097eb671fe006b1b47c9d4a1ada05fbc18d8c00b48e2f74b41ae15181d9950c8011dc004041d402fcf6b35c6d0e2b86b6f564401c802826
+  checksum: 1244edd2f5257934c2e09a6f30cd30a90f2bd56d9c66c60df3950820b204fd0ae46010ec547b4c902696f4917985b649bcf19a679bebdcd0470032ec96ae0519
   languageName: node
   linkType: hard