Merge branch 'bluesky-social:main' into main

.eslintrc.js

@@ -93,6 +93,7 @@ module.exports = {
         ],
       },
     ],
+    '@typescript-eslint/ban-ts-comment': 'warn',
   },
   ignorePatterns: [
     '**/__mocks__/*.ts',

bskyweb/templates/base.html

@@ -8,7 +8,6 @@
     Preconnect to essential domains
   -->
   <link rel="preconnect" href="https://bsky.social">
-  <link rel="preconnect" href="https://bsky.network">
   <title>{%- block head_title -%}Bluesky{%- endblock -%}</title>
 
   <!-- Hello Humans! API docs at https://atproto.com -->

package.json

@@ -54,7 +54,7 @@
     "icons:optimize": "svgo -f ./assets/icons"
   },
   "dependencies": {
-    "@atproto/api": "^0.13.28",
+    "@atproto/api": "^0.13.31",
     "@bitdrift/react-native": "^0.6.2",
     "@braintree/sanitize-url": "^6.0.2",
     "@discord/bottom-sheet": "bluesky-social/react-native-bottom-sheet",

src/components/Link.tsx

@@ -79,8 +79,10 @@ export function useLink({
   onPress: outerOnPress,
   onLongPress: outerOnLongPress,
   shareOnLongPress,
+  overridePresentation,
 }: BaseLinkProps & {
   displayText: string
+  overridePresentation?: boolean
 }) {
   const navigation = useNavigationDeduped()
   const {href} = useLinkProps<AllNavigatorParams>({
@@ -116,7 +118,7 @@ export function useLink({
         })
       } else {
         if (isExternal) {
-          openLink(href)
+          openLink(href, overridePresentation)
         } else {
           const shouldOpenInNewTab = shouldClickOpenNewTab(e)
 
@@ -158,6 +160,7 @@ export function useLink({
       closeModal,
       action,
       navigation,
+      overridePresentation,
     ],
   )
 
@@ -254,12 +257,13 @@ export function Link({
 export type InlineLinkProps = React.PropsWithChildren<
   BaseLinkProps &
     TextStyleProp &
-    Pick<TextProps, 'selectable' | 'numberOfLines'>
-> &
-  Pick<ButtonProps, 'label' | 'accessibilityHint'> & {
-    disableUnderline?: boolean
-    title?: TextProps['title']
-  }
+    Pick<TextProps, 'selectable' | 'numberOfLines'> &
+    Pick<ButtonProps, 'label' | 'accessibilityHint'> & {
+      disableUnderline?: boolean
+      title?: TextProps['title']
+      overridePresentation?: boolean
+    }
+>
 
 export function InlineLinkText({
   children,
@@ -274,6 +278,7 @@ export function InlineLinkText({
   label,
   shareOnLongPress,
   disableUnderline,
+  overridePresentation,
   ...rest
 }: InlineLinkProps) {
   const t = useTheme()
@@ -286,6 +291,7 @@ export function InlineLinkText({
     onPress: outerOnPress,
     onLongPress: outerOnLongPress,
     shareOnLongPress,
+    overridePresentation,
   })
   const {
     state: hovered,

src/components/ReportDialog/SubmitView.tsx

@@ -16,6 +16,7 @@ import * as Dialog from '#/components/Dialog'
 import * as Toggle from '#/components/forms/Toggle'
 import {Check_Stroke2_Corner0_Rounded as Check} from '#/components/icons/Check'
 import {ChevronLeft_Stroke2_Corner0_Rounded as ChevronLeft} from '#/components/icons/Chevron'
+import {PaperPlane_Stroke2_Corner0_Rounded as SendIcon} from '#/components/icons/PaperPlane'
 import {Loader} from '#/components/Loader'
 import {Text} from '#/components/Typography'
 import {ReportDialogProps} from './types'
@@ -223,7 +224,7 @@ export function SubmitView({
           <ButtonText>
             <Trans>Send report</Trans>
           </ButtonText>
-          {submitting && <ButtonIcon icon={Loader} />}
+          <ButtonIcon icon={submitting ? Loader : SendIcon} />
         </Button>
       </View>
       {/* Maybe fix this later -h */}

src/components/dms/ConvoMenu.tsx

@@ -227,6 +227,7 @@ let ConvoMenu = ({
       />
       {latestReportableMessage ? (
         <ReportDialog
+          currentScreen={currentScreen}
           params={{
             type: 'convoMessage',
             convoId: convo.id,

src/components/dms/LeaveConvoPrompt.tsx

@@ -1,6 +1,6 @@
 import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
-import {useNavigation} from '@react-navigation/native'
+import {StackActions, useNavigation} from '@react-navigation/native'
 
 import {NavigationProp} from '#/lib/routes/types'
 import {isNative} from '#/platform/detection'
@@ -22,15 +22,10 @@ export function LeaveConvoPrompt({
   const navigation = useNavigation<NavigationProp>()
 
   const {mutate: leaveConvo} = useLeaveConvo(convoId, {
-    onSuccess: () => {
+    onMutate: () => {
       if (currentScreen === 'conversation') {
-        navigation.replace(
-          'Messages',
-          isNative
-            ? {
-                animation: 'pop',
-              }
-            : {},
+        navigation.dispatch(
+          StackActions.replace('Messages', isNative ? {animation: 'pop'} : {}),
         )
       }
     },

src/components/dms/MessageMenu.tsx

@@ -138,6 +138,7 @@ export let MessageMenu = ({
       </Menu.Root>
 
       <ReportDialog
+        currentScreen="conversation"
         params={{type: 'convoMessage', convoId: convo.convo.id, message}}
         control={reportControl}
       />