fix social-app patch

README.md

@@ -1,5 +1,6 @@
 # at
 
+- https://github.com/bluesky-social/atproto
 - https://github.com/bluesky-social/social-app
 
 |name|type|example|

icon.svg

@@ -1,32 +0,0 @@
-<svg
-   viewBox="0 0 2821.6379 794.29016"
-   preserveAspectRatio="xMidYMid"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <g
-     transform="matrix(0.1,0,0,-0.1,-282.80153,1445)"
-     fill="#000000"
-     stroke="none"
-     >
-    <path
-       d="m 24787,14443 c -4,-3 -7,-224 -7,-490 v -483 h 545 545 v 490 490 h -538 c -296,0 -542,-3 -545,-7 z"
-    />
-    <path
-       d="m 5190,13285 c -8,-3 -96,-12 -195,-20 -199,-16 -296,-32 -430,-70 -49,-14 -115,-32 -145,-40 -153,-39 -504,-198 -662,-301 -21,-13 -57,-36 -80,-51 -24,-16 -72,-50 -109,-78 -241,-182 -377,-315 -528,-517 -119,-158 -120,-160 -106,-188 23,-45 140,-140 560,-457 110,-84 319,-242 465,-353 146,-110 369,-279 495,-375 791,-600 723,-549 1049,-799 269,-207 398,-307 524,-403 l 114,-86 -49,-49 c -128,-131 -378,-258 -588,-299 -66,-13 -357,-13 -420,0 -115,23 -172,39 -202,54 -18,10 -37,17 -43,17 -24,0 -171,81 -255,141 -50,35 -146,121 -215,192 -69,70 -133,127 -142,127 -19,0 -153,-63 -177,-83 -9,-7 -54,-35 -101,-62 -47,-26 -110,-64 -140,-85 -30,-20 -97,-61 -148,-91 -51,-30 -107,-62 -124,-72 -18,-10 -57,-38 -87,-61 -70,-53 -252,-168 -446,-281 -82,-49 -158,-95 -168,-104 -16,-16 -14,-21 34,-106 165,-289 544,-666 867,-860 9,-6 35,-22 58,-37 36,-23 267,-138 349,-173 108,-47 160,-67 240,-93 150,-48 201,-62 228,-62 14,0 64,-9 109,-19 197,-46 302,-56 573,-56 197,1 281,5 345,17 47,9 110,19 141,22 31,3 75,13 99,21 23,8 56,15 72,15 17,0 51,7 77,15 25,8 80,24 121,36 41,12 125,41 185,66 61,25 124,50 140,56 17,7 89,42 160,78 113,58 177,98 395,246 82,56 273,232 403,371 127,136 237,271 237,291 0,12 -208,179 -425,342 -186,140 -1121,843 -1720,1294 -264,199 -589,444 -723,546 -134,101 -274,208 -312,237 -39,29 -70,58 -70,66 0,21 107,115 203,179 95,64 237,133 295,143 20,4 49,12 63,20 96,48 519,48 619,-1 14,-7 41,-16 60,-20 65,-13 262,-118 360,-191 99,-74 250,-230 372,-384 34,-44 70,-80 80,-80 9,0 39,15 67,33 28,17 70,44 94,58 23,15 121,76 217,136 96,60 254,156 350,213 96,56 272,160 390,230 118,70 230,135 248,144 41,21 41,45 -3,116 -18,30 -46,75 -61,100 -64,106 -252,348 -352,454 -106,112 -169,171 -293,274 -197,164 -310,235 -594,376 -215,106 -519,205 -735,240 -137,22 -574,51 -610,41 z"
-   />
-    <path
-       d="m 29095,12736 c -421,-44 -744,-157 -975,-342 -259,-207 -396,-446 -465,-809 -16,-84 -23,-301 -14,-425 36,-518 257,-859 694,-1070 166,-80 284,-116 716,-215 449,-103 514,-121 646,-186 218,-107 308,-253 306,-494 -2,-303 -188,-477 -588,-551 -140,-26 -640,-27 -825,-1 -275,38 -486,94 -776,203 -94,35 -174,64 -178,64 -3,0 -6,-175 -6,-389 v -388 l 88,-41 c 404,-187 905,-282 1486,-282 675,0 1154,150 1465,459 196,194 311,434 362,756 20,121 17,476 -5,600 -89,517 -358,800 -945,994 -130,43 -241,71 -616,156 -137,31 -299,73 -360,92 -331,106 -455,246 -455,511 1,249 127,412 387,501 272,92 801,76 1269,-39 116,-28 326,-96 432,-138 l 52,-22 -2,406 -3,406 -66,28 c -154,66 -413,140 -604,174 -279,49 -756,69 -1020,42 z"
-      />
-    <path
-       d="m 9630,12676 c 0,-2 403,-996 896,-2208 493,-1211 898,-2211 901,-2220 6,-21 -135,-386 -193,-499 -104,-202 -256,-324 -471,-380 -118,-30 -340,-43 -516,-29 -84,6 -185,17 -225,24 -40,7 -75,10 -77,7 -3,-2 -5,-163 -5,-357 v -353 l 63,-30 c 194,-93 493,-138 801,-120 414,23 683,115 937,319 174,140 357,402 474,680 26,62 1945,5159 1945,5167 0,2 -232,2 -516,1 l -517,-3 -556,-1550 c -485,-1350 -560,-1550 -578,-1553 -18,-3 -26,11 -62,105 -23,59 -295,758 -605,1553 l -562,1445 -567,3 c -312,1 -567,0 -567,-2 z"
-      />
-    <path
-       d="m 15690,10867 c 0,-1970 -1,-1936 56,-2153 128,-497 461,-787 1014,-885 147,-26 440,-36 605,-20 413,40 834,200 1181,447 35,25 73,44 88,44 14,0 26,-1 26,-3 0,-2 20,-94 45,-205 25,-111 45,-204 45,-207 0,-3 209,-5 465,-5 h 465 v 2400 2400 h -535 -535 l -2,-1866 -3,-1866 -115,-50 c -425,-185 -743,-252 -1088,-227 -302,21 -472,109 -562,293 -79,161 -74,11 -77,1969 l -3,1747 h -535 -535 z"
-      />
-    <path
-       d="m 24785,12668 c -3,-7 -4,-1086 -3,-2398 l 3,-2385 538,-3 537,-2 v 2400 2400 h -535 c -419,0 -537,-3 -540,-12 z"
-      />
-    <path
-       d="m 21660,8275 v -545 h 565 565 v 545 545 h -565 -565 z"
-      />
-  </g>
-</svg>

