Merge pull request #3974 from tloncorp/promote-10-1

ops: promote 6.4.0 (again)
tloncorp · Oct 1, 2024 · 4eeba6d · 4eeba6d
2 parents 09eb9cf + d1cfd43
commit 4eeba6d
Show file tree

Hide file tree

Showing 7 changed files with 137 additions and 113 deletions.
diff --git a/desk/app/chat.hoon b/desk/app/chat.hoon
@@ -1874,7 +1874,6 @@
   ::
   ++  di-take-counter
     |=  =diff:dm:c
-    ?<  =(%archive net.dm)
     ?<  (~(has in blocked) ship)
     (di-ingest-diff diff)
   ::

diff --git a/desk/app/grouper.hoon b/desk/app/grouper.hoon
@@ -172,7 +172,7 @@
         %shut
       ~?  dev-mode  ['inviting to private/secret' joiner.bite]
       =/  =action:groups
-        :-  [our.bowl token.bite]
+        :-  flag
         :-  now.bowl
         :-  %cordon
         [%shut [%add-ships %pending (~(gas in *(set ship)) ~[joiner.bite])]]

diff --git a/packages/app/features/top/useConnectionStatus.tsx b/packages/app/features/top/useConnectionStatus.tsx
@@ -1,17 +1,23 @@
 import * as api from '@tloncorp/shared/dist/api';
-import { debounce } from 'lodash';
 import { ConnectionStatus } from '@tloncorp/shared/dist/api';
+import { useCurrentUserId } from '@tloncorp/ui';
+import { debounce } from 'lodash';
 import { useEffect, useState } from 'react';
 
 export const useConnectionStatus = (contactId: string) => {
   const [connectionStatus, setConnectionStatus] =
     useState<ConnectionStatus | null>(null);
+  const currentUserId = useCurrentUserId();
 
   useEffect(() => {
-    api.checkConnectionStatus(
-      contactId,
-      debounce(setConnectionStatus, 500, { trailing: true })
-    );
-  }, [contactId]);
+    if (currentUserId === contactId) {
+      setConnectionStatus({ status: 'yes', complete: true });
+    } else {
+      api.checkConnectionStatus(
+        contactId,
+        debounce(setConnectionStatus, 500, { trailing: true })
+      );
+    }
+  }, [contactId, currentUserId]);
   return connectionStatus;
 };
diff --git a/packages/ui/src/components/ActionSheet.tsx b/packages/ui/src/components/ActionSheet.tsx
@@ -35,6 +35,7 @@ export type Action = {
   render?: (props: ActionRenderProps) => ReactElement;
   endIcon?: IconType | ReactElement;
   startIcon?: IconType | ReactElement;
+  accent?: Accent;
 };
 
 export type ActionRenderProps = {
@@ -296,16 +297,19 @@ const ActionSheetActionFrame = styled(ListItem, {
   variants: {
     type: {
       positive: {
+        backgroundColor: '$positiveBackground',
         pressStyle: {
           backgroundColor: '$positiveBackground',
         },
       },
       negative: {
+        backgroundColor: '$negativeBackground',
         pressStyle: {
           backgroundColor: '$negativeBackground',
         },
       },
       neutral: {},
+      disabled: {},
     },
   } as const,
 });
@@ -349,27 +353,33 @@ function ActionSheetAction({ action }: { action: Action }) {
     action.render({ action })
   ) : (
     <ActionSheetActionFrame
+      type={action.accent ?? (accent as Accent)}
       onPress={accent !== 'disabled' ? action.action : undefined}
     >
-      {action.startIcon && resolveIcon(action.startIcon)}
+      {action.startIcon &&
+        resolveIcon(action.startIcon, action.accent ?? accent)}
       <ListItem.MainContent>
-        <ActionSheet.ActionTitle>{action.title}</ActionSheet.ActionTitle>
+        <ActionSheet.ActionTitle accent={action.accent ?? accent}>
+          {action.title}
+        </ActionSheet.ActionTitle>
         {action.description && (
           <ActionSheet.ActionDescription>
             {action.description}
           </ActionSheet.ActionDescription>
         )}
       </ListItem.MainContent>
       {action.endIcon && (
-        <ListItem.EndContent>{resolveIcon(action.endIcon)}</ListItem.EndContent>
+        <ListItem.EndContent>
+          {resolveIcon(action.endIcon, action.accent ?? accent)}
+        </ListItem.EndContent>
       )}
     </ActionSheetActionFrame>
   );
 }
 
-function resolveIcon(icon: IconType | ReactElement) {
+function resolveIcon(icon: IconType | ReactElement, accent: Accent) {
   if (typeof icon === 'string') {
-    return <ActionSheetActionIcon type={icon} />;
+    return <ActionSheetActionIcon accent={accent} type={icon} />;
   }
   return icon;
 }
@@ -386,6 +396,9 @@ const ActionSheetActionIcon = styled(Icon, {
         color: '$negativeActionText',
       },
       neutral: {},
+      disabled: {
+        color: '$tertiaryText',
+      },
     },
   } as const,
 });

diff --git a/packages/ui/src/components/ChatList.tsx b/packages/ui/src/components/ChatList.tsx
@@ -8,20 +8,16 @@ import {
   useEffect,
   useLayoutEffect,
   useMemo,
-  useRef,
   useState,
 } from 'react';
 import React from 'react';
 import {
   LayoutChangeEvent,
-  NativeScrollEvent,
-  NativeSyntheticEvent,
   SectionList,
   SectionListData,
   SectionListRenderItemInfo,
   StyleProp,
   ViewStyle,
-  ViewToken,
 } from 'react-native';
 import Animated, {
   Easing,
@@ -55,7 +51,6 @@ function ChatListComponent({
   onLongPressItem,
   onPressItem,
   onPressMenuButton,
-  onSectionChange,
   activeTab,
   setActiveTab,
   showFilters,
@@ -126,35 +121,6 @@ function ChatListComponent({
     []
   );
 
-  const isAtTopRef = useRef(true);
-
-  const onViewableItemsChanged = useRef(
-    ({ viewableItems }: { viewableItems: ViewToken[] }) => {
-      if (viewableItems.length === 0) {
-        return;
-      }
-
-      if (!isAtTopRef.current) {
-        const { section } = viewableItems[0];
-        if (section) {
-          onSectionChange?.(section.title);
-        }
-      }
-    }
-  ).current;
-
-  const handleScroll = useRef(
-    (event: NativeSyntheticEvent<NativeScrollEvent>) => {
-      const atTop = event.nativeEvent.contentOffset.y === 0;
-      if (atTop !== isAtTopRef.current) {
-        isAtTopRef.current = atTop;
-        if (atTop) {
-          onSectionChange?.('Home');
-        }
-      }
-    }
-  ).current;
-
   const handlePressTryAll = useCallback(() => {
     setActiveTab('all');
   }, [setActiveTab]);
@@ -194,8 +160,6 @@ function ChatListComponent({
             waitForInteraction: false,
           }}
           renderSectionHeader={renderSectionHeader}
-          onViewableItemsChanged={onViewableItemsChanged}
-          onMomentumScrollEnd={activeTab === 'all' ? handleScroll : undefined}
         />
       )}
     </>