2 files changed, 9 insertions, 3 deletions
diff --git a/src/view/screens/CustomFeed.tsx b/src/view/screens/CustomFeed.tsx
index c0dcd7980..61550c683 100644
--- a/src/view/screens/CustomFeed.tsx
+++ b/src/view/screens/CustomFeed.tsx
@@ -14,6 +14,7 @@ import {useCustomFeed} from 'lib/hooks/useCustomFeed'
 import {withAuthRequired} from 'view/com/auth/withAuthRequired'
 import {Feed} from 'view/com/posts/Feed'
 import {pluralize} from 'lib/strings/helpers'
+import {sanitizeHandle} from 'lib/strings/handles'
 import {TextLink} from 'view/com/util/Link'
 import {UserAvatar} from 'view/com/util/UserAvatar'
 import {ViewHeader} from 'view/com/util/ViewHeader'
@@ -32,6 +33,7 @@ import {DropdownButton, DropdownItem} from 'view/com/util/forms/DropdownButton'
 import {useOnMainScroll} from 'lib/hooks/useOnMainScroll'
 import {EmptyState} from 'view/com/util/EmptyState'
 import {useAnalytics} from 'lib/analytics/analytics'
+import {makeProfileLink} from 'lib/routes/links'
 
 type Props = NativeStackScreenProps<CommonNavigatorParams, 'CustomFeed'>
 export const CustomFeedScreen = withAuthRequired(
@@ -216,8 +218,11 @@ export const CustomFeedScreen = withAuthRequired(
                     'you'
                   ) : (
                     <TextLink
-                      text={`@${currentFeed.data.creator.handle}`}
-                      href={`/profile/${currentFeed.data.creator.did}`}
+                      text={sanitizeHandle(
+                        currentFeed.data.creator.handle,
+                        '@',
+                      )}
+                      href={makeProfileLink(currentFeed.data.creator)}
                       style={[pal.textLight]}
                     />
                   )}
diff --git a/src/view/screens/Settings.tsx b/src/view/screens/Settings.tsx
index 7356db54b..dd456c35e 100644
--- a/src/view/screens/Settings.tsx
+++ b/src/view/screens/Settings.tsx
@@ -43,6 +43,7 @@ import {pluralize} from 'lib/strings/helpers'
 import {formatCount} from 'view/com/util/numeric/format'
 import Clipboard from '@react-native-clipboard/clipboard'
 import {reset as resetNavigation} from '../../Navigation'
+import {makeProfileLink} from 'lib/routes/links'
 
 // TEMPORARY (APP-700)
 // remove after backend testing finishes
@@ -229,7 +230,7 @@ export const SettingsScreen = withAuthRequired(
             </View>
           ) : (
             <Link
-              href={`/profile/${store.me.handle}`}
+              href={makeProfileLink(store.me)}
               title="Your profile"
               noFeedback>
               <View style={[pal.view, styles.linkCard]}>