install.zsh

@@ -76,7 +76,6 @@ PATCH_FILES=(
 	"130-atproto-ozone-enable-daemon-v2.patch"
 	"200-feed-generator-custom.patch"
 	"210-bgs-since-empty-fix.patch"
-	"220-atproto-dockerfile-copy-services.patch"
 )
 
 function at-repos-clone() {
@@ -121,6 +120,10 @@ function at-repos-pull() {
 			cd ..
 		fi
 	done
+	# Copy feed-generator Dockerfile if missing (removed by git checkout)
+	if [ ! -f $d/repos/feed-generator/Dockerfile ] && [ -f $d/docker/feed/Dockerfile ];then
+		cp -rf $d/docker/feed/Dockerfile $d/repos/feed-generator/
+	fi
 	cd $d
 }
 
@@ -331,6 +334,41 @@ export const SOCIAL_APP_DOMAIN =\
 	}' lib/constants.ts 2>/dev/null || true
 	# Fix parseInt() to handle undefined by adding || ''
 	sediment "s/parseInt(env('\([^']*\)'))/parseInt(env('\1') || '0')/g" lib/constants.ts 2>/dev/null || true
+
+	# Add next-runtime-env to package.json if missing (used by lib/constants.ts)
+	if ! grep -q 'next-runtime-env' package.json 2>/dev/null; then
+		echo "📦 Adding next-runtime-env to package.json..."
+		python3 -c "
+import json
+with open('package.json') as f:
+    d = json.load(f)
+d.setdefault('dependencies', {})['next-runtime-env'] = '^1.6.2'
+with open('package.json', 'w') as f:
+    json.dump(d, f, indent=2)
+    f.write('\n')
+"
+		echo "✅ Added next-runtime-env"
+	fi
+
+	# Update @atproto/ozone in service/package.json to latest
+	echo "📦 Updating @atproto/ozone in service/package.json..."
+	local latest_ozone_ver
+	latest_ozone_ver=$(npm view @atproto/ozone version 2>/dev/null)
+	if [ -n "$latest_ozone_ver" ] && [ -f service/package.json ]; then
+		python3 -c "
+import json, sys
+ver = sys.argv[1]
+with open('service/package.json') as f:
+    d = json.load(f)
+old = d.get('dependencies', {}).get('@atproto/ozone', '')
+d.setdefault('dependencies', {})['@atproto/ozone'] = ver
+with open('service/package.json', 'w') as f:
+    json.dump(d, f, indent=2)
+    f.write('\n')
+print(f'✅ @atproto/ozone: {old} -> {ver}')
+" "$latest_ozone_ver"
+	fi
+
 	popd > /dev/null
 }
 
@@ -379,6 +417,12 @@ export const handler = async (ctx: AppContext, params: QueryParams) => {
 EOF
 
 	echo "✅ Created src/algos/app.ts"
+
+	# Restore Dockerfile (removed during patch apply to avoid conflicts)
+	if [ ! -f $d/repos/feed-generator/Dockerfile ] && [ -f $d/docker/feed/Dockerfile ];then
+		cp -rf $d/docker/feed/Dockerfile $d/repos/feed-generator/
+		echo "✅ Restored Dockerfile"
+	fi
 	echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
 }
 
@@ -390,7 +434,7 @@ function at-repos-docker-verify() {
 		pds)       check_file="/app/services/pds/index.js" ;;
 		bsky)      check_file="/app/services/bsky/api.js" ;;
 		ozone)     check_file="/app/services/ozone/api.js" ;;
-		bgs)       check_file="/bigsky" ;;
+		bgs)       check_file="/relay" ;;
 		plc)       check_file="/app/packages/server/dist/index.js" ;;
 		*)         return 0 ;;
 	esac

ios/patching/001-social-app-ios-config.patch

@@ -27,7 +27,7 @@
          policy: 'appVersion',
        },
 -      icon: './assets/app-icons/ios_icon_default_next.png',
-+      icon: './assets/logo.png',
++      icon: './assets/app-icon.png',
        userInterfaceStyle: 'automatic',
        primaryColor: '#1083fe',
        newArchEnabled: false,
@@ -43,7 +43,7 @@
 -          PLATFORM === 'web' // web build doesn't like .icon files
 -            ? './assets/app-icons/ios_icon_default_next.png'
 -            : './assets/app-icons/ios_icon_default.icon',
-+        icon: './assets/logo.png',
++        icon: './assets/app-icon.png',
          infoPlist: {
            UIBackgroundModes: ['remote-notification'],
            NSCameraUsageDescription:
@@ -61,7 +61,7 @@
        },
        android: {
 -        icon: './assets/app-icons/android_icon_default_next.png',
-+        icon: './assets/logo.png',
++        icon: './assets/app-icon.png',
          adaptiveIcon: {
            foregroundImage: './assets/icon-android-foreground.png',
            monochromeImage: './assets/icon-android-monochrome.png',

ios/patching/005-social-app-ios-screens.patch

@@ -1,8 +1,6 @@
-diff --git a/src/screens/Settings/AboutSettings.tsx b/src/screens/Settings/AboutSettings.tsx
-index 9ba067a2f..e34b9f9b0 100644
 --- a/src/screens/Settings/AboutSettings.tsx
 +++ b/src/screens/Settings/AboutSettings.tsx
-@@ -78,7 +78,7 @@ export function AboutSettingsScreen({}: Props) {
+@@ -79,7 +79,7 @@
        <Layout.Content>
          <SettingsList.Container>
            <SettingsList.LinkItem
@@ -11,7 +9,7 @@ index 9ba067a2f..e34b9f9b0 100644
              label={_(msg`Terms of Service`)}>
              <SettingsList.ItemIcon icon={NewspaperIcon} />
              <SettingsList.ItemText>
-@@ -86,7 +86,7 @@ export function AboutSettingsScreen({}: Props) {
+@@ -87,7 +87,7 @@
              </SettingsList.ItemText>
            </SettingsList.LinkItem>
            <SettingsList.LinkItem
@@ -20,11 +18,9 @@ index 9ba067a2f..e34b9f9b0 100644
              label={_(msg`Privacy Policy`)}>
              <SettingsList.ItemIcon icon={NewspaperIcon} />
              <SettingsList.ItemText>
-diff --git a/src/screens/Takendown.tsx b/src/screens/Takendown.tsx
-index 660aecf1a..f19a62c0f 100644
 --- a/src/screens/Takendown.tsx
 +++ b/src/screens/Takendown.tsx
-@@ -212,10 +212,10 @@ export function Takendown() {
+@@ -210,10 +210,10 @@
                  <Trans>
                    Your account was found to be in violation of the{' '}
                    <SimpleInlineLinkText
@@ -38,15 +34,14 @@ index 660aecf1a..f19a62c0f 100644
                    </SimpleInlineLinkText>
                    . You have been sent an email outlining the specific violation
                    and suspension period, if applicable. You can appeal this
-diff --git a/src/view/screens/PrivacyPolicy.tsx b/src/view/screens/PrivacyPolicy.tsx
-index a89eaadc4..71ce7c81f 100644
 --- a/src/view/screens/PrivacyPolicy.tsx
 +++ b/src/view/screens/PrivacyPolicy.tsx
-@@ -1,51 +1,49 @@
+@@ -1,52 +1,49 @@
  import React from 'react'
 -import {View} from 'react-native'
--import {msg, Trans} from '@lingui/macro'
+-import {msg} from '@lingui/core/macro'
 -import {useLingui} from '@lingui/react'
+-import {Trans} from '@lingui/react/macro'
 -import {useFocusEffect} from '@react-navigation/native'
 -
 -import {usePalette} from '#/lib/hooks/usePalette'
@@ -62,26 +57,25 @@ index a89eaadc4..71ce7c81f 100644
 +import {ScrollView} from 'react-native'
  import * as Layout from '#/components/Layout'
 -import {ViewHeader} from '../com/util/ViewHeader'
--
++import {useSetTitle} from '#/lib/hooks/useSetTitle'
++import {atoms as a, useTheme} from '#/alf'
++import {Text} from '#/components/Typography'
+ 
 -type Props = NativeStackScreenProps<CommonNavigatorParams, 'PrivacyPolicy'>
 -export const PrivacyPolicyScreen = (_props: Props) => {
 -  const pal = usePalette('default')
 -  const {_} = useLingui()
 -  const setMinimalShellMode = useSetMinimalShellMode()
--
++export function PrivacyPolicyScreen() {
++  useSetTitle('Privacy Policy')
++  const t = useTheme()
+ 
 -  useFocusEffect(
 -    React.useCallback(() => {
 -      setMinimalShellMode(false)
 -    }, [setMinimalShellMode]),
 -  )
-+import {useSetTitle} from '#/lib/hooks/useSetTitle'
-+import {atoms as a, useTheme} from '#/alf'
-+import {Text} from '#/components/Typography'
-+
-+export function PrivacyPolicyScreen() {
-+  useSetTitle('Privacy Policy')
-+  const t = useTheme()
- 
+-
    return (
      <Layout.Screen>
 -      <ViewHeader title={_(msg`Privacy Policy`)} />
@@ -130,20 +124,19 @@ index a89eaadc4..71ce7c81f 100644
 +        </Text>
 +
 +        <Text style={[a.text_sm, a.mt_xl, {color: t.palette.contrast_500}]}>
-+          Last updated: 2025
++          Last updated: 2026
 +        </Text>
        </ScrollView>
      </Layout.Screen>
    )
-diff --git a/src/view/screens/TermsOfService.tsx b/src/view/screens/TermsOfService.tsx
-index d843c713c..c6a36268b 100644
 --- a/src/view/screens/TermsOfService.tsx
 +++ b/src/view/screens/TermsOfService.tsx
-@@ -1,49 +1,49 @@
+@@ -1,50 +1,49 @@
  import React from 'react'
 -import {View} from 'react-native'
--import {msg, Trans} from '@lingui/macro'
+-import {msg} from '@lingui/core/macro'
 -import {useLingui} from '@lingui/react'
+-import {Trans} from '@lingui/react/macro'
 -import {useFocusEffect} from '@react-navigation/native'
 -
 -import {usePalette} from '#/lib/hooks/usePalette'
@@ -159,26 +152,25 @@ index d843c713c..c6a36268b 100644
 +import {ScrollView} from 'react-native'
  import * as Layout from '#/components/Layout'
 -import {ViewHeader} from '../com/util/ViewHeader'
--
++import {useSetTitle} from '#/lib/hooks/useSetTitle'
++import {atoms as a, useTheme} from '#/alf'
++import {Text} from '#/components/Typography'
+ 
 -type Props = NativeStackScreenProps<CommonNavigatorParams, 'TermsOfService'>
 -export const TermsOfServiceScreen = (_props: Props) => {
 -  const pal = usePalette('default')
 -  const setMinimalShellMode = useSetMinimalShellMode()
 -  const {_} = useLingui()
--
++export function TermsOfServiceScreen() {
++  useSetTitle('Terms of Service')
++  const t = useTheme()
+ 
 -  useFocusEffect(
 -    React.useCallback(() => {
 -      setMinimalShellMode(false)
 -    }, [setMinimalShellMode]),
 -  )
-+import {useSetTitle} from '#/lib/hooks/useSetTitle'
-+import {atoms as a, useTheme} from '#/alf'
-+import {Text} from '#/components/Typography'
-+
-+export function TermsOfServiceScreen() {
-+  useSetTitle('Terms of Service')
-+  const t = useTheme()
- 
+-
    return (
      <Layout.Screen>
 -      <ViewHeader title={_(msg`Terms of Service`)} />
@@ -225,7 +217,7 @@ index d843c713c..c6a36268b 100644
 +        </Text>
 +
 +        <Text style={[a.text_sm, a.mt_xl, {color: t.palette.contrast_500}]}>
-+          Last updated: 2025
++          Last updated: 2026
 +        </Text>
        </ScrollView>
      </Layout.Screen>

ios/patching/021-social-app-ios-clean-feed.patch

@@ -1,8 +1,6 @@
-diff --git a/src/view/com/posts/DiscoverFallbackHeader.tsx b/src/view/com/posts/DiscoverFallbackHeader.tsx
-index e35a33aaf..a36f84ae0 100644
 --- a/src/view/com/posts/DiscoverFallbackHeader.tsx
 +++ b/src/view/com/posts/DiscoverFallbackHeader.tsx
-@@ -7,37 +7,5 @@ import {TextLink} from '../util/Link'
+@@ -7,37 +7,5 @@
  import {Text} from '../util/text/Text'
  
  export function DiscoverFallbackHeader() {
@@ -41,18 +39,16 @@ index e35a33aaf..a36f84ae0 100644
 -  )
 +  return null
  }
-diff --git a/src/view/com/posts/FollowingEmptyState.tsx b/src/view/com/posts/FollowingEmptyState.tsx
-index 352cc1dc0..f477521af 100644
 --- a/src/view/com/posts/FollowingEmptyState.tsx
 +++ b/src/view/com/posts/FollowingEmptyState.tsx
-@@ -1,37 +1,14 @@
+@@ -1,38 +1,15 @@
  import React from 'react'
  import {StyleSheet, View} from 'react-native'
 -import {
 -  FontAwesomeIcon,
 -  type FontAwesomeIconStyle,
 -} from '@fortawesome/react-native-fontawesome'
- import {Trans} from '@lingui/macro'
+ import {Trans} from '@lingui/react/macro'
 -import {useNavigation} from '@react-navigation/native'
  
  import {usePalette} from '#/lib/hooks/usePalette'
@@ -67,7 +63,7 @@ index 352cc1dc0..f477521af 100644
    const pal = usePalette('default')
 -  const palInverted = usePalette('inverted')
 -  const navigation = useNavigation<NavigationProp>()
--
+ 
 -  const onPressFindAccounts = React.useCallback(() => {
 -    if (IS_WEB) {
 -      navigation.navigate('Search', {})
@@ -80,10 +76,11 @@ index 352cc1dc0..f477521af 100644
 -  const onPressDiscoverFeeds = React.useCallback(() => {
 -    navigation.navigate('Feeds')
 -  }, [navigation])
-
+-
    return (
      <View style={styles.container}>
-@@ -45,36 +22,6 @@ export function FollowingEmptyState() {
+       <View style={styles.inner}>
+@@ -45,36 +22,6 @@
              happening.
            </Trans>
          </Text>
@@ -120,7 +117,7 @@ index 352cc1dc0..f477521af 100644
        </View>
      </View>
    )
-@@ -98,13 +45,4 @@ const styles = StyleSheet.create({
+@@ -98,13 +45,4 @@
      marginLeft: 'auto',
      marginRight: 'auto',
    },
@@ -134,18 +131,16 @@ index 352cc1dc0..f477521af 100644
 -    borderRadius: 30,
 -  },
  })
-diff --git a/src/view/com/posts/FollowingEndOfFeed.tsx b/src/view/com/posts/FollowingEndOfFeed.tsx
-index e3c84d782..efb55d406 100644
 --- a/src/view/com/posts/FollowingEndOfFeed.tsx
 +++ b/src/view/com/posts/FollowingEndOfFeed.tsx
-@@ -1,36 +1,13 @@
+@@ -1,37 +1,14 @@
  import React from 'react'
  import {Dimensions, StyleSheet, View} from 'react-native'
 -import {
 -  FontAwesomeIcon,
 -  type FontAwesomeIconStyle,
 -} from '@fortawesome/react-native-fontawesome'
- import {Trans} from '@lingui/macro'
+ import {Trans} from '@lingui/react/macro'
 -import {useNavigation} from '@react-navigation/native'
  
  import {usePalette} from '#/lib/hooks/usePalette'
@@ -159,7 +154,7 @@ index e3c84d782..efb55d406 100644
    const pal = usePalette('default')
 -  const palInverted = usePalette('inverted')
 -  const navigation = useNavigation<NavigationProp>()
--
+ 
 -  const onPressFindAccounts = React.useCallback(() => {
 -    if (IS_WEB) {
 -      navigation.navigate('Search', {})
@@ -172,10 +167,11 @@ index e3c84d782..efb55d406 100644
 -  const onPressDiscoverFeeds = React.useCallback(() => {
 -    navigation.navigate('Feeds')
 -  }, [navigation])
-
+-
    return (
      <View
-@@ -41,41 +18,8 @@ export function FollowingEndOfFeed() {
+       style={[
+@@ -41,41 +18,8 @@
        ]}>
        <View style={styles.inner}>
          <Text type="xl-medium" style={[s.textCenter, pal.text]}>
@@ -183,7 +179,8 @@ index e3c84d782..efb55d406 100644
 -            You've reached the end of your feed! Find some more accounts to
 -            follow.
 -          </Trans>
--        </Text>
++          <Trans>You've reached the end of your feed!</Trans>
+         </Text>
 -        <Button
 -          type="inverted"
 -          style={styles.emptyBtn}
@@ -200,8 +197,7 @@ index e3c84d782..efb55d406 100644
 -
 -        <Text type="xl-medium" style={[s.textCenter, pal.text, s.mt20]}>
 -          <Trans>You can also discover new Custom Feeds to follow.</Trans>
-+          <Trans>You've reached the end of your feed!</Trans>
-         </Text>
+-        </Text>
 -        <Button
 -          type="inverted"
 -          style={[styles.emptyBtn, s.mt10]}
@@ -218,7 +214,7 @@ index e3c84d782..efb55d406 100644
        </View>
      </View>
    )
-@@ -93,13 +37,4 @@ const styles = StyleSheet.create({
+@@ -93,13 +37,4 @@
      width: '100%',
      maxWidth: 460,
    },
@@ -232,11 +228,9 @@ index e3c84d782..efb55d406 100644
 -    borderRadius: 30,
 -  },
  })
-diff --git a/src/view/com/posts/PostFeed.tsx b/src/view/com/posts/PostFeed.tsx
-index 4f25468c9..a72a10b80 100644
 --- a/src/view/com/posts/PostFeed.tsx
 +++ b/src/view/com/posts/PostFeed.tsx
-@@ -766,7 +766,7 @@ let PostFeed = ({
+@@ -765,7 +765,7 @@
        } else if (row.type === 'feedShutdownMsg') {
          return <FeedShutdownMsg feedUri={feedUriOrActorDid} />
        } else if (row.type === 'interstitialFollows') {

ios/patching/024-social-app-ios-disable-external-services.patch

@@ -1,5 +1,14 @@
 --- a/src/env/common.ts
 +++ b/src/env/common.ts
+@@ -88,7 +88,7 @@
+  * Metrics API host
+  */
+ export const METRICS_API_HOST: string =
+-  process.env.EXPO_PUBLIC_METRICS_API_HOST || 'https://events.bsky.app'
++  process.env.EXPO_PUBLIC_METRICS_API_HOST || ''
+ 
+ /**
+  * Growthbook API host
 @@ -128,9 +128,7 @@
   */
  export const GEOLOCATION_DEV_URL = process.env.GEOLOCATION_DEV_URL
@@ -22,3 +31,11 @@
  
  /**
   * URLs for the app-config web worker. Can be a
+@@ -148,6 +144,4 @@
+  */
+ export const APP_CONFIG_DEV_URL = process.env.APP_CONFIG_DEV_URL
+ export const APP_CONFIG_PROD_URL = `https://app-config.workers.bsky.app`
+-export const APP_CONFIG_URL = IS_DEV
+-  ? (APP_CONFIG_DEV_URL ?? APP_CONFIG_PROD_URL)
+-  : APP_CONFIG_PROD_URL
++export const APP_CONFIG_URL = null

ios/patching/038-social-app-ios-profile-services.patch

@@ -7,22 +7,21 @@
  import {
    type AppBskyActorDefs,
    moderateProfile,
-@@ -9,8 +9,10 @@
- } from '@atproto/api'
- import {msg, Trans} from '@lingui/macro'
+@@ -11,7 +11,10 @@
  import {useLingui} from '@lingui/react'
-+import {useQuery} from '@tanstack/react-query'
+ import {Trans} from '@lingui/react/macro'
  
++import {useQuery} from '@tanstack/react-query'
++
  import {useHaptics} from '#/lib/haptics'
 +import {useOpenLink} from '#/lib/hooks/useOpenLink'
  import {sanitizeDisplayName} from '#/lib/strings/display-names'
  import {sanitizeHandle} from '#/lib/strings/handles'
  import {logger} from '#/logger'
-@@ -45,6 +47,103 @@
- import {ProfileHeaderMetrics} from './Metrics'
+@@ -47,6 +50,103 @@
  import {ProfileHeaderShell} from './Shell'
  import {ProfileHeaderSuggestedFollows} from './SuggestedFollows'
-+
+ 
 +const SERVICE_FAVICONS: Record<string, any> = {
 +  'syui.ai': require('../../../../assets/favicons/syui.ai.png'),
 +  'bsky.app': require('../../../../assets/favicons/bsky.app.png'),
@@ -119,10 +118,11 @@
 +    </View>
 +  )
 +}
- 
++
  interface Props {
    profile: AppBskyActorDefs.ProfileViewDetailed
-@@ -151,6 +250,7 @@
+   descriptionRT: RichTextAPI | null
+@@ -152,6 +252,7 @@
            {!isPlaceholderProfile && !isBlockedUser && (
              <View style={a.gap_md}>
                <ProfileHeaderMetrics profile={profile} />

ios/patching/042-social-app-ios-at-links.patch

@@ -1,6 +1,6 @@
 --- a/src/screens/Profile/Header/ProfileHeaderStandard.tsx
 +++ b/src/screens/Profile/Header/ProfileHeaderStandard.tsx
-@@ -46,6 +46,7 @@
+@@ -48,6 +48,7 @@
  import {ProfileHeaderHandle} from './Handle'
  import {ProfileHeaderMetrics} from './Metrics'
  import {ProfileHeaderShell} from './Shell'
@@ -8,7 +8,7 @@
  import {ProfileHeaderSuggestedFollows} from './SuggestedFollows'
  
  const SERVICE_FAVICONS: Record<string, any> = {
-@@ -251,6 +252,7 @@
+@@ -253,6 +254,7 @@
              <View style={a.gap_md}>
                <ProfileHeaderMetrics profile={profile} />
                <ProfileServiceLinks profile={profile} />

ios/patching/044-social-app-ios-splash-video.patch

@@ -5,10 +5,10 @@
  import Animated, {FadeIn, FadeOut} from 'react-native-reanimated'
  import {Image} from 'expo-image'
 +import {useVideoPlayer, VideoView} from 'expo-video'
- import {msg, Trans} from '@lingui/macro'
+ import {msg} from '@lingui/core/macro'
  import {useLingui} from '@lingui/react'
- 
-@@ -14,10 +15,13 @@
+ import {Trans} from '@lingui/react/macro'
+@@ -15,10 +16,13 @@
  import splashImagePointer from '../../../../assets/splash/illustration-mobile.png'
  // @ts-ignore
  import darkSplashImagePointer from '../../../../assets/splash/illustration-mobile-dark.png'
@@ -22,7 +22,7 @@
  
  export const SplashScreen = ({
    onPressSignin,
-@@ -52,13 +56,30 @@
+@@ -53,13 +57,30 @@
      }
    }, [t, isDarkMode])
  

ios/patching/045-social-app-ios-composer-cancel.patch

@@ -0,0 +1,40 @@
+--- a/src/view/com/composer/Composer.tsx
++++ b/src/view/com/composer/Composer.tsx
+@@ -717,16 +717,7 @@
+         post.shortenedGraphemeLength > 0 || post.embed.media || post.embed.link,
+     )
+ 
+-    // Show discard prompt if there's content AND either:
+-    // - No draft is loaded (new composition)
+-    // - Draft is loaded but has been modified
+-    if (hasContent && (!composerState.draftId || composerState.isDirty)) {
+-      closeAllDialogs()
+-      Keyboard.dismiss()
+-      discardPromptControl.open()
+-    } else {
+-      onClose()
+-    }
++    onClose()
+   }, [
+     thread,
+     composerState.draftId,
+@@ -1551,18 +1542,7 @@
+           </>
+         ) : (
+           <>
+-            {!isReply && (
+-              <DraftsButton
+-                onSelectDraft={onSelectDraft}
+-                onSaveDraft={onSaveDraft}
+-                onDiscard={onDiscard}
+-                isEmpty={isEmpty}
+-                isDirty={isDirty}
+-                isEditingDraft={isEditingDraft}
+-                canSaveDraft={canSaveDraft}
+-                textLength={textLength}
+-              />
+-            )}
++            {/* DraftsButton removed */}
+             <Button
+               testID="composerPublishBtn"
+               label={

ios/patching/046-social-app-ios-null-url-guards.patch

@@ -0,0 +1,55 @@
+diff --git a/src/features/liveEvents/context.tsx b/src/features/liveEvents/context.tsx
+index 3de2534a8..e11955f57 100644
+--- a/src/features/liveEvents/context.tsx
++++ b/src/features/liveEvents/context.tsx
+@@ -24,6 +24,7 @@ export const DEFAULT_LIVE_EVENTS = {
+ 
+ async function fetchLiveEvents(): Promise<LiveEventsWorkerResponse | null> {
+   try {
++    if (!LIVE_EVENTS_URL) return null
+     const res = await fetch(`${LIVE_EVENTS_URL}/config`)
+     if (!res.ok) return null
+     const data = await res.json()
+diff --git a/src/geolocation/const.ts b/src/geolocation/const.ts
+index 653e829ba..4992cc870 100644
+--- a/src/geolocation/const.ts
++++ b/src/geolocation/const.ts
+@@ -1,7 +1,9 @@
+ import {GEOLOCATION_URL} from '#/env'
+ import {type Geolocation} from '#/geolocation/types'
+ 
+-export const GEOLOCATION_SERVICE_URL = `${GEOLOCATION_URL}/geolocation`
++export const GEOLOCATION_SERVICE_URL = GEOLOCATION_URL
++  ? `${GEOLOCATION_URL}/geolocation`
++  : null
+ 
+ /**
+  * Default geolocation config.
+diff --git a/src/geolocation/service.ts b/src/geolocation/service.ts
+index 2d9285b67..c7c3d02c0 100644
+--- a/src/geolocation/service.ts
++++ b/src/geolocation/service.ts
+@@ -26,9 +26,10 @@ const onGeolocationServiceResponseUpdate = (
+ }
+ 
+ async function fetchGeolocationServiceData(
+-  url: string,
++  url: string | null,
+ ): Promise<Geolocation | undefined> {
+   if (debug.enabled) return debug.resolve(debug.geolocation)
++  if (!url) throw new Error('geolocation service disabled')
+   const res = await fetch(url)
+   if (!res.ok) {
+     throw new Error(`fetchGeolocationServiceData failed ${res.status}`)
+diff --git a/src/state/appConfig.tsx b/src/state/appConfig.tsx
+index 67b0e553e..9eacf7ead 100644
+--- a/src/state/appConfig.tsx
++++ b/src/state/appConfig.tsx
+@@ -30,6 +30,7 @@ let fetchAppConfigPromise: Promise<AppConfigResponse> | undefined
+ 
+ async function fetchAppConfig(): Promise<AppConfigResponse | null> {
+   try {
++    if (!APP_CONFIG_URL) return null
+     if (!fetchAppConfigPromise) {
+       fetchAppConfigPromise = (async () => {
+         const r = await fetch(`${APP_CONFIG_URL}/config`)

ios/patching/License.tsx

@@ -27,7 +27,7 @@ export function LicenseScreen() {
         <Text style={[a.text_lg, a.font_bold, a.mt_lg, a.mb_md]}>MIT License</Text>
 
         <Text style={[a.mb_md, {fontFamily: 'monospace'}]}>
-          Copyright (c) 2022-2025 Bluesky PBC
+          Copyright (c) 2022-2026 Bluesky PBC
         </Text>
 
         <Text style={[a.mb_md]}>

ios/setup.zsh

@@ -52,6 +52,8 @@ PATCH_FILES_IOS=(
 	"042-social-app-ios-at-links.patch"
 	"043-social-app-ios-rightnav-links.patch"
 	"044-social-app-ios-splash-video.patch"
+	"045-social-app-ios-composer-cancel.patch"
+	"046-social-app-ios-null-url-guards.patch"
 )
 
 function ios-env() {
@@ -173,6 +175,17 @@ function ios-copy-new-files() {
 		echo "✅ Copied all assets (including logo.png, app-icons)"
 	fi
 
+	# Generate app-icon.png (logo on #333 background) for app icon
+	if [ -f "$d/ios/assets/logo.png" ]; then
+		if command -v magick >/dev/null 2>&1; then
+			magick -size 1024x1024 "xc:#333333" "$d/ios/assets/logo.png" -gravity center -composite "$target_dir/assets/app-icon.png"
+			echo "✅ Generated app-icon.png (logo + #333 bg)"
+		else
+			echo "⚠️  ImageMagick not found, copying logo.png as app-icon.png fallback"
+			cp "$d/ios/assets/logo.png" "$target_dir/assets/app-icon.png"
+		fi
+	fi
+
 	# Copy License.tsx
 	if [ -f "$patching_dir/License.tsx" ]; then
 		mkdir -p "$target_dir/src/view/screens"

patching/220-atproto-dockerfile-copy-services.patch

@@ -1,30 +0,0 @@
---- a/services/pds/Dockerfile
-+++ b/services/pds/Dockerfile
-@@ -46,6 +46,7 @@
- COPY ./packages/ws-client ./packages/ws-client
- COPY ./packages/xrpc-server ./packages/xrpc-server
- COPY ./packages/xrpc ./packages/xrpc
-+COPY ./services/pds ./services/pds
-
- # install all deps
- RUN PUPPETEER_SKIP_DOWNLOAD=true pnpm install --frozen-lockfile
---- a/services/bsky/Dockerfile
-+++ b/services/bsky/Dockerfile
-@@ -45,6 +45,7 @@
- COPY ./packages/ws-client ./packages/ws-client
- COPY ./packages/xrpc-server ./packages/xrpc-server
- COPY ./packages/xrpc ./packages/xrpc
-+COPY ./services/bsky ./services/bsky
-
- # install all deps
- RUN PUPPETEER_SKIP_DOWNLOAD=true pnpm install --frozen-lockfile
---- a/services/ozone/Dockerfile
-+++ b/services/ozone/Dockerfile
-@@ -46,6 +46,7 @@
- COPY ./packages/ws-client ./packages/ws-client
- COPY ./packages/xrpc ./packages/xrpc
- COPY ./packages/xrpc-server ./packages/xrpc-server
-+COPY ./services/ozone ./services/ozone
-
- # install all deps
- RUN PUPPETEER_SKIP_DOWNLOAD=true pnpm install --frozen-lockfile