Some renaming

src/components/WhoCanReply.tsx

@@ -65,14 +65,11 @@ export function WhoCanReply({post, isThreadAuthor, style}: WhoCanReplyProps) {
   }
 
   const isEverybody = settings.length === 0
-  const isNobody = !!settings.find(gate => gate.type === 'nobody')
   const description = isEverybody
-    ? _(msg`Everybody can reply`)
+    ? _(msg`Anyone can interact`)
-    : isNobody
+    : _(msg`Interaction limited`)
-    ? _(msg`Replies disabled`)
-    : _(msg`Some people can reply`)
 
-  const onPressEdit = () => {
+  const onPress = () => {
     if (isNative && Keyboard.isVisible()) {
       Keyboard.dismiss()
     }
@@ -129,7 +126,7 @@ export function WhoCanReply({post, isThreadAuthor, style}: WhoCanReplyProps) {
         label={
           isThreadAuthor ? _(msg`Edit who can reply`) : _(msg`Who can reply`)
         }
-        onPress={isThreadAuthor ? onPressEdit : infoDialogControl.open}
+        onPress={onPress}
         hitSlop={HITSLOP_10}>
         {({hovered}) => (
           <View style={[a.flex_row, a.align_center, a.gap_xs, style]}>
@@ -147,22 +144,25 @@ export function WhoCanReply({post, isThreadAuthor, style}: WhoCanReplyProps) {
               ]}>
               {description}
             </Text>
+
             {isThreadAuthor && (
               <PencilLine width={12} fill={t.palette.primary_500} />
             )}
           </View>
         )}
       </Button>
-      <WhoCanReplyDialog
+
-        control={infoDialogControl}
+      {isThreadAuthor ? (
-        post={post}
-        settings={settings}
-      />
-      {isThreadAuthor && (
         <ThreadgateEditorDialog
           control={editDialogControl}
-          threadgate={settings}
+          threadgateUISettings={settings}
-          onConfirm={onEditConfirm}
+          onConfirmThreadgateUISettings={onEditConfirm}
+        />
+      ) : (
+        <WhoCanReplyDialog
+          control={infoDialogControl}
+          post={post}
+          settings={settings}
         />
       )}
     </>

src/components/dialogs/ThreadgateEditor.tsx

@@ -12,56 +12,53 @@ import * as Dialog from '#/components/Dialog'
 import {Check_Stroke2_Corner0_Rounded as Check} from '#/components/icons/Check'
 import {Text} from '#/components/Typography'
 
-interface ThreadgateEditorDialogProps {
+type Props = {
-  control: Dialog.DialogControlProps
+  threadgateUISettings: ThreadgateAllowUISetting[]
-  threadgate: ThreadgateAllowUISetting[]
+  onChangeThreadgateUISettings?: (v: ThreadgateAllowUISetting[]) => void
-  onChange?: (v: ThreadgateAllowUISetting[]) => void
+  onConfirmThreadgateUISettings?: (v: ThreadgateAllowUISetting[]) => void
-  onConfirm?: (v: ThreadgateAllowUISetting[]) => void
 }
 
 export function ThreadgateEditorDialog({
   control,
-  threadgate,
+  onChangeThreadgateUISettings,
-  onChange,
+  onConfirmThreadgateUISettings,
-  onConfirm,
+  threadgateUISettings,
-}: ThreadgateEditorDialogProps) {
+}: Props & {
+  control: Dialog.DialogControlProps
+}) {
   return (
     <Dialog.Outer control={control}>
       <Dialog.Handle />
       <DialogContent
-        seedThreadgate={threadgate}
+        onChangeThreadgateUISettings={onChangeThreadgateUISettings}
-        onChange={onChange}
+        onConfirmThreadgateUISettings={onConfirmThreadgateUISettings}
-        onConfirm={onConfirm}
+        threadgateUISettings={threadgateUISettings}
       />
     </Dialog.Outer>
   )
 }
 
 function DialogContent({
-  seedThreadgate,
+  onChangeThreadgateUISettings,
-  onChange,
+  onConfirmThreadgateUISettings,
-  onConfirm,
+  threadgateUISettings,
-}: {
+}: Props) {
-  seedThreadgate: ThreadgateAllowUISetting[]
-  onChange?: (v: ThreadgateAllowUISetting[]) => void
-  onConfirm?: (v: ThreadgateAllowUISetting[]) => void
-}) {
   const {_} = useLingui()
   const control = Dialog.useDialogContext()
   const {data: lists} = useMyListsQuery('curate')
-  const [draft, setDraft] = React.useState(seedThreadgate)
+  const [draft, setDraft] = React.useState(threadgateUISettings)
 
-  const [prevSeedThreadgate, setPrevSeedThreadgate] =
+  const [prevThreadgateUISettings, setPrevThreadgateUISettings] =
-    React.useState(seedThreadgate)
+    React.useState(threadgateUISettings)
-  if (seedThreadgate !== prevSeedThreadgate) {
+  if (threadgateUISettings !== prevThreadgateUISettings) {
     // New data flowed from above (e.g. due to update coming through).
-    setPrevSeedThreadgate(seedThreadgate)
+    setPrevThreadgateUISettings(threadgateUISettings)
-    setDraft(seedThreadgate) // Reset draft.
+    setDraft(threadgateUISettings) // Reset draft.
   }
 
   function updateThreadgate(nextThreadgate: ThreadgateAllowUISetting[]) {
     setDraft(nextThreadgate)
-    onChange?.(nextThreadgate)
+    onChangeThreadgateUISettings?.(nextThreadgate)
   }
 
   const onPressEverybody = () => {
@@ -87,7 +84,7 @@ function DialogContent({
     updateThreadgate(newSelected)
   }
 
-  const doneLabel = onConfirm ? _(msg`Save`) : _(msg`Done`)
+  const doneLabel = onConfirmThreadgateUISettings ? _(msg`Save`) : _(msg`Done`)
   return (
     <Dialog.ScrollableInner
       label={_(msg`Choose who can reply`)}
@@ -148,7 +145,7 @@ function DialogContent({
         label={doneLabel}
         onPress={() => {
           control.close()
-          onConfirm?.(draft)
+          onConfirmThreadgateUISettings?.(draft)
         }}
         onAccessibilityEscape={control.close}
         color="primary"

src/state/queries/postgate/index.ts

@@ -217,7 +217,6 @@ export function useToggleQuotepostEnabledMutation() {
       action: 'enable' | 'disable'
     }) => {
       await upsertPostgate({agent, postUri: postUri}, async prev => {
-        console.log({action})
         if (prev) {
           if (action === 'disable') {
             return mergePostgateRecords(prev, {

src/view/com/composer/threadgate/ThreadgateBtn.tsx

@@ -67,8 +67,8 @@ export function ThreadgateBtn({
       </Animated.View>
       <ThreadgateEditorDialog
         control={control}
-        threadgate={threadgate}
+        threadgateUISettings={threadgate}
-        onChange={onChange}
+        onChangeThreadgateUISettings={onChange}
       />
     </>
   